youxiw2000 / trash · Commits

Commit 9571b209cf4bebc9411f2000c32980afbdce94a5

Authored by guzijian
1 parent f224a0e8
build: skipped

feat: 增加处理场所交互逻辑

Inline Side-by-side
Showing 19 changed files with 1076 additions and 109 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @9571b20
@@ -93,8 +93,14 @@ public class GarbageOrderController { @@ -93,8 +93,14 @@ public class GarbageOrderController {
93 } 93 }
94 94
95 @PutMapping("/dispatch") 95 @PutMapping("/dispatch")
96 - public Result<?> dispatchOrders(@RequestBody DispatchDto dto) {  
97 - garOrderService.dispatchOrder(dto); 96 + public Result<?> dispatchDriverOrders(@RequestBody DispatchDto dto) {
  97 + garOrderService.dispatchDriverOrders(dto);
  98 + return Result.OK();
  99 + }
  100 +
  101 + @PutMapping("/dispatch/disposal")
  102 + public Result<?> dispatchDisposalOrders(@RequestBody DisposalDispatchDto dto) {
  103 + garOrderService.dispatchDisposalOrders(dto);
98 return Result.OK(); 104 return Result.OK();
99 } 105 }
100 106
@@ -103,6 +109,11 @@ public class GarbageOrderController { @@ -103,6 +109,11 @@ public class GarbageOrderController {
103 return Result.OK(garOrderService.queryDispatch(orderId)); 109 return Result.OK(garOrderService.queryDispatch(orderId));
104 } 110 }
105 111
  112 + @GetMapping("/queryDisposalDispatch/{orderId}")
  113 + public Result<?> queryDisposalDispatch(@PathVariable("orderId") String orderId) {
  114 + return Result.OK(garOrderService.queryDisposalDispatch(orderId));
  115 + }
  116 +
106 @GetMapping("/queryOrderHandlerStatus/{orderId}") 117 @GetMapping("/queryOrderHandlerStatus/{orderId}")
107 public Result<?> queryOrderHandlerStatus(@PathVariable("orderId") String orderId) { 118 public Result<?> queryOrderHandlerStatus(@PathVariable("orderId") String orderId) {
108 return Result.OK(garOrderService.queryOrderHandlerStatus(orderId)); 119 return Result.OK(garOrderService.queryOrderHandlerStatus(orderId));
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
  View file @9571b20
@@ -103,6 +103,7 @@ public class GlobalStatus { @@ -103,6 +103,7 @@ public class GlobalStatus {
103 IMAGE_TYPE_CURRENT(0, "现场图片"), 103 IMAGE_TYPE_CURRENT(0, "现场图片"),
104 IMAGE_TYPE_PUT_ON(1, "装车图片"), 104 IMAGE_TYPE_PUT_ON(1, "装车图片"),
105 IMAGE_TYPE_PUT_DOWN(2, "卸车图片"), 105 IMAGE_TYPE_PUT_DOWN(2, "卸车图片"),
  106 + IMAGE_TYPE_FILL_CAR(3, "全景图片"),
106 EVALUATE_TYPE_COMPANY(0,"对公司评价"), 107 EVALUATE_TYPE_COMPANY(0,"对公司评价"),
107 EVALUATE_TYPE_USER(1,"对用户评价"), 108 EVALUATE_TYPE_USER(1,"对用户评价"),
108 EVALUATE_ORDER_NO(0,"待评价"), 109 EVALUATE_ORDER_NO(0,"待评价"),
trash-garbage/src/main/java/com/trash/garbage/mapper/mapper/GarOrderMatchAskMapper.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.mapper.mapper;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
  4 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +import com.trash.garbage.pojo.vo.DispatchDisposalVo;
  6 +import org.apache.ibatis.annotations.Param;
  7 +
  8 +import java.util.List;
  9 +
  10 +/**
  11 +* @author 20412
  12 +* @description 针对表【gar_order_match_ask(匹配处理场所人员表)】的数据库操作Mapper
  13 +* @createDate 2024-05-10 11:25:16
  14 +* @Entity garbage.domain.GarOrderMatchAsk
  15 +*/
  16 +public interface GarOrderMatchAskMapper extends BaseMapper<GarOrderMatchAsk> {
  17 +
  18 + List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(@Param("orderId") String orderId,@Param("id") Long id);
  19 +}
  20 +
  21 +
  22 +
  23 +
trash-garbage/src/main/java/com/trash/garbage/mapper/mapper/GarOrderMatchDisposalMapper.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.mapper.mapper;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
  4 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +import com.trash.garbage.pojo.vo.DispatchDisposalVo;
  6 +import org.apache.ibatis.annotations.Param;
  7 +
  8 +import java.util.List;
  9 +
  10 +/**
  11 +* @author 20412
  12 +* @description 针对表【gar_order_match_disposal(派单分发处理场所表)】的数据库操作Mapper
  13 +* @createDate 2024-05-10 11:25:17
  14 +* @Entity garbage.domain.GarOrderMatchDisposal
  15 +*/
  16 +public interface GarOrderMatchDisposalMapper extends BaseMapper<GarOrderMatchDisposal> {
  17 +
  18 + List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(@Param("orderId") String orderId,@Param("companyId") Long id);
  19 +}
  20 +
  21 +
  22 +
  23 +
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.pojo.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.FieldFill;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import java.io.Serializable;
  8 +import java.util.Date;
  9 +import lombok.Data;
  10 +
  11 +/**
  12 + * 匹配处理场所人员表
  13 + * @TableName gar_order_match_ask
  14 + */
  15 +@TableName(value ="gar_order_match_ask")
  16 +@Data
  17 +public class GarOrderMatchAsk implements Serializable {
  18 + /**
  19 + *
  20 + */
  21 + @TableId
  22 + private String garId;
  23 +
  24 + /**
  25 + *
  26 + */
  27 + private String garOrderId;
  28 +
  29 + /**
  30 + *
  31 + */
  32 + private String garOrderHandlerTel;
  33 +
  34 + /**
  35 + *
  36 + */
  37 + private String garOrderHandlerName;
  38 +
  39 + /**
  40 + *
  41 + */
  42 + private String garOrderHandlerCompanyId;
  43 +
  44 + /**
  45 + *
  46 + */
  47 + private String garOrderHandlerCompanyName;
  48 +
  49 + /**
  50 + *
  51 + */
  52 + @TableField(fill = FieldFill.INSERT)
  53 + private Date garCreateTime;
  54 +
  55 + /**
  56 + *
  57 + */
  58 + @TableField(fill = FieldFill.INSERT_UPDATE)
  59 + private Date garUpdateTime;
  60 +
  61 + /**
  62 + *
  63 + */
  64 + @TableField(fill = FieldFill.INSERT)
  65 + private String garCreateBy;
  66 +
  67 + /**
  68 + *
  69 + */
  70 + @TableField(fill = FieldFill.INSERT_UPDATE)
  71 + private String garUpdateBy;
  72 +
  73 + /**
  74 + *
  75 + */
  76 + private String garRemark;
  77 +
  78 + @TableField(exist = false)
  79 + private static final long serialVersionUID = 1L;
  80 +
  81 + @Override
  82 + public boolean equals(Object that) {
  83 + if (this == that) {
  84 + return true;
  85 + }
  86 + if (that == null) {
  87 + return false;
  88 + }
  89 + if (getClass() != that.getClass()) {
  90 + return false;
  91 + }
  92 + GarOrderMatchAsk other = (GarOrderMatchAsk) that;
  93 + return (this.getGarId() == null ? other.getGarId() == null : this.getGarId().equals(other.getGarId()))
  94 + && (this.getGarOrderId() == null ? other.getGarOrderId() == null : this.getGarOrderId().equals(other.getGarOrderId()))
  95 + && (this.getGarOrderHandlerTel() == null ? other.getGarOrderHandlerTel() == null : this.getGarOrderHandlerTel().equals(other.getGarOrderHandlerTel()))
  96 + && (this.getGarOrderHandlerName() == null ? other.getGarOrderHandlerName() == null : this.getGarOrderHandlerName().equals(other.getGarOrderHandlerName()))
  97 + && (this.getGarOrderHandlerCompanyId() == null ? other.getGarOrderHandlerCompanyId() == null : this.getGarOrderHandlerCompanyId().equals(other.getGarOrderHandlerCompanyId()))
  98 + && (this.getGarOrderHandlerCompanyName() == null ? other.getGarOrderHandlerCompanyName() == null : this.getGarOrderHandlerCompanyName().equals(other.getGarOrderHandlerCompanyName()))
  99 + && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
  100 + && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
  101 + && (this.getGarCreateBy() == null ? other.getGarCreateBy() == null : this.getGarCreateBy().equals(other.getGarCreateBy()))
  102 + && (this.getGarUpdateBy() == null ? other.getGarUpdateBy() == null : this.getGarUpdateBy().equals(other.getGarUpdateBy()))
  103 + && (this.getGarRemark() == null ? other.getGarRemark() == null : this.getGarRemark().equals(other.getGarRemark()));
  104 + }
  105 +
  106 + @Override
  107 + public int hashCode() {
  108 + final int prime = 31;
  109 + int result = 1;
  110 + result = prime * result + ((getGarId() == null) ? 0 : getGarId().hashCode());
  111 + result = prime * result + ((getGarOrderId() == null) ? 0 : getGarOrderId().hashCode());
  112 + result = prime * result + ((getGarOrderHandlerTel() == null) ? 0 : getGarOrderHandlerTel().hashCode());
  113 + result = prime * result + ((getGarOrderHandlerName() == null) ? 0 : getGarOrderHandlerName().hashCode());
  114 + result = prime * result + ((getGarOrderHandlerCompanyId() == null) ? 0 : getGarOrderHandlerCompanyId().hashCode());
  115 + result = prime * result + ((getGarOrderHandlerCompanyName() == null) ? 0 : getGarOrderHandlerCompanyName().hashCode());
  116 + result = prime * result + ((getGarCreateTime() == null) ? 0 : getGarCreateTime().hashCode());
  117 + result = prime * result + ((getGarUpdateTime() == null) ? 0 : getGarUpdateTime().hashCode());
  118 + result = prime * result + ((getGarCreateBy() == null) ? 0 : getGarCreateBy().hashCode());
  119 + result = prime * result + ((getGarUpdateBy() == null) ? 0 : getGarUpdateBy().hashCode());
  120 + result = prime * result + ((getGarRemark() == null) ? 0 : getGarRemark().hashCode());
  121 + return result;
  122 + }
  123 +
  124 + @Override
  125 + public String toString() {
  126 + StringBuilder sb = new StringBuilder();
  127 + sb.append(getClass().getSimpleName());
  128 + sb.append(" [");
  129 + sb.append("Hash = ").append(hashCode());
  130 + sb.append(", garId=").append(garId);
  131 + sb.append(", garOrderId=").append(garOrderId);
  132 + sb.append(", garOrderHandlerTel=").append(garOrderHandlerTel);
  133 + sb.append(", garOrderHandlerName=").append(garOrderHandlerName);
  134 + sb.append(", garOrderHandlerCompanyId=").append(garOrderHandlerCompanyId);
  135 + sb.append(", garOrderHandlerCompanyName=").append(garOrderHandlerCompanyName);
  136 + sb.append(", garCreateTime=").append(garCreateTime);
  137 + sb.append(", garUpdateTime=").append(garUpdateTime);
  138 + sb.append(", garCreateBy=").append(garCreateBy);
  139 + sb.append(", garUpdateBy=").append(garUpdateBy);
  140 + sb.append(", garRemark=").append(garRemark);
  141 + sb.append(", serialVersionUID=").append(serialVersionUID);
  142 + sb.append("]");
  143 + return sb.toString();
  144 + }
  145 +
  146 + public String getGarId() {
  147 + return garId;
  148 + }
  149 +
  150 + public void setGarId(String garId) {
  151 + this.garId = garId;
  152 + }
  153 +
  154 + public String getGarOrderId() {
  155 + return garOrderId;
  156 + }
  157 +
  158 + public void setGarOrderId(String garOrderId) {
  159 + this.garOrderId = garOrderId;
  160 + }
  161 +
  162 + public String getGarOrderHandlerTel() {
  163 + return garOrderHandlerTel;
  164 + }
  165 +
  166 + public void setGarOrderHandlerTel(String garOrderHandlerTel) {
  167 + this.garOrderHandlerTel = garOrderHandlerTel;
  168 + }
  169 +
  170 + public String getGarOrderHandlerName() {
  171 + return garOrderHandlerName;
  172 + }
  173 +
  174 + public void setGarOrderHandlerName(String garOrderHandlerName) {
  175 + this.garOrderHandlerName = garOrderHandlerName;
  176 + }
  177 +
  178 + public String getGarOrderHandlerCompanyId() {
  179 + return garOrderHandlerCompanyId;
  180 + }
  181 +
  182 + public void setGarOrderHandlerCompanyId(String garOrderHandlerCompanyId) {
  183 + this.garOrderHandlerCompanyId = garOrderHandlerCompanyId;
  184 + }
  185 +
  186 + public String getGarOrderHandlerCompanyName() {
  187 + return garOrderHandlerCompanyName;
  188 + }
  189 +
  190 + public void setGarOrderHandlerCompanyName(String garOrderHandlerCompanyName) {
  191 + this.garOrderHandlerCompanyName = garOrderHandlerCompanyName;
  192 + }
  193 +
  194 + public Date getGarCreateTime() {
  195 + return garCreateTime;
  196 + }
  197 +
  198 + public void setGarCreateTime(Date garCreateTime) {
  199 + this.garCreateTime = garCreateTime;
  200 + }
  201 +
  202 + public Date getGarUpdateTime() {
  203 + return garUpdateTime;
  204 + }
  205 +
  206 + public void setGarUpdateTime(Date garUpdateTime) {
  207 + this.garUpdateTime = garUpdateTime;
  208 + }
  209 +
  210 + public String getGarCreateBy() {
  211 + return garCreateBy;
  212 + }
  213 +
  214 + public void setGarCreateBy(String garCreateBy) {
  215 + this.garCreateBy = garCreateBy;
  216 + }
  217 +
  218 + public String getGarUpdateBy() {
  219 + return garUpdateBy;
  220 + }
  221 +
  222 + public void setGarUpdateBy(String garUpdateBy) {
  223 + this.garUpdateBy = garUpdateBy;
  224 + }
  225 +
  226 + public String getGarRemark() {
  227 + return garRemark;
  228 + }
  229 +
  230 + public void setGarRemark(String garRemark) {
  231 + this.garRemark = garRemark;
  232 + }
  233 +}
0 \ No newline at end of file 234 \ No newline at end of file
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchDisposal.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.pojo.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.FieldFill;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import java.io.Serializable;
  8 +import java.util.Date;
  9 +import lombok.Data;
  10 +
  11 +/**
  12 + * 派单分发处理场所表
  13 + * @TableName gar_order_match_dispotal
  14 + */
  15 +@TableName(value ="gar_order_match_disposal")
  16 +@Data
  17 +public class GarOrderMatchDisposal implements Serializable {
  18 + /**
  19 + * 主键
  20 + */
  21 + @TableId
  22 + private String garId;
  23 +
  24 + /**
  25 + * 订单id
  26 + */
  27 + private String garOrderId;
  28 +
  29 + /**
  30 + * 处理场所负责人人手机号
  31 + */
  32 + private String garOrderDisposalTel;
  33 +
  34 + /**
  35 + * 处理人姓名
  36 + */
  37 + private String garOrderDisposalName;
  38 +
  39 + /**
  40 + * 公司id
  41 + */
  42 + private String garOrderDisposalCompanyId;
  43 +
  44 + /**
  45 + * 公司名
  46 + */
  47 + private String garOrderDisposalCompanyName;
  48 +
  49 + /**
  50 + *
  51 + */
  52 + @TableField(fill = FieldFill.INSERT)
  53 + private Date garCreateTime;
  54 +
  55 + /**
  56 + *
  57 + */
  58 + @TableField(fill = FieldFill.INSERT_UPDATE)
  59 + private Date garUpdateTime;
  60 +
  61 + /**
  62 + *
  63 + */
  64 + @TableField(fill = FieldFill.INSERT)
  65 + private String garCreateBy;
  66 +
  67 + /**
  68 + *
  69 + */
  70 + @TableField(fill = FieldFill.INSERT_UPDATE)
  71 + private String garUpdateBy;
  72 +
  73 + /**
  74 + *
  75 + */
  76 + private String garReason;
  77 +
  78 + @TableField(exist = false)
  79 + private static final long serialVersionUID = 1L;
  80 +
  81 + @Override
  82 + public boolean equals(Object that) {
  83 + if (this == that) {
  84 + return true;
  85 + }
  86 + if (that == null) {
  87 + return false;
  88 + }
  89 + if (getClass() != that.getClass()) {
  90 + return false;
  91 + }
  92 + GarOrderMatchDisposal other = (GarOrderMatchDisposal) that;
  93 + return (this.getGarId() == null ? other.getGarId() == null : this.getGarId().equals(other.getGarId()))
  94 + && (this.getGarOrderId() == null ? other.getGarOrderId() == null : this.getGarOrderId().equals(other.getGarOrderId()))
  95 + && (this.getGarOrderDisposalTel() == null ? other.getGarOrderDisposalTel() == null : this.getGarOrderDisposalTel().equals(other.getGarOrderDisposalTel()))
  96 + && (this.getGarOrderDisposalName() == null ? other.getGarOrderDisposalName() == null : this.getGarOrderDisposalName().equals(other.getGarOrderDisposalName()))
  97 + && (this.getGarOrderDisposalCompanyId() == null ? other.getGarOrderDisposalCompanyId() == null : this.getGarOrderDisposalCompanyId().equals(other.getGarOrderDisposalCompanyId()))
  98 + && (this.getGarOrderDisposalCompanyName() == null ? other.getGarOrderDisposalCompanyName() == null : this.getGarOrderDisposalCompanyName().equals(other.getGarOrderDisposalCompanyName()))
  99 + && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
  100 + && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
  101 + && (this.getGarCreateBy() == null ? other.getGarCreateBy() == null : this.getGarCreateBy().equals(other.getGarCreateBy()))
  102 + && (this.getGarUpdateBy() == null ? other.getGarUpdateBy() == null : this.getGarUpdateBy().equals(other.getGarUpdateBy()))
  103 + && (this.getGarReason() == null ? other.getGarReason() == null : this.getGarReason().equals(other.getGarReason()));
  104 + }
  105 +
  106 + @Override
  107 + public int hashCode() {
  108 + final int prime = 31;
  109 + int result = 1;
  110 + result = prime * result + ((getGarId() == null) ? 0 : getGarId().hashCode());
  111 + result = prime * result + ((getGarOrderId() == null) ? 0 : getGarOrderId().hashCode());
  112 + result = prime * result + ((getGarOrderDisposalTel() == null) ? 0 : getGarOrderDisposalTel().hashCode());
  113 + result = prime * result + ((getGarOrderDisposalName() == null) ? 0 : getGarOrderDisposalName().hashCode());
  114 + result = prime * result + ((getGarOrderDisposalCompanyId() == null) ? 0 : getGarOrderDisposalCompanyId().hashCode());
  115 + result = prime * result + ((getGarOrderDisposalCompanyName() == null) ? 0 : getGarOrderDisposalCompanyName().hashCode());
  116 + result = prime * result + ((getGarCreateTime() == null) ? 0 : getGarCreateTime().hashCode());
  117 + result = prime * result + ((getGarUpdateTime() == null) ? 0 : getGarUpdateTime().hashCode());
  118 + result = prime * result + ((getGarCreateBy() == null) ? 0 : getGarCreateBy().hashCode());
  119 + result = prime * result + ((getGarUpdateBy() == null) ? 0 : getGarUpdateBy().hashCode());
  120 + result = prime * result + ((getGarReason() == null) ? 0 : getGarReason().hashCode());
  121 + return result;
  122 + }
  123 +
  124 + @Override
  125 + public String toString() {
  126 + StringBuilder sb = new StringBuilder();
  127 + sb.append(getClass().getSimpleName());
  128 + sb.append(" [");
  129 + sb.append("Hash = ").append(hashCode());
  130 + sb.append(", garId=").append(garId);
  131 + sb.append(", garOrderId=").append(garOrderId);
  132 + sb.append(", garOrderDisposalTel=").append(garOrderDisposalTel);
  133 + sb.append(", garOrderDisposalName=").append(garOrderDisposalName);
  134 + sb.append(", garOrderDisposalCompanyId=").append(garOrderDisposalCompanyId);
  135 + sb.append(", garOrderDisposalCompanyName=").append(garOrderDisposalCompanyName);
  136 + sb.append(", garCreateTime=").append(garCreateTime);
  137 + sb.append(", garUpdateTime=").append(garUpdateTime);
  138 + sb.append(", garCreateBy=").append(garCreateBy);
  139 + sb.append(", garUpdateBy=").append(garUpdateBy);
  140 + sb.append(", garReason=").append(garReason);
  141 + sb.append(", serialVersionUID=").append(serialVersionUID);
  142 + sb.append("]");
  143 + return sb.toString();
  144 + }
  145 +
  146 + public String getGarId() {
  147 + return garId;
  148 + }
  149 +
  150 + public void setGarId(String garId) {
  151 + this.garId = garId;
  152 + }
  153 +
  154 + public String getGarOrderId() {
  155 + return garOrderId;
  156 + }
  157 +
  158 + public void setGarOrderId(String garOrderId) {
  159 + this.garOrderId = garOrderId;
  160 + }
  161 +
  162 + public String getGarOrderDisposalTel() {
  163 + return garOrderDisposalTel;
  164 + }
  165 +
  166 + public void setGarOrderDisposalTel(String garOrderDisposalTel) {
  167 + this.garOrderDisposalTel = garOrderDisposalTel;
  168 + }
  169 +
  170 + public String getGarOrderDisposalName() {
  171 + return garOrderDisposalName;
  172 + }
  173 +
  174 + public void setGarOrderDisposalName(String garOrderDisposalName) {
  175 + this.garOrderDisposalName = garOrderDisposalName;
  176 + }
  177 +
  178 + public String getGarOrderDisposalCompanyId() {
  179 + return garOrderDisposalCompanyId;
  180 + }
  181 +
  182 + public void setGarOrderDisposalCompanyId(String garOrderDisposalCompanyId) {
  183 + this.garOrderDisposalCompanyId = garOrderDisposalCompanyId;
  184 + }
  185 +
  186 + public String getGarOrderDisposalCompanyName() {
  187 + return garOrderDisposalCompanyName;
  188 + }
  189 +
  190 + public void setGarOrderDisposalCompanyName(String garOrderDisposalCompanyName) {
  191 + this.garOrderDisposalCompanyName = garOrderDisposalCompanyName;
  192 + }
  193 +
  194 + public Date getGarCreateTime() {
  195 + return garCreateTime;
  196 + }
  197 +
  198 + public void setGarCreateTime(Date garCreateTime) {
  199 + this.garCreateTime = garCreateTime;
  200 + }
  201 +
  202 + public Date getGarUpdateTime() {
  203 + return garUpdateTime;
  204 + }
  205 +
  206 + public void setGarUpdateTime(Date garUpdateTime) {
  207 + this.garUpdateTime = garUpdateTime;
  208 + }
  209 +
  210 + public String getGarCreateBy() {
  211 + return garCreateBy;
  212 + }
  213 +
  214 + public void setGarCreateBy(String garCreateBy) {
  215 + this.garCreateBy = garCreateBy;
  216 + }
  217 +
  218 + public String getGarUpdateBy() {
  219 + return garUpdateBy;
  220 + }
  221 +
  222 + public void setGarUpdateBy(String garUpdateBy) {
  223 + this.garUpdateBy = garUpdateBy;
  224 + }
  225 +
  226 + public String getGarReason() {
  227 + return garReason;
  228 + }
  229 +
  230 + public void setGarReason(String garReason) {
  231 + this.garReason = garReason;
  232 + }
  233 +}
0 \ No newline at end of file 234 \ No newline at end of file
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/DisposalDispatchDto.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.pojo.dto;
  2 +
  3 +import lombok.Data;
  4 +import org.apache.commons.lang3.builder.EqualsBuilder;
  5 +import org.apache.commons.lang3.builder.HashCodeBuilder;
  6 +
  7 +import java.util.List;
  8 +
  9 +@Data
  10 +public class DisposalDispatchDto {
  11 + private String garOrderId;
  12 + private List<DispatchDetail> dispatchList;
  13 +
  14 +
  15 + @Data
  16 + public static class DispatchDetail{
  17 + private String tel;
  18 + private String name;
  19 +
  20 +
  21 + public String getTel() {
  22 + return tel;
  23 + }
  24 +
  25 + public void setTel(String tel) {
  26 + this.tel = tel;
  27 + }
  28 +
  29 + public String getName() {
  30 + return name;
  31 + }
  32 +
  33 + public void setName(String name) {
  34 + this.name = name;
  35 + }
  36 +
  37 + @Override
  38 + public String toString() {
  39 + return "DispatchDetail{" +
  40 + ", tel='" + tel + '\'' +
  41 + ", name='" + name + '\'' +
  42 + '}';
  43 + }
  44 +
  45 +
  46 + @Override
  47 + public boolean equals(Object o) {
  48 + if (this == o) return true;
  49 +
  50 + if (o == null || getClass() != o.getClass()) return false;
  51 +
  52 + DispatchDetail that = (DispatchDetail) o;
  53 +
  54 + return new EqualsBuilder().append(getTel(), that.getTel()).append(getName(), that.getName()).isEquals();
  55 + }
  56 +
  57 + @Override
  58 + public int hashCode() {
  59 + return new HashCodeBuilder(17, 37).append(getTel()).append(getName()).toHashCode();
  60 + }
  61 + }
  62 +
  63 +
  64 +
  65 + public String getGarOrderId() {
  66 + return garOrderId;
  67 + }
  68 +
  69 + public void setGarOrderId(String garOrderId) {
  70 + this.garOrderId = garOrderId;
  71 + }
  72 +
  73 + public List<DispatchDetail> getDispatchList() {
  74 + return dispatchList;
  75 + }
  76 +
  77 + public void setDispatchList(List<DispatchDetail> dispatchList) {
  78 + this.dispatchList = dispatchList;
  79 + }
  80 +
  81 +
  82 + @Override
  83 + public String toString() {
  84 + return "DispatchDto{" +
  85 + "garOrderId='" + garOrderId + '\'' +
  86 + ", detailList=" + dispatchList +
  87 + '}';
  88 + }
  89 +
  90 + @Override
  91 + public boolean equals(Object o) {
  92 + if (this == o) return true;
  93 +
  94 + if (o == null || getClass() != o.getClass()) return false;
  95 +
  96 + DisposalDispatchDto that = (DisposalDispatchDto) o;
  97 +
  98 + return new EqualsBuilder().append(getGarOrderId(), that.getGarOrderId()).append(getDispatchList(), that.getDispatchList()).isEquals();
  99 + }
  100 +
  101 + @Override
  102 + public int hashCode() {
  103 + return new HashCodeBuilder(17, 37).append(getGarOrderId()).append(getDispatchList()).toHashCode();
  104 + }
  105 +}
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.java
  View file @9571b20
@@ -15,24 +15,11 @@ public class OrderUpdateDto { @@ -15,24 +15,11 @@ public class OrderUpdateDto {
15 */ 15 */
16 private Integer garCancelFlag; 16 private Integer garCancelFlag;
17 17
18 - private String garReason;  
19 -  
20 -  
21 - public Integer getGarCancelFlag() {  
22 - return garCancelFlag;  
23 - } 18 + private String garOrderHandleTel;
24 19
25 - public void setGarCancelFlag(Integer garCancelFlag) {  
26 - this.garCancelFlag = garCancelFlag;  
27 - }  
28 -  
29 - public String getGarReason() {  
30 - return garReason;  
31 - } 20 + private String garReason;
32 21
33 - public void setGarReason(String garReason) {  
34 - this.garReason = garReason;  
35 - } 22 + private String validCode;
36 23
37 /** 24 /**
38 * 订单id 25 * 订单id
@@ -72,6 +59,37 @@ public class OrderUpdateDto { @@ -72,6 +59,37 @@ public class OrderUpdateDto {
72 public void setImageUrls(List<String> imageUrls) { 59 public void setImageUrls(List<String> imageUrls) {
73 this.imageUrls = imageUrls; 60 this.imageUrls = imageUrls;
74 } 61 }
75 -  
76 - 62 +
  63 +
  64 + public Integer getGarCancelFlag() {
  65 + return garCancelFlag;
  66 + }
  67 +
  68 + public void setGarCancelFlag(Integer garCancelFlag) {
  69 + this.garCancelFlag = garCancelFlag;
  70 + }
  71 +
  72 + public String getGarReason() {
  73 + return garReason;
  74 + }
  75 +
  76 + public void setGarReason(String garReason) {
  77 + this.garReason = garReason;
  78 + }
  79 +
  80 + public String getGarOrderHandleTel() {
  81 + return garOrderHandleTel;
  82 + }
  83 +
  84 + public void setGarOrderHandleTel(String garOrderHandleTel) {
  85 + this.garOrderHandleTel = garOrderHandleTel;
  86 + }
  87 +
  88 + public String getValidCode() {
  89 + return validCode;
  90 + }
  91 +
  92 + public void setValidCode(String validCode) {
  93 + this.validCode = validCode;
  94 + }
77 } 95 }
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDisposalVo.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.pojo.vo;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.trash.garbage.global.GlobalStatus;
  5 +import com.trash.garbage.pojo.domain.GarOrderCar;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +
  9 +import java.util.ArrayList;
  10 +import java.util.Date;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * @author 20412
  15 + */
  16 +@ToString
  17 +@EqualsAndHashCode
  18 +public class DispatchDisposalVo {
  19 +
  20 +
  21 + private List<Personnel> personnelInfo;
  22 +
  23 +
  24 + private String garOrderDisposalCompanyName;
  25 + private String garOrderDisposalCompanyId;
  26 + public String getGarOrderDisposalCompanyName() {
  27 + return garOrderDisposalCompanyName;
  28 + }
  29 +
  30 + public void setGarOrderDisposalCompanyName(String garOrderDisposalCompanyName) {
  31 + this.garOrderDisposalCompanyName = garOrderDisposalCompanyName;
  32 + }
  33 +
  34 + public String getGarOrderDisposalCompanyId() {
  35 + return garOrderDisposalCompanyId;
  36 + }
  37 +
  38 + public void setGarOrderDisposalCompanyId(String garOrderDisposalCompanyId) {
  39 + this.garOrderDisposalCompanyId = garOrderDisposalCompanyId;
  40 + }
  41 + /**
  42 + * 人员信息
  43 + */
  44 + @EqualsAndHashCode
  45 + public static class Personnel {
  46 + /**
  47 + * 姓名
  48 + */
  49 + private String personName;
  50 + /**
  51 + * 手机号
  52 + */
  53 + private String tel;
  54 +
  55 + /**
  56 + * 是否选择
  57 + */
  58 + private Boolean checked;
  59 +
  60 + public String getTel() {
  61 + return tel;
  62 + }
  63 +
  64 + public void setTel(String tel) {
  65 + this.tel = tel;
  66 + }
  67 +
  68 + public Boolean getChecked() {
  69 + return checked;
  70 + }
  71 +
  72 + public void setChecked(Boolean checked) {
  73 + this.checked = checked;
  74 + }
  75 +
  76 + public String getPersonName() {
  77 + return personName;
  78 + }
  79 +
  80 + public void setPersonName(String personName) {
  81 + this.personName = personName;
  82 + }
  83 + }
  84 +
  85 + public List<Personnel> getPersonnelInfo() {
  86 + return personnelInfo;
  87 + }
  88 +
  89 + public void setPersonnelInfo(List<Personnel> personnelInfo) {
  90 + this.personnelInfo = personnelInfo;
  91 + }
  92 +
  93 +}
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
  View file @9571b20
@@ -22,7 +22,7 @@ public class OrderDetailVo { @@ -22,7 +22,7 @@ public class OrderDetailVo {
22 22
23 private Integer garCancelFlag; 23 private Integer garCancelFlag;
24 24
25 - 25 + private String validCode;
26 private String garReason; 26 private String garReason;
27 private String garOrderHandlerId; 27 private String garOrderHandlerId;
28 28
@@ -150,6 +150,13 @@ public class OrderDetailVo { @@ -150,6 +150,13 @@ public class OrderDetailVo {
150 this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue(); 150 this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
151 } 151 }
152 152
  153 + public String getValidCode() {
  154 + return validCode;
  155 + }
  156 +
  157 + public void setValidCode(String validCode) {
  158 + this.validCode = validCode;
  159 + }
153 160
154 public String getGarHandlerCarCode() { 161 public String getGarHandlerCarCode() {
155 return garHandlerCarCode; 162 return garHandlerCarCode;
@@ -395,39 +402,4 @@ public class OrderDetailVo { @@ -395,39 +402,4 @@ public class OrderDetailVo {
395 this.garCoordinate = garCoordinate; 402 this.garCoordinate = garCoordinate;
396 } 403 }
397 404
398 - @Override  
399 - public String toString() {  
400 - return "OrderDetailVo{" +  
401 - "garCancelFlag=" + garCancelFlag +  
402 - ", garReason='" + garReason + '\'' +  
403 - ", garOrderHandlerId='" + garOrderHandlerId + '\'' +  
404 - ", garEvaluateFlag=" + garEvaluateFlag +  
405 - ", garHandlerEvaluateFlag=" + garHandlerEvaluateFlag +  
406 - ", garOrderHandleName='" + garOrderHandleName + '\'' +  
407 - ", garOrderHandleTel='" + garOrderHandleTel + '\'' +  
408 - ", garOrderAddress='" + garOrderAddress + '\'' +  
409 - ", currentImages=" + currentImages +  
410 - ", putOnImages=" + putOnImages +  
411 - ", putDownImages=" + putDownImages +  
412 - ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +  
413 - ", garLongitude=" + garLongitude +  
414 - ", garLatitude=" + garLatitude +  
415 - ", garCoordinate='" + garCoordinate + '\'' +  
416 - ", garOrderContactName='" + garOrderContactName + '\'' +  
417 - ", garOrderTrashType='" + garOrderTrashType + '\'' +  
418 - ", garCarInfoList=" + garCarInfoList +  
419 - ", garOrderHandlerStatus=" + garOrderHandlerStatus +  
420 - ", garCreateTime=" + garCreateTime +  
421 - ", garOrderContactTel='" + garOrderContactTel + '\'' +  
422 - ", garOrderCompanyId='" + garOrderCompanyId + '\'' +  
423 - ", garOrderCompanyName='" + garOrderCompanyName + '\'' +  
424 - ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +  
425 - ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +  
426 - ", garRemark='" + garRemark + '\'' +  
427 - ", handleFlag=" + handleFlag +  
428 - ", garOrderMatchFlag=" + garOrderMatchFlag +  
429 - ", garOrderStatus=" + garOrderStatus +  
430 - ", garHandlerCarCode='" + garHandlerCarCode + '\'' +  
431 - '}';  
432 - }  
433 } 405 }
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchAskService.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
  5 +import com.trash.garbage.pojo.vo.DispatchDisposalVo;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 +* @author 20412
  11 +* @description 针对表【gar_order_match_ask(匹配处理场所人员表)】的数据库操作Service
  12 +* @createDate 2024-05-10 11:25:16
  13 +*/
  14 +public interface GarOrderMatchAskService extends IService<GarOrderMatchAsk> {
  15 +
  16 +}
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchDisposalService.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
  5 +import com.trash.garbage.pojo.vo.DispatchDisposalVo;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 +* @author 20412
  11 +* @description 针对表【gar_order_match_dispotal(派单分发处理场所表)】的数据库操作Service
  12 +* @createDate 2024-05-10 11:25:17
  13 +*/
  14 +public interface GarOrderMatchDisposalService extends IService<GarOrderMatchDisposal> {
  15 +
  16 + List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId, Long id);
  17 +}
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
  View file @9571b20
@@ -7,6 +7,7 @@ import com.trash.garbage.pojo.domain.GarOrder; @@ -7,6 +7,7 @@ import com.trash.garbage.pojo.domain.GarOrder;
7 import com.trash.garbage.pojo.domain.GarOrderEvaluate; 7 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
8 import com.trash.garbage.pojo.domain.GarOrderMatchHandler; 8 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
9 import com.trash.garbage.pojo.dto.*; 9 import com.trash.garbage.pojo.dto.*;
  10 +import com.trash.garbage.pojo.vo.DispatchDisposalVo;
10 import com.trash.garbage.pojo.vo.DispatchDriverVo; 11 import com.trash.garbage.pojo.vo.DispatchDriverVo;
11 import com.trash.garbage.pojo.vo.OrderDetailVo; 12 import com.trash.garbage.pojo.vo.OrderDetailVo;
12 13
@@ -69,11 +70,15 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; { @@ -69,11 +70,15 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
69 70
70 List<GarOrderEvaluate> queryEvaluateDetail(String orderId); 71 List<GarOrderEvaluate> queryEvaluateDetail(String orderId);
71 72
72 - void dispatchOrder(DispatchDto dto); 73 + void dispatchDriverOrders(DispatchDto dto);
73 74
74 List<DispatchDriverVo> queryDispatch(String orderId); 75 List<DispatchDriverVo> queryDispatch(String orderId);
75 76
76 List<GarOrderMatchHandler> queryOrderHandlerStatus(String orderId); 77 List<GarOrderMatchHandler> queryOrderHandlerStatus(String orderId);
77 78
78 PageInfo querySearchHistory(); 79 PageInfo querySearchHistory();
  80 +
  81 + void dispatchDisposalOrders(DisposalDispatchDto dto);
  82 +
  83 + List<DispatchDisposalVo> queryDisposalDispatch(String orderId);
79 } 84 }
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  4 +import com.trash.garbage.mapper.mapper.GarOrderMatchAskMapper;
  5 +import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
  6 +import com.trash.garbage.pojo.vo.DispatchDisposalVo;
  7 +import com.trash.garbage.service.GarOrderMatchAskService;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 +* @author 20412
  14 +* @description 针对表【gar_order_match_ask(匹配处理场所人员表)】的数据库操作Service实现
  15 +* @createDate 2024-05-10 11:25:16
  16 +*/
  17 +@Service
  18 +public class GarOrderMatchAskServiceImpl extends ServiceImpl<GarOrderMatchAskMapper, GarOrderMatchAsk>
  19 + implements GarOrderMatchAskService {
  20 +
  21 +
  22 +}
  23 +
  24 +
  25 +
  26 +
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java 0 → 100644
  View file @9571b20
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  4 +import com.trash.garbage.mapper.mapper.GarOrderMatchDisposalMapper;
  5 +import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
  6 +import com.trash.garbage.pojo.vo.DispatchDisposalVo;
  7 +import com.trash.garbage.service.GarOrderMatchDisposalService;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 +* @author 20412
  14 +* @description 针对表【gar_order_match_dispotal(派单分发处理场所表)】的数据库操作Service实现
  15 +* @createDate 2024-05-10 11:25:17
  16 +*/
  17 +@Service
  18 +public class GarOrderMatchDisposalServiceImpl extends ServiceImpl<GarOrderMatchDisposalMapper, GarOrderMatchDisposal>
  19 + implements GarOrderMatchDisposalService {
  20 +
  21 + @Override
  22 + public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId, Long id) {
  23 + return baseMapper.queryDisposalListWithDispatchStatus(orderId,id);
  24 + }
  25 +}
  26 +
  27 +
  28 +
  29 +
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @9571b20
@@ -3,18 +3,20 @@ package com.trash.garbage.service.impl; @@ -3,18 +3,20 @@ package com.trash.garbage.service.impl;
3 import java.util.*; 3 import java.util.*;
4 import java.util.stream.Collectors; 4 import java.util.stream.Collectors;
5 5
  6 +import com.trash.common.core.redis.RedisCache;
6 import com.trash.common.utils.ServletUtils; 7 import com.trash.common.utils.ServletUtils;
  8 +import com.trash.disposalSite.domain.DisposalSite;
  9 +import com.trash.disposalSite.service.IDisposalSiteService;
7 import com.trash.enterprise.domain.TransportationEnterprise; 10 import com.trash.enterprise.domain.TransportationEnterprise;
8 import com.trash.enterprise.service.ITransportationEnterpriseService; 11 import com.trash.enterprise.service.ITransportationEnterpriseService;
9 import com.trash.garbage.custom.BizException; 12 import com.trash.garbage.custom.BizException;
10 import com.trash.garbage.global.ResultCode; 13 import com.trash.garbage.global.ResultCode;
11 import com.trash.garbage.pojo.domain.*; 14 import com.trash.garbage.pojo.domain.*;
12 import com.trash.garbage.pojo.dto.*; 15 import com.trash.garbage.pojo.dto.*;
13 -import com.trash.garbage.pojo.vo.DispatchDriverVo;  
14 -import com.trash.garbage.pojo.vo.GarOrderDriverVo;  
15 -import com.trash.garbage.pojo.vo.TransportationEnterpriseVo; 16 +import com.trash.garbage.pojo.vo.*;
16 import com.trash.garbage.service.*; 17 import com.trash.garbage.service.*;
17 import com.trash.garbage.utils.SMSUtils; 18 import com.trash.garbage.utils.SMSUtils;
  19 +import com.trash.garbage.utils.ValidateCodeUtil;
18 import org.apache.commons.lang3.StringUtils; 20 import org.apache.commons.lang3.StringUtils;
19 import org.springframework.beans.factory.annotation.Autowired; 21 import org.springframework.beans.factory.annotation.Autowired;
20 import org.springframework.stereotype.Service; 22 import org.springframework.stereotype.Service;
@@ -30,7 +32,6 @@ import com.trash.driver.domain.vo.DriverVo; @@ -30,7 +32,6 @@ import com.trash.driver.domain.vo.DriverVo;
30 import com.trash.driver.service.IDriverService; 32 import com.trash.driver.service.IDriverService;
31 import com.trash.garbage.global.GlobalStatus; 33 import com.trash.garbage.global.GlobalStatus;
32 import com.trash.garbage.mapper.GarOrderMapper; 34 import com.trash.garbage.mapper.GarOrderMapper;
33 -import com.trash.garbage.pojo.vo.OrderDetailVo;  
34 import cn.hutool.core.collection.CollectionUtil; 35 import cn.hutool.core.collection.CollectionUtil;
35 36
36 import javax.annotation.Resource; 37 import javax.annotation.Resource;
@@ -55,11 +56,15 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -55,11 +56,15 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
55 private GarAddressService garAddressService; 56 private GarAddressService garAddressService;
56 57
57 @Autowired 58 @Autowired
  59 + private GarOrderMatchAskService matchAskService;
  60 +
  61 + @Autowired
  62 + private GarOrderMatchDisposalService disposalService;
  63 + @Autowired
58 private ITransportationEnterpriseService transportationEnterpriseService; 64 private ITransportationEnterpriseService transportationEnterpriseService;
59 65
60 @Autowired 66 @Autowired
61 private GarOrderEvaluateService garOrderEvaluateService; 67 private GarOrderEvaluateService garOrderEvaluateService;
62 -  
63 @Autowired 68 @Autowired
64 private GarSearchHistoryService garSearchHistoryService; 69 private GarSearchHistoryService garSearchHistoryService;
65 70
@@ -70,17 +75,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -70,17 +75,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
70 private IDriverService driverService; 75 private IDriverService driverService;
71 76
72 @Autowired 77 @Autowired
73 - private ITransportationEnterpriseService enterpriseService;  
74 -  
75 - @Autowired  
76 - private IDriverService iDriverService;  
77 -  
78 - @Autowired  
79 private GarOrderMatchHandlerService handlerService; 78 private GarOrderMatchHandlerService handlerService;
80 79
81 @Autowired 80 @Autowired
82 private GarOrderCarService garOrderCarService; 81 private GarOrderCarService garOrderCarService;
83 82
  83 + @Autowired
  84 + private RedisCache redisCache;
  85 +
84 @Override 86 @Override
85 @Transactional(rollbackFor = Exception.class) 87 @Transactional(rollbackFor = Exception.class)
86 public String saveOrder(OrderDto dto) { 88 public String saveOrder(OrderDto dto) {
@@ -169,6 +171,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -169,6 +171,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
169 qwc.eq(GarOrderCar::getGarOrderId, orderVo.getGarOrderId()); 171 qwc.eq(GarOrderCar::getGarOrderId, orderVo.getGarOrderId());
170 List<GarOrderCar> carList = garOrderCarService.list(qwc); 172 List<GarOrderCar> carList = garOrderCarService.list(qwc);
171 vo.setGarCarInfoList(carList); 173 vo.setGarCarInfoList(carList);
  174 + // 验证码
  175 + String validCode = redisCache.getCacheMapValue(user.getGarUserTel(), orderId);
  176 + vo.setValidCode(validCode);
172 return vo; 177 return vo;
173 } 178 }
174 179
@@ -284,48 +289,67 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -284,48 +289,67 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
284 } 289 }
285 // 处理分发订单 驾驶员 290 // 处理分发订单 驾驶员
286 else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) { 291 else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
287 - // TODO 后续删除 驾驶员无法取消 292 + // TODO 处理场所负责人
288 return handlerDispatchOrderStatus(dto, user); 293 return handlerDispatchOrderStatus(dto, user);
289 } 294 }
  295 + //
  296 + else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription())) {
  297 + // TODO 处理场所负责人
  298 + return handlerDisposalSiteOrderStatus(dto, user);
  299 + }
  300 +
  301 + throw new BizException(ResultCode.CODE_500);
  302 +
  303 + }
290 304
  305 + private String handlerDisposalSiteOrderStatus(OrderUpdateDto dto, GarUser user) {
  306 + GarOrderDriverVo order = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), dto.getGarOrderId(), GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  307 + // 处理场所负责人 清运中 ==》已完成 TODO 修改 只有与预估车辆相匹配以后才会完成订单
  308 +// if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
  309 +// && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {
  310 +// LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
  311 +// uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
  312 +// .eq(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel())
  313 +// .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
  314 +// handlerService.update(uw);
  315 +// return "订单已完成";
  316 +// }
  317 + // 根据传入的validCode 和订单id去生成一条清运记录 一条记录生成一个validCode
  318 + if (checkValidCode(dto.getGarOrderHandleTel(), dto.getGarOrderId(), dto.getValidCode())) {
  319 + // TODO 生成记录
  320 + GarOrderMatchAsk ask = new GarOrderMatchAsk();
  321 + BeanUtils.copyProperties(order, ask, "garCreateTime", "garUpdateTime", "garCreateBy", "garUpdateBy");
  322 + String code = ValidateCodeUtil.generatorCode(6);
  323 +
  324 + redisCache.setCacheMapValue(dto.getGarOrderHandleTel(), dto.getGarOrderId(),code);
  325 + matchAskService.save(ask);
  326 + return "当前趟次记录成功";
  327 + }
  328 + // TODO 记录数
  329 + // update order count
291 throw new BizException(ResultCode.CODE_500); 330 throw new BizException(ResultCode.CODE_500);
  331 + }
292 332
  333 + private boolean checkValidCode(String tel, String orderId, String code) {
  334 + String validCode = redisCache.getCacheMapValue(tel, orderId);
  335 + return code.equals(validCode);
293 } 336 }
294 337
  338 +
295 @Deprecated 339 @Deprecated
296 private String handlerDispatchOrderStatus(OrderUpdateDto dto, GarUser user) { 340 private String handlerDispatchOrderStatus(OrderUpdateDto dto, GarUser user) {
297 -// GarOrder order = getById(dto.getGarOrderId());  
298 GarOrderDriverVo order = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), dto.getGarOrderId(), GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue()); 341 GarOrderDriverVo order = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), dto.getGarOrderId(), GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
299 - // 取消订单  
300 - if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_YES.getValue().equals(dto.getGarCancelFlag())) { 342 + // 公司所属 待清运- 》 清运中
  343 + if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
  344 + || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
301 LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>(); 345 LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
302 - uw.set(GarOrderMatchHandler::getGarCancelFlag, dto.getGarCancelFlag())  
303 - .set(GarOrderMatchHandler::getGarReason, dto.getGarReason())  
304 - .eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId()); 346 + uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
  347 + .eq(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel())
  348 + .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue());
305 handlerService.update(uw); 349 handlerService.update(uw);
306 - return "已取消订单";  
307 - } else {  
308 - // 公司所属 待清运- 》 清运中  
309 - if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())  
310 - || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {  
311 - LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();  
312 - uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())  
313 - .eq(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel())  
314 - .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue());  
315 - handlerService.update(uw);  
316 - return "已接受订单";  
317 - }  
318 - // 运输驾驶员 清运中 ==》已完成  
319 - if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())  
320 - && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {  
321 - LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();  
322 - uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())  
323 - .eq(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel())  
324 - .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());  
325 - handlerService.update(uw);  
326 - }  
327 - return "订单已完成"; 350 + return "已接受订单";
328 } 351 }
  352 + throw new BizException(ResultCode.CODE_500);
329 } 353 }
330 354
331 private String handlerOrderStatus(OrderUpdateDto dto, GarUser user) { 355 private String handlerOrderStatus(OrderUpdateDto dto, GarUser user) {
@@ -591,10 +615,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -591,10 +615,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
591 } 615 }
592 616
593 @Override 617 @Override
594 - public void dispatchOrder(DispatchDto dto) { 618 + public void dispatchDriverOrders(DispatchDto dto) {
595 GarOrder order = getById(dto.getGarOrderId()); 619 GarOrder order = getById(dto.getGarOrderId());
596 List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getDispatchList().size()); 620 List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getDispatchList().size());
597 - int realCarCount = 0;  
598 // 每次下发统计选中驾驶员更新实际派车数量 621 // 每次下发统计选中驾驶员更新实际派车数量
599 // 已分配 继续下发 622 // 已分配 继续下发
600 if (order.getGarOrderMatchFlag().equals(GlobalStatus.GarOrderStatus.MATCH_YES.getValue())) { 623 if (order.getGarOrderMatchFlag().equals(GlobalStatus.GarOrderStatus.MATCH_YES.getValue())) {
@@ -608,17 +631,22 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -608,17 +631,22 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
608 GarOrderMatchHandler handler = getGarOrderMatchHandler(order, dispatchDetail); 631 GarOrderMatchHandler handler = getGarOrderMatchHandler(order, dispatchDetail);
609 handlerList.add(handler); 632 handlerList.add(handler);
610 } 633 }
611 - realCarCount = handlerMap.size() + handlerList.size();  
612 } else { 634 } else {
613 for (DispatchDto.DispatchDetail detail : dto.getDispatchList()) { 635 for (DispatchDto.DispatchDetail detail : dto.getDispatchList()) {
614 GarOrderMatchHandler handler = getGarOrderMatchHandler(order, detail); 636 GarOrderMatchHandler handler = getGarOrderMatchHandler(order, detail);
615 handlerList.add(handler); 637 handlerList.add(handler);
616 } 638 }
617 - realCarCount = handlerList.size();  
618 } 639 }
619 handlerService.saveBatch(handlerList); 640 handlerService.saveBatch(handlerList);
620 order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue()); 641 order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
621 - order.setGarRealCarCount(realCarCount); 642 + // TODO 以订单id和人员手机号 hash key返回前端生成二维码 存放到redis中
  643 + List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList());
  644 + for (String tel : tels) {
  645 + String code = ValidateCodeUtil.generatorCode(6);
  646 + redisCache.setCacheMapValue(tel, order.getGarOrderId(), code);
  647 + }
  648 + // TODO 短信通知
  649 + smsUtils.sendMessage(tels, "您有新的清运任务！请打开小程序查看当前任务。");
622 updateById(order); 650 updateById(order);
623 } 651 }
624 652
@@ -639,16 +667,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -639,16 +667,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
639 @Override 667 @Override
640 @Transactional(rollbackFor = Exception.class) 668 @Transactional(rollbackFor = Exception.class)
641 public List<DispatchDriverVo> queryDispatch(String orderId) { 669 public List<DispatchDriverVo> queryDispatch(String orderId) {
642 - GarOrder order = getById(orderId);  
643 - order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());  
644 - updateById(order); 670 +// GarOrder order = getById(orderId);
  671 +// order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
  672 +// updateById(order);
645 String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber(); 673 String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
646 TransportationEnterprise enterprise = new TransportationEnterprise(); 674 TransportationEnterprise enterprise = new TransportationEnterprise();
647 enterprise.setServicePhone(tel); 675 enterprise.setServicePhone(tel);
648 List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise); 676 List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
649 // 选中的司机 677 // 选中的司机
650 - LambdaQueryWrapper<GarOrderMatchHandler> qw = new LambdaQueryWrapper<>();  
651 - qw.eq(GarOrderMatchHandler::getGarOrderId, orderId);  
652 List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId()); 678 List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId());
653 return voList; 679 return voList;
654 } 680 }
@@ -673,6 +699,46 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -673,6 +699,46 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
673 return page; 699 return page;
674 } 700 }
675 701
  702 + @Override
  703 + public void dispatchDisposalOrders(DisposalDispatchDto dto) {
  704 + // TODO
  705 + GarOrder order = getById(dto.getGarOrderId());
  706 + List<GarOrderMatchDisposal> disposalList = new ArrayList<>(dto.getDispatchList().size());
  707 + LambdaQueryWrapper<GarOrderMatchDisposal> qw = new LambdaQueryWrapper<>();
  708 + qw.eq(GarOrderMatchDisposal::getGarOrderId, order.getGarOrderId());
  709 + Map<String, GarOrderMatchDisposal> handlerMap = disposalService.list(qw).stream().collect(Collectors.toMap(item -> item.getGarOrderDisposalTel(), item -> item));
  710 + for (DisposalDispatchDto.DispatchDetail detail : dto.getDispatchList()) {
  711 + if (handlerMap.containsKey(detail.getTel())) {
  712 + continue;
  713 + }
  714 + GarOrderMatchDisposal disposal = getGarOrderMatchDisposal(order, detail);
  715 + disposalList.add(disposal);
  716 + }
  717 + disposalService.saveBatch(disposalList);
  718 + List<String> tels = disposalList.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toList());
  719 + // TODO 短信通知
  720 + smsUtils.sendMessage(tels, "您有新的驻场任务！请打开小程序查看驻场任务。");
  721 + }
  722 +
  723 + private GarOrderMatchDisposal getGarOrderMatchDisposal(GarOrder order, DisposalDispatchDto.DispatchDetail detail) {
  724 + GarOrderMatchDisposal disposal = new GarOrderMatchDisposal();
  725 + disposal.setGarOrderDisposalTel(detail.getTel());
  726 + disposal.setGarOrderDisposalName(detail.getName());
  727 + disposal.setGarOrderId(order.getGarOrderId());
  728 + disposal.setGarOrderDisposalCompanyName(order.getGarOrderCompanyName());
  729 + disposal.setGarOrderDisposalCompanyId(order.getGarOrderCompanyId());
  730 + return disposal;
  731 + }
  732 +
  733 + @Override
  734 + public List<DispatchDisposalVo> queryDisposalDispatch(String orderId) {
  735 + // TODO
  736 +// String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
  737 + // 选中的司机处理场所
  738 + List<DispatchDisposalVo> voList = disposalService.queryDisposalListWithDispatchStatus(orderId, null);
  739 + return voList;
  740 + }
  741 +
676 private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) { 742 private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
677 Long cleanNumber = 0L; 743 Long cleanNumber = 0L;
678 for (GarOrder order : orderList) { 744 for (GarOrder order : orderList) {
trash-garbage/src/main/java/com/trash/garbage/utils/SMSUtils.java
  View file @9571b20
@@ -31,14 +31,27 @@ public class SMSUtils { @@ -31,14 +31,27 @@ public class SMSUtils {
31 * @param content 模板 31 * @param content 模板
32 */ 32 */
33 @Async 33 @Async
34 - public void sendMessage(String tell, String content) { 34 + public void sendMessage(String tel, String content) {
35 //发送 35 //发送
36 Mobile mobile = new Mobile(); 36 Mobile mobile = new Mobile();
37 - mobile.setMobile(tell); 37 + mobile.setMobile(tel);
38 List<Mobile> mobileList = new ArrayList<Mobile>(); 38 List<Mobile> mobileList = new ArrayList<Mobile>();
39 mobileList.add(mobile); 39 mobileList.add(mobile);
40 //更新提交信息 40 //更新提交信息
41 JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content); 41 JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content);
42 } 42 }
43 43
  44 + @Async
  45 + public void sendMessage(List<String> tels, String content) {
  46 + List<Mobile> mobileList = new ArrayList<Mobile>();
  47 + for (String tel : tels) {
  48 + //发送
  49 + Mobile mobile = new Mobile();
  50 + mobile.setMobile(tel);
  51 + mobileList.add(mobile);
  52 + }
  53 + //更新提交信息
  54 + JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content);
  55 + }
  56 +
44 } 57 }
45 \ No newline at end of file 58 \ No newline at end of file
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml 0 → 100644
  View file @9571b20
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper
  3 + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 + "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.garbage.mapper.mapper.GarOrderMatchAskMapper">
  6 +
  7 + <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderMatchAsk">
  8 + <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
  9 + <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
  10 + <result property="garOrderHandlerTel" column="gar_order_handler_tel" jdbcType="VARCHAR"/>
  11 + <result property="garOrderHandlerName" column="gar_order_handler_name" jdbcType="VARCHAR"/>
  12 + <result property="garOrderHandlerCompanyId" column="gar_order_handler_company_id" jdbcType="VARCHAR"/>
  13 + <result property="garOrderHandlerCompanyName" column="gar_order_handler_company_name" jdbcType="VARCHAR"/>
  14 + <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
  15 + <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
  16 + <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
  17 + <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
  18 + <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
  19 + </resultMap>
  20 +
  21 + <sql id="Base_Column_List">
  22 + gar_id,gar_order_id,gar_order_handler_tel,
  23 + gar_order_handler_name,gar_order_handler_company_id,gar_order_handler_company_name,
  24 + gar_create_time,gar_update_time,gar_create_by,
  25 + gar_update_by,gar_remark
  26 + </sql>
  27 +
  28 +</mapper>
trash-garbage/src/main/resources/mapper/GarOrderMatchDisposalMapper.xml 0 → 100644
  View file @9571b20
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper
  3 + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 + "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.garbage.mapper.mapper.GarOrderMatchDisposalMapper">
  6 +
  7 + <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderMatchDisposal">
  8 + <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
  9 + <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
  10 + <result property="garOrderDisposalTel" column="gar_order_disposal_tel" jdbcType="VARCHAR"/>
  11 + <result property="garOrderDisposalName" column="gar_order_disposal_name" jdbcType="VARCHAR"/>
  12 + <result property="garOrderDisposalCompanyId" column="gar_order_disposal_company_id" jdbcType="VARCHAR"/>
  13 + <result property="garOrderDisposalCompanyName" column="gar_order_disposal_company_name" jdbcType="VARCHAR"/>
  14 + <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
  15 + <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
  16 + <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
  17 + <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
  18 + <result property="garReason" column="gar_reason" jdbcType="VARCHAR"/>
  19 + </resultMap>
  20 +
  21 +
  22 + <resultMap id="DispatchDisposalVo" type="com.trash.garbage.pojo.vo.DispatchDisposalVo">
  23 + <id property="garOrderDisposalCompanyId" column="id" jdbcType="VARCHAR"/>
  24 + <result property="garOrderDisposalCompanyName" column="name" jdbcType="VARCHAR"/>
  25 + <collection property="personnelInfo" ofType="com.trash.garbage.pojo.vo.DispatchDisposalVo$Personnel">
  26 + <result property="tel" column="tel" jdbcType="VARCHAR"/>
  27 + <result property="personName" column="construction_unit_person" jdbcType="VARCHAR"/>
  28 + <result property="checked" column="checked"/>
  29 + </collection>
  30 + </resultMap>
  31 +
  32 +
  33 + <sql id="Base_Column_List">
  34 + gar_id
  35 + ,gar_order_id,gar_order_disposal_tel,
  36 + gar_order_disposal_name,gar_order_disposal_company_id,gar_order_disposal_company_name,
  37 + gar_create_time,gar_update_time,gar_create_by,
  38 + gar_update_by,gar_reason
  39 + </sql>
  40 + <select id="queryDisposalListWithDispatchStatus" resultMap="DispatchDisposalVo">
  41 + SELECT disposal.`name` AS `name`,
  42 + disposal.`id`,
  43 + disposal.construction_unit_person_phone AS tel,
  44 + disposal.construction_unit_person,
  45 + CASE
  46 +
  47 + WHEN gar.gar_order_id IS NULL THEN
  48 + 0
  49 + ELSE 1
  50 + END AS checked
  51 + FROM disposal_site disposal
  52 + LEFT JOIN gar_order_match_disposal gar
  53 + ON disposal.construction_unit_person_phone = gar.gar_order_disposal_tel
  54 + </select>
  55 +</mapper>