内部执行导入

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

@@ -545,13 +545,24 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
     public void updateSupervision(List<ZhcxInsideInspectionVo> list) {
         Map<String, SysUserDo> userMap = dao.selectSupervision();
         Map<String, ZhcxInsideInspectionDo> map = new HashMap<>(16);
+        OperDto operDto = getOper("30");
+        InsideInspectionDispatchRequest req = new InsideInspectionDispatchRequest();
+        Map<String, String> descMap = new HashMap<>();
         for (ZhcxInsideInspectionVo vo: list) {
             vo.setSupervision(vo.getSupervision().replace("'", ""));
             vo.setInspectioncode(vo.getInspectioncode().replace("'", ""));
             vo.setInspectionstatus(vo.getInspectionstatus().replace("'", ""));
             vo.setSupervisionphone(vo.getSupervisionphone().replace("'", ""));
+            InsideOperDto inOper = getInsideOperByCodeDto(vo.getInspectioncode());
+            inOper.setOperTime(operDto.getOperTime());
+            inOper.setOperUser(operDto.getOperUser());
+            operDto.setOperType("40");
+            req.setDispatchFlag(2);
             SysUserDo sysUserDo = userMap.get(vo.getSupervision());
             if (!ObjectUtil.isNull(sysUserDo)) {
+                if(req.getSupervisionId().equals(sysUserDo.getId())) {
+                    continue;
+                }
                 ZhcxInsideInspectionDo inspectionDo = map.get(sysUserDo.getId() + "gp");
                 if(ObjectUtil.isNull(inspectionDo)){
                     inspectionDo = getLaboratoryByCheckId(sysUserDo.getId());
@@ -572,8 +583,16 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                 UpdateWrapper<ZhcxInsideInspectionDo> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.eq("inspectioncode", inspectionDo.getInspectioncode());
                 update(inspectionDo,updateWrapper);
+                //改派信息
+                StringBuilder sb = new StringBuilder();
+                sb.append("改派：");
+                sb.append(inOper.getDispatch().getSupervision());
+                sb.append("改为");
+                sb.append(vo.getSupervision());
+                descMap.put(inOper.getInspection().getId(), sb.toString());
             }
         }
+        operLogService.saveOperLog(req, operDto, descMap);
     }
 
     /**
@@ -1365,6 +1384,28 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                 .inspection(inspectionDo)
                 .build();
     }
+    /**
+     * 获取报验单信息
+     *
+     * @param code
+     * @return
+     */
+    private InsideOperDto getInsideOperByCodeDto(String code) {
+        //报验单
+        QueryWrapper<ZhcxInsideInspectionDo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("INSPECTIONCODE", code);
+        ZhcxInsideInspectionDo inspectionDo = getOne(queryWrapper);
+
+        //派单
+        LambdaQueryWrapper<ZhcxInsideInspectionDispatchDo> dispatchQueryWrapper = Wrappers.lambdaQuery();
+        dispatchQueryWrapper.eq(ZhcxInsideInspectionDispatchDo::getInsideid, inspectionDo.getId());
+        ZhcxInsideInspectionDispatchDo dispatchDo = dispatchService.getOne(dispatchQueryWrapper);
+
+        return InsideOperDto.builder()
+                .dispatch(dispatchDo)
+                .inspection(inspectionDo)
+                .build();
+    }
 
     /**
      * 获取操作人信息