三单

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPMQMDao.java

@@ -3,6 +3,7 @@ import com.rongwei.bsentity.domain.ZhcxPmqManagementMapDo;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementRecoredDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
@@ -34,4 +35,36 @@ public interface ZhcxPMQMDao {
             " WHERE\n" +
             "    recored.DELETED = '0' AND recored.DISPATCHSTATUS = '0' AND t2.ISFLOWERDEPT= 'true'")
     List<ZhcxPmqManagementRecoredDo> getAllRecoredDoListInFlowerDept();
-}
+
+    @Update("UPDATE\n" +
+            "\tINCONTROL.ZHCX_PMQ_MANAGEMENT_RECORED recored\n" +
+            "SET\n" +
+            "\tCLOSESTATUS = 'NA',\n" +
+            "\tDISPATCHSTATUS = '1',\n" +
+            "\tREMARK = '职能部门设置NA'\n" +
+            "WHERE\n" +
+            "\tID IN (\n" +
+            "\tSELECT\n" +
+            "\t\trecored.ID\n" +
+            "\tFROM\n" +
+            "\t\tINCONTROL.ZHCX_PMQ_MANAGEMENT_RECORED recored\n" +
+            "\tLEFT JOIN (\n" +
+            "\t\tSELECT\n" +
+            "\t\t\tDISTINCT NXDEPTID,\n" +
+            "\t\t\tNXDEPTNAME,\n" +
+            "\t\t\tPARENTNXDEPTNAME,\n" +
+            "\t\t\tISFLOWERDEPT,\n" +
+            "\t\t\tQCUSERID,\n" +
+            "\t\t\tQCUSERNAME\n" +
+            "\t\tFROM\n" +
+            "\t\t\tINCONTROL.ZHCX_PMQ_MANAGEMENT_MAP m\n" +
+            "\t\tWHERE\n" +
+            "\t\t\tm.DELETED = '0'\n" +
+            "                ) t2 ON\n" +
+            "\t\tt2.NXDEPTID = recored.DEPTID\n" +
+            "\tWHERE\n" +
+            "\t\trecored.DELETED = '0'\n" +
+            "\t\tAND recored.DISPATCHSTATUS = '0'\n" +
+            "\t\tAND t2.ISFLOWERDEPT = 'true')")
+    void updateAllRecoredDoListInFlowerDept();
+}

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

@@ -181,10 +181,13 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
 
     // 全量处理职能部门
     private void disposeFlowerDept(){
-        try {
-        List<ZhcxPmqManagementRecoredDo> list = zhcxPMQMDao.getAllRecoredDoListInFlowerDept();
-        if(!list.isEmpty()){
-            log.info("开始全量处理职能部门");
+        log.info("开始全量处理职能部门");
+        zhcxPMQMDao.updateAllRecoredDoListInFlowerDept();
+        log.info("开始全量处理职能部门");
+        /*try {
+            List<ZhcxPmqManagementRecoredDo> list = zhcxPMQMDao.getAllRecoredDoListInFlowerDept();
+            if(!list.isEmpty()){
+            // 执行太慢了 姐妹
             for (ZhcxPmqManagementRecoredDo recoredDo : list) {
                 List<ZhcxPmqManagementDistributionDo> distributions = recoredDao.getDistributionsByPid(recoredDo.getId());
                 for (ZhcxPmqManagementDistributionDo distribution : distributions) {
@@ -199,10 +202,11 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
                 recoredDao.updateById(recoredDo);
                 zhcxPmqManagementDistributionDetailService.updateClosedStateInSecondFloor(recoredDo.getId());
             }
-        }} catch (Exception e) {
+        }
+        } catch (Exception e) {
             e.printStackTrace();
             log.error("全量处理职能部门派单数据异常!!");
-        }
+        }*/
     }
 
     private void updateDeptForMap(){

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

@@ -42,8 +42,11 @@ public class ZhcxPmqManagementLogServiceImpl extends ServiceImpl<ZhcxPmqManageme
     @Autowired
     private ZhcxPmqManagementRecoredService recoredService;
 
+    @Autowired
+    private ZhcxPmqManagementLogDao logDao;
+
     @Override
-    @Async("batchSaveThreadPool")
+    //@Async("batchSaveThreadPool")
     public R logForSecondFloor(String id, String type) {
         ZhcxPmqManagementRecoredDo recoredDo = recoredService.getById(id);
         Date nowDate = DateUtil.parse(DateUtil.now(), "yyyy-MM-dd HH:mm:ss");
@@ -60,13 +63,13 @@ public class ZhcxPmqManagementLogServiceImpl extends ServiceImpl<ZhcxPmqManageme
                 .setOperationtime(nowDate)
                 .setPmqmid(recoredDo.getPmqmid())
                 .setRecoredid(id);
-        this.save(zhcxPmqManagementLogDo);
+        logDao.insert(zhcxPmqManagementLogDo);
         log.info("记录日志");
         return R.ok("记录日志");
     }
 
     @Override
-    @Async("batchSaveThreadPool")
+    //@Async("batchSaveThreadPool")
     public R logFoThirdFloor(String id, String type) {
         ZhcxPmqManagementDistributionDetailDo detailDo = detailService.getById(id);
         ZhcxPmqManagementRecoredDo recoredDo = recoredService.getById(detailDo.getPid());
@@ -86,13 +89,13 @@ public class ZhcxPmqManagementLogServiceImpl extends ServiceImpl<ZhcxPmqManageme
                 .setRecoredid(recoredDo.getId())
                 .setDistributionid(detailDo.getDistributid())
                 .setDetailid(id);
-        this.save(zhcxPmqManagementLogDo);
+        logDao.insert(zhcxPmqManagementLogDo);
         log.info("记录日志");
         return R.ok("记录日志");
     }
 
     @Override
-    @Async("batchSaveThreadPool")
+    //@Async("batchSaveThreadPool")
     public R logFoThirdFloor(String id, String type,String description) {
         ZhcxPmqManagementDistributionDetailDo detailDo = detailService.getById(id);
         ZhcxPmqManagementRecoredDo recoredDo = recoredService.getById(detailDo.getPid());
@@ -113,7 +116,7 @@ public class ZhcxPmqManagementLogServiceImpl extends ServiceImpl<ZhcxPmqManageme
                 .setDistributionid(detailDo.getDistributid())
                 .setDetailid(id)
                 .setDescription(description);
-        this.save(zhcxPmqManagementLogDo);
+        logDao.insert(zhcxPmqManagementLogDo);
         log.info("记录日志");
         return R.ok("记录日志");
     }

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

@@ -532,7 +532,11 @@ public class ZhcxPmqManagementRecoredServiceImpl extends ServiceImpl<ZhcxPmqMana
                 result.setConfirmerid(zhcxPmqManagementDistributionDTO.getConfirmerid());
                 result.setConfirmer(zhcxPmqManagementDistributionDTO.getConfirmer());
                 // 关闭状态
-                result.setStatus(status);
+                if(!StringUtils.isEmpty(zhcxPmqManagementDistributionDTO.getStatus())) {
+                    result.setStatus(zhcxPmqManagementDistributionDTO.getStatus());
+                }else {
+                    result.setStatus(status);
+                }
                 if(!StringUtils.isEmpty(String.valueOf(recoredDo.getSeqno()))) {
                     result.setSerialnumber(String.valueOf(recoredDo.getSeqno()));
                 }

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxPmqManagementController.java

@@ -69,8 +69,12 @@ public class ZhcxPmqManagementController {
                 return R.error("id不能为空");
             }
             log.info("更新关闭状态-第三层(在已保存状态的情况后)__>map:{}",map.get("id"));
+            String type = "关闭";
+            if(!Objects.isNull(map.get("type"))){
+                type = (String) map.get("type");
+            }
             // 塞入操作日志
-            logService.logFoThirdFloor((String) map.get("id"),"关闭");
+            logService.logFoThirdFloor((String) map.get("id"),type);
             return distributionDetailService.updateClosedStateInThirdFloor((String) map.get("id"));
         } catch (Exception e) {
             log.info(String.valueOf(e));