内部报验-改派

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -559,6 +560,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         List<String> msgList = new ArrayList<>();
         List<ZhcxInsideInspectionDispatchDo> dispatchList = new ArrayList<>();
         List<ZhcxInsideInspectionDo> inspectionList = new ArrayList<>();
+        Map<String, String> descMap = new HashMap<>();
 
         for(String insideId : req.getInsideIdList()) {
             InsideOperDto inOper = getInsideOperDto(insideId);
@@ -573,6 +575,11 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                 req.setDispatchFlag(1);
             }
 
+            //如果改派人和被指派是同一个人不做处理
+            if(req.getSupervisionId().equals(inOper.getDispatch().getSupervisionid())) {
+                continue;
+            }
+
             //校验
             String msg = checkParam4Dispatch(inOper, req);
 
@@ -592,6 +599,16 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             dispatch.setSupervisionphone(ObjectUtil.isEmpty(userDo.getMobile()) ? "" : userDo.getMobile());
             dispatchList.add(dispatch);
 
+            //改派信息
+            StringBuilder sb = new StringBuilder();
+            if(req.getDispatchFlag() == 2) {
+                sb.append("改派：");
+                sb.append(inOper.getDispatch().getSupervision());
+                sb.append("改为");
+                sb.append(userDo.getName());
+                descMap.put(insideId, sb.toString());
+            }
+
             //更改检验室
             inspectionList.add(changeSupervision(inOper, req));
 
@@ -608,7 +625,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         updateBatchById(inspectionList);
 
         //操作日志
-        operLogService.saveOperLog(req, operDto, Collections.emptyMap());
+        operLogService.saveOperLog(req, operDto, descMap);
     }
 
     /**
@@ -784,6 +801,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
      */
     private List<String> editColsHistory(ZhcxInsideInspectionDo oldInside, Map<String,Object> updatecolumns) {
 
+        log.info("修改前：{}", JSONUtil.toJsonStr(oldInside));
+
+        log.info("修改后：{}", JSONUtil.toJsonStr(updatecolumns));
+
         List<String> editDataList = new ArrayList<>();
         //预约报验时间
 //        if(ObjectUtil.isNotEmpty(updatecolumns.get("RESERVATIONINSPECTIONTIME"))) {