youxiw2000 / trash · Commits

Commit 3f7eec2545ade7894dc69d6254f44027681e073b

Authored by youxiw2000
2 parents 9b974f13 b036989f

Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

Inline Side-by-side
Showing 19 changed files with 146 additions and 76 deletions
trash-garbage/pom.xml
  View file @3f7eec2
... ... @@ -16,10 +16,10 @@
16 16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17 17 </properties>
18 18 <dependencies>
19   - <dependency>
20   - <groupId>com.trash</groupId>
21   - <artifactId>trash-common</artifactId>
22   - </dependency>
  19 +<!-- <dependency>-->
  20 +<!-- <groupId>com.trash</groupId>-->
  21 +<!-- <artifactId>trash-common</artifactId>-->
  22 +<!-- </dependency>-->
23 23 <dependency>
24 24 <groupId>com.trash</groupId>
25 25 <artifactId>trash-framework</artifactId>
... ...
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
  View file @3f7eec2
... ... @@ -27,7 +27,7 @@ public class GlobalStatus {
27 27 /**
28 28 * 用户状态管理
29 29 */
30   - public enum UserStatusEnum {
  30 + public enum GarUserStatusEnum {
31 31 /**
32 32 * 微信登录
33 33 */
... ... @@ -50,7 +50,7 @@ public class GlobalStatus {
50 50 return this.description;
51 51 }
52 52  
53   - UserStatusEnum(Integer status, String description) {
  53 + GarUserStatusEnum(Integer status, String description) {
54 54 this.status = status;
55 55 this.description = description;
56 56 }
... ... @@ -87,13 +87,15 @@ public class GlobalStatus {
87 87 NEW_ORDER(0, "新订单"),
88 88 ACTIVE_ORDER(1, "处理中"),
89 89 ALL_ORDER(2, "全部订单"),
90   - SUCCESS_ORDER(3, "待支付订单"),
  90 + SUCCESS_ORDER(3, "已完成"),
91 91 FAIL_ORDER(9, "订单处理失败"),
92 92 CANCEL_FLAG_NO(0, "未取消订单"),
93 93 CANCEL_FLAG_YES(1, "取消订单"),
94 94 IMAGE_TYPE_CURRENT(0, "现场图片"),
95 95 IMAGE_TYPE_PUT_ON(1, "装车图片"),
96 96 IMAGE_TYPE_PUT_DOWN(2, "卸车图片"),
  97 + EVALUATE_TYPE_COMPANY(0,"对公司评价"),
  98 + EVALUATE_TYPE_USER(1,"对用户评价"),
97 99 EVALUATE_ORDER_NO(0,"待评价"),
98 100 EVALUATE_ORDER_YES(1,"已评价");
99 101  
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
  View file @3f7eec2
... ... @@ -44,22 +44,6 @@ public class GarOrder implements Serializable {
44 44 */
45 45 private String garOrderCarType;
46 46  
47   - public Integer getGarOrderCarNumber() {
48   - return garOrderCarNumber;
49   - }
50   -
51   - public void setGarOrderCarNumber(Integer garOrderCarNumber) {
52   - this.garOrderCarNumber = garOrderCarNumber;
53   - }
54   -
55   - public String getGarOrderCarType() {
56   - return garOrderCarType;
57   - }
58   -
59   - public void setGarOrderCarType(String garOrderCarType) {
60   - this.garOrderCarType = garOrderCarType;
61   - }
62   -
63 47 /**
64 48 * 订单地址
65 49 */
... ... @@ -150,8 +134,21 @@ public class GarOrder implements Serializable {
150 134 /**
151 135 * 评分标识
152 136 */
153   - private Integer garEvaluateFlag;
154   - /**
  137 + private Integer garEvaluateFlag;
  138 + /**
  139 + * 处理人评分标识
  140 + */
  141 + private Integer garHandlerEvaluateFlag;
  142 +
  143 + public Integer getGarHandlerEvaluateFlag() {
  144 + return garHandlerEvaluateFlag;
  145 + }
  146 +
  147 + public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
  148 + this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
  149 + }
  150 +
  151 + /**
155 152 * 原因
156 153 */
157 154 private String garReason;
... ... @@ -370,6 +367,21 @@ public class GarOrder implements Serializable {
370 367 this.garReason = garReason;
371 368 }
372 369  
  370 + public Integer getGarOrderCarNumber() {
  371 + return garOrderCarNumber;
  372 + }
  373 +
  374 + public void setGarOrderCarNumber(Integer garOrderCarNumber) {
  375 + this.garOrderCarNumber = garOrderCarNumber;
  376 + }
  377 +
  378 + public String getGarOrderCarType() {
  379 + return garOrderCarType;
  380 + }
  381 +
  382 + public void setGarOrderCarType(String garOrderCarType) {
  383 + this.garOrderCarType = garOrderCarType;
  384 + }
373 385  
374 386  
375 387  
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/EvaluateDto.java
  View file @3f7eec2
... ... @@ -14,6 +14,19 @@ public class EvaluateDto {
14 14 @NotBlank(message = "订单id不能为空")
15 15 private String orderId;
16 16 private String content;
  17 +
  18 + public Integer getEvaluateType() {
  19 + return evaluateType;
  20 + }
  21 +
  22 + public void setEvaluateType(Integer evaluateType) {
  23 + this.evaluateType = evaluateType;
  24 + }
  25 +
  26 + /**
  27 + * 评价类型 0对公司 | 1对用户
  28 + */
  29 + private Integer evaluateType;
17 30 @NotNull
18 31 private Integer score;
19 32 private List<String> imageUrls;
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
  View file @3f7eec2
1 1 package com.trash.garbage.pojo.vo;
2 2  
3 3 import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.trash.garbage.global.GlobalStatus;
4 5 import lombok.Data;
5 6  
6 7 import java.util.ArrayList;
... ... @@ -15,11 +16,13 @@ public class OrderDetailVo {
15 16  
16 17 private Integer garCancelFlag;
17 18  
  19 + private Integer garOrderCarNumber;
  20 +
18 21 private String garReason;
19 22 private String garOrderHandlerId;
20 23  
21 24 private Integer garEvaluateFlag;
22   - private Boolean garHandleEvaluateFlag;
  25 + private Integer garHandlerEvaluateFlag;
23 26 private String garOrderCarType;
24 27  
25 28 /**
... ... @@ -114,12 +117,9 @@ public class OrderDetailVo {
114 117 this.putDownImages = new ArrayList<>();
115 118 this.putOnImages = new ArrayList<>();
116 119 this.handleFlag = false;
117   - this.garHandleEvaluateFlag = true;
  120 + this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
118 121 }
119 122  
120   - public String getGarOrderHandleId() {
121   - return garOrderHandlerId;
122   - }
123 123  
124 124 public void setGarOrderHandlerId(String garOrderHandlerId) {
125 125 this.garOrderHandlerId = garOrderHandlerId;
... ... @@ -307,12 +307,12 @@ public class OrderDetailVo {
307 307 this.handleFlag = handleFlag;
308 308 }
309 309  
310   - public Boolean getGarHandleEvaluateFlag() {
311   - return garHandleEvaluateFlag;
  310 + public Integer getGarHandlerEvaluateFlag() {
  311 + return garHandlerEvaluateFlag;
312 312 }
313 313  
314   - public void setGarHandleEvaluateFlag(Boolean garHandleEvaluateFlag) {
315   - this.garHandleEvaluateFlag = garHandleEvaluateFlag;
  314 + public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
  315 + this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
316 316 }
317 317  
318 318  
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @3f7eec2
... ... @@ -90,18 +90,19 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
90 90 @Override
91 91 public OrderDetailVo queryOrderDetail(String id) {
92 92 GarOrder order = this.getById(id);
93   - String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
  93 + GarUser user = garUserService.getById(SecurityUtils.getLoginUser().getUser().getUserId());
94 94 LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
95 95 qwi.eq(GarOrderImage::getGarOrderId, id);
96 96 OrderDetailVo vo = new OrderDetailVo();
97   - BeanUtils.copyBeanProp(vo, order);
98   - DriverVo driverVo = new DriverVo();
99   - driverVo.setPhoneNo(tel);
100   - List<DriverVo> driverVos = driverService.selectDriverList(driverVo);
101   - if (CollectionUtil.isNotEmpty(driverVos)) {
  97 + List<DriverVo> driverVos = null;
  98 + if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
102 99 vo.setHandleFlag(true);
103   - vo.setGarHandleEvaluateFlag(false);
  100 + // 防止其他人员处理订单
  101 + if (!order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue()) && !order.getGarOrderHandlerId().equals(user.getGarUserId())) {
  102 + vo.setHandleFlag(false);
  103 + }
104 104 }
  105 + BeanUtils.copyBeanProp(vo, order);
105 106 List<GarOrderImage> imageList = garOrderImageService.list(qwi);
106 107 for (GarOrderImage image : imageList) {
107 108 if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue().equals(image.getGarOrderImageType())) {
... ... @@ -115,9 +116,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
115 116 }
116 117 }
117 118 if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
118   - if (vo.getHandleFlag()) {
  119 + GarUser handleUser = garUserService.getById(vo.getGarOrderHandlerId());
  120 + DriverVo driverVo = new DriverVo();
  121 + driverVo.setPhoneNo(handleUser.getGarUserTel());
  122 + driverVos = driverService.selectDriverList(driverVo);
  123 + if (CollectionUtil.isNotEmpty(driverVos)) {
119 124 vo.setGarOrderHandleName(driverVos.get(0).getName());
120   - vo.setGarOrderHandleTel(driverVo.getPhoneNo());
  125 + vo.setGarOrderHandleTel(driverVos.get(0).getPhoneNo());
121 126 }
122 127 }
123 128 return vo;
... ... @@ -128,9 +133,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
128 133 String userId = SecurityUtils.getLoginUser().getUser().getUserId();
129 134 GarUser user = garUserService.getById(userId);
130 135 LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
131   - qw.orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus);
  136 + qw.orderByAsc(GarOrder::getGarUpdateTime, GarOrder::getGarOrderHandlerStatus);
132 137 // 居民用户
133   - if (user.getGarUserType().equals(GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription())) {
  138 + if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
134 139 PageHelper.startPage(pageNo, pageSize);
135 140 // 待清运 || 清运中 || 已完成 || 待支付
136 141 if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
... ... @@ -169,7 +174,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
169 174 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
170 175 return pageInfo;
171 176 }
172   -
173 177 if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
174 178 || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
175 179 qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
... ... @@ -206,14 +210,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
206 210 update(uw);
207 211 return "订单取消成功";
208 212 }
209   - // 运输员操作 TODO 公司所属 待清运- 》 清运中
210   - if (GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())) {
  213 + // 运输员操作 TODO
  214 + if (GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())) {
  215 + // 公司所属 待清运- 》 清运中
211 216 if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
212 217 || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
  218 + if (StringUtils.isNotEmpty(order.getGarOrderHandlerId())) {
  219 + return "订单已经被别人接受啦";
  220 + }
213 221 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
214 222 uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
215 223 .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
216   - .set(GarOrder::getGarOrderHandlerId, userId);
  224 + .set(GarOrder::getGarOrderHandlerId, user.getGarUserId());
217 225 update(uw);
218 226 return "已接受派单";
219 227 }
... ... @@ -223,6 +231,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
223 231 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
224 232 uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
225 233 .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue())
  234 + .set(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
226 235 .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
227 236 update(uw);
228 237 }
... ... @@ -250,23 +259,24 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
250 259 String userId = SecurityUtils.getLoginUser().getUser().getUserId();
251 260 GarUser user = garUserService.getById(userId);
252 261 GarOrder order = getById(dto.getOrderId());
253   - // TODO 用户评价
254 262 if (GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(order.getGarOrderHandlerStatus())) {
255   - evaluate(dto, order);
  263 + evaluate(dto, order, user);
256 264 }
257 265 return "已评价";
258 266 }
259 267  
260   - private void evaluate(EvaluateDto dto, GarOrder order) {
  268 + private void evaluate(EvaluateDto dto, GarOrder order, GarUser user) {
261 269 GarOrderEvaluate evaluate = new GarOrderEvaluate();
262 270 evaluate.setGarOrderId(order.getGarOrderId());
263 271 evaluate.setGarEvaluateContent(dto.getContent());
264 272 evaluate.setGarEvaluateScore(dto.getScore());
  273 + evaluate.setGarCompanyId(order.getGarOrderCompanyId());
265 274 garOrderEvaluateService.save(evaluate);
266 275 // 修改订单评价状态
267 276 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
268 277 uw.eq(GarOrder::getGarOrderId, order.getGarOrderId())
269   - .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue());
  278 + .set(dto.getEvaluateType().equals(GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue()), GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue())
  279 + .set(dto.getEvaluateType().equals(GlobalStatus.GarOrderStatus.EVALUATE_TYPE_USER.getValue()), GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue());
270 280 update(uw);
271 281 }
272 282 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @3f7eec2
... ... @@ -28,7 +28,6 @@ import com.trash.garbage.mapper.GarUserMapper;
28 28 import com.trash.garbage.utils.*;
29 29 import org.apache.commons.codec.binary.Base64;
30 30 import org.springframework.beans.factory.annotation.Autowired;
31   -import org.springframework.http.HttpRequest;
32 31 import org.springframework.security.core.authority.SimpleGrantedAuthority;
33 32 import org.springframework.security.core.userdetails.UsernameNotFoundException;
34 33 import org.springframework.stereotype.Service;
... ... @@ -71,7 +70,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
71 70 if (Objects.isNull(loginDto)) {
72 71 throw new UsernameNotFoundException("当前用户不存在!");
73 72 }
74   - if (loginDto.getLoginType().equals(GlobalStatus.UserStatusEnum.WX_LOGIN.getStatus())) {
  73 + if (loginDto.getLoginType().equals(GlobalStatus.GarUserStatusEnum.WX_LOGIN.getStatus())) {
75 74 String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxConfig.getAppId() + "&secret=" + wxConfig.getSecret() + "&js_code=" + loginDto.getWxCode() + "&grant_type=authorization_code";
76 75 String body = HttpUtil.createGet(url).header("cache-control", "no-cache").execute().body();
77 76 JSONObject open = JSONObject.parseObject(body);
... ... @@ -96,7 +95,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
96 95 nUser = new GarUser();
97 96 nUser.setGarUserTel(loginDto.getTel());
98 97 nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
99   - nUser.setGarUserType(GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription());
  98 + nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
100 99 this.save(nUser);
101 100 }
102 101 LoginUser loginUser = new LoginUser();
... ...
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
  View file @3f7eec2
... ... @@ -26,6 +26,7 @@
26 26 <result property="garReason" column="gar_reason" jdbcType="VARCHAR"/>
27 27 <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
28 28 <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
  29 + <result property="garHandlerEvaluateFlag" column="gar_handler_evaluate_flag" jdbcType="TINYINT"/>
29 30 <result property="garOrderCarNumber" column="gar_order_car_number" jdbcType="TINYINT"/>
30 31 <result property="garOrderCarType" column="gar_order_car_type" jdbcType="TINYINT"/>
31 32 </resultMap>
... ... @@ -38,6 +39,6 @@
38 39 gar_order_company_name,gar_order_company_tel,gar_order_hander_status,
39 40 gar_order_agreement_time,gar_create_time,gar_update_time,
40 41 gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
41   - gar_evaluate_flag,gar_order_car_number,gar_order_car_type
  42 + gar_evaluate_flag,gar_order_car_number,gar_order_car_type,gar_handler_evaluate_flag
42 43 </sql>
43 44 </mapper>
... ...
trash-ui/src/views/unit/carInfo/info.vue
  View file @3f7eec2
... ... @@ -9,7 +9,7 @@
9 9 <el-row :gutter="30">
10 10 <el-col :span="7">
11 11 <el-form-item label="所属公司" prop="companyId">
12   - <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" @change="listDriverByCompany">
  12 + <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" @change="listDriverByCompany" :disabled="form.id != null">
13 13 <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
14 14 </el-select>
15 15 </el-form-item>
... ...
trash-ui/src/views/unit/disposalSite/info.vue
  View file @3f7eec2
... ... @@ -981,12 +981,14 @@ export default {
981 981 this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
982 982 confirmButtonText: '确定',
983 983 callback: action => {
984   - console.log(this.map)
985   - let path = this.form.electronicFence.split(";");
986   - path.map(item=>{
987   - let arr = item.split(",");
988   - this.polygonArr.push([arr[0],arr[1]]);
989   - });
  984 + if(this.form.electronicFence!=null){
  985 + let path = this.form.electronicFence.split(";");
  986 + path.map(item=>{
  987 + let arr = item.split(",");
  988 + this.polygonArr.push([arr[0],arr[1]]);
  989 + });
  990 + }
  991 +
990 992 }
991 993 });
992 994 },
... ...
trash-ui/src/views/unit/disposalSite/infoEdit.vue
  View file @3f7eec2
... ... @@ -981,12 +981,13 @@ export default {
981 981 this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
982 982 confirmButtonText: '确定',
983 983 callback: action => {
984   - console.log(this.map)
985   - let path = this.form.electronicFence.split(";");
986   - path.map(item=>{
987   - let arr = item.split(",");
988   - this.polygonArr.push([arr[0],arr[1]]);
989   - });
  984 + if(this.form.electronicFence!=null){
  985 + let path = this.form.electronicFence.split(";");
  986 + path.map(item=>{
  987 + let arr = item.split(",");
  988 + this.polygonArr.push([arr[0],arr[1]]);
  989 + });
  990 + }
990 991 }
991 992 });
992 993 },
... ... @@ -1022,6 +1023,13 @@ export default {
1022 1023 /** 提交按钮 */
1023 1024 submitForm() {
1024 1025 this.$refs["form"].validate(valid => {
  1026 + if(this.form.validityBeginDate>this.form.validityEndDate){
  1027 + this.$message({
  1028 + message: '有限期开始时间不能大于有限期结束时间！',
  1029 + type: 'warning'
  1030 + });
  1031 + return false;
  1032 + }
1025 1033 if (valid) {
1026 1034 let formData = new FormData();
1027 1035 let form = this.form;
... ...
trash-ui/src/views/unit/driver/index.vue
  View file @3f7eec2
... ... @@ -193,6 +193,9 @@ export default {
193 193 created() {
194 194 this.getList();
195 195 },
  196 + watch:{
  197 + '$route.query.driverInfoRefresh':'getList'
  198 + },
196 199 methods: {
197 200 /** 查询驾驶员管理列表 */
198 201 getList() {
... ...
trash-ui/src/views/unit/driver/info.vue
  View file @3f7eec2
... ... @@ -48,7 +48,7 @@
48 48 </el-col>
49 49 <el-col :span="7">
50 50 <el-form-item label="所属公司" prop="companyId">
51   - <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;">
  51 + <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" :disabled="form.id != null">
52 52 <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
53 53 </el-select>
54 54 </el-form-item>
... ... @@ -521,6 +521,20 @@ export default {
521 521 });
522 522 return false;
523 523 }
  524 + if(this.form.professionalQualificationBeginDate>this.form.professionalQualificationEndDate){
  525 + this.$message({
  526 + message: '从业资格证有效期终不能小于从业资格证有效期起！',
  527 + type: 'warning'
  528 + });
  529 + return false;
  530 + }
  531 + if(this.form.drivingLicenceBeginDate>this.form.drivingLicenceEndDate){
  532 + this.$message({
  533 + message: '驾驶证有效期终不能小于驾驶证有效期起！',
  534 + type: 'warning'
  535 + });
  536 + return false;
  537 + }
524 538 if (valid) {
525 539 let formData = new FormData();
526 540 let form = this.form;
... ...
trash-unit/src/main/java/com/trash/carInfo/service/impl/CarInfoServiceImpl.java
  View file @3f7eec2
... ... @@ -212,6 +212,8 @@ public class CarInfoServiceImpl implements ICarInfoService
212 212 public String removeSemicolon(String str){
213 213 if (str.startsWith(";"))
214 214 str = str.substring(1);
  215 + if (str.equals(""))
  216 + str = null;
215 217 return str;
216 218 }
217 219 }
... ...
trash-unit/src/main/java/com/trash/disposalSite/service/impl/DisposalSiteServiceImpl.java
  View file @3f7eec2
... ... @@ -199,6 +199,8 @@ public class DisposalSiteServiceImpl implements IDisposalSiteService {
199 199 public String removeSemicolon(String str){
200 200 if (str.startsWith(";"))
201 201 str = str.substring(1);
  202 + if (str.equals(""))
  203 + str = null;
202 204 return str;
203 205 }
204 206 }
... ...
trash-unit/src/main/java/com/trash/driver/service/impl/DriverServiceImpl.java
  View file @3f7eec2
... ... @@ -177,6 +177,8 @@ public class DriverServiceImpl implements IDriverService
177 177 public String removeSemicolon(String str){
178 178 if (str.startsWith(";"))
179 179 str = str.substring(1);
  180 + if (str.equals(""))
  181 + str = null;
180 182 return str;
181 183 }
182 184 }
... ...
trash-unit/src/main/java/com/trash/enterprise/service/impl/TransportationEnterpriseServiceImpl.java
  View file @3f7eec2
... ... @@ -172,6 +172,8 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
172 172 public String removeSemicolon(String str){
173 173 if (str.startsWith(";"))
174 174 str = str.substring(1);
  175 + if (str.equals(""))
  176 + str = null;
175 177 return str;
176 178 }
177 179 }
... ...
trash-unit/src/main/resources/mapper/unit/DisposalSiteMapper.xml
  View file @3f7eec2
... ... @@ -194,7 +194,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
194 194 <update id="updateDisposalSite" parameterType="DisposalSite">
195 195 update disposal_site
196 196 <trim prefix="SET" suffixOverrides=",">
197   - <if test="name != null">name = #{name},</if>
  197 + <if test="name != null">`name` = #{name},</if>
198 198 <if test="certificateNumber != null">certificate_number = #{certificateNumber},</if>
199 199 <if test="address != null">address = #{address},</if>
200 200 <if test="engineeringProperty != null">engineering_property = #{engineeringProperty},</if>
... ... @@ -228,9 +228,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
228 228 <if test="authorization != null">authorization = #{authorization},</if>
229 229 <if test="otherInformation != null">other_information = #{otherInformation},</if>
230 230 <if test="companyIds != null">company_ids = #{companyIds},</if>
231   - <if test="status != null">status = #{status},</if>
232   - <if test="createTime != null">create_time = #{createTime},</if>
233   - <if test="createBy != null">create_by = #{createBy},</if>
  231 + <if test="status != null">`status` = #{status},</if>
234 232 <if test="updateTime != null">update_time = #{updateTime},</if>
235 233 <if test="updateBy != null">update_by = #{updateBy},</if>
236 234 <if test="qrCode != null">qr_code = #{qrCode},</if>
... ...
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
  View file @3f7eec2
... ... @@ -60,7 +60,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
60 60 <if test="safetyManagerName != null and safetyManagerName != ''"> and safety_manager_name like concat('%', #{safetyManagerName}, '%')</if>
61 61 <if test="safetyManagerPhone != null and safetyManagerPhone != ''"> and safety_manager_phone = #{safetyManagerPhone}</if>
62 62 <if test="socialUniformCreditCodeNumber != null and socialUniformCreditCodeNumber != ''"> and social_uniform_credit_code_number = #{socialUniformCreditCodeNumber}</if>
63   - <if test="legalRepresentative != null and legalRepresentative != ''"> and legal_representative = #{legalRepresentative}</if>
  63 + <if test="legalRepresentative != null and legalRepresentative != ''"> and legal_representative like concat('%',#{legalRepresentative},'%')</if>
64 64 <if test="legalRepresentativePhone != null and legalRepresentativePhone != ''"> and legal_representative_phone = #{legalRepresentativePhone}</if>
65 65 <if test="safetyPeopleName != null and safetyPeopleName != ''"> and safety_people_name like concat('%', #{safetyPeopleName}, '%')</if>
66 66 <if test="transportPermission != null and transportPermission != ''"> and transport_permission = #{transportPermission}</if>
... ...