大屏-整改功能调整

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

@@ -143,9 +143,10 @@ public interface ZhcxProjectManageDao extends BaseMapper<ZhcxProjectManageDo> {
             "</script>")
     List<ZhcxProjectRectifyMachineVo> getListApiData(Map<String, Object> map);
 
-    @Select("SELECT a.* FROM ZHCX_PROJECT_RECTIFY_MACHINE a \n" +
+    @Select("<script>SELECT a.* FROM ZHCX_PROJECT_RECTIFY_MACHINE a \n" +
             "WHERE a.STATUS IS NOT NULL AND EXISTS (" +
             "SELECT * FROM ZHCX_SHIP_OFFSHORE_DETAIL b " +
-            "WHERE b.PROJECTID = a.PRJID AND a.REALMACHINENO = b.MACHINENO and  b.DELETED = '0')")
-    List<ZhcxProjectRectifyMachineVo> getScreenRectifyData();
+            "WHERE b.PROJECTID = a.PRJID AND a.REALMACHINENO = b.MACHINENO and  b.DELETED = '0')" +
+            "</script>")
+    List<ZhcxProjectRectifyMachineVo> getScreenRectifyData(Map<String, Object> map);
 }

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

@@ -112,5 +112,5 @@ public interface ZhcxProjectManageService extends IService<ZhcxProjectManageDo>
      */
     ZhcxProjectManageDo getByCode(String prjCode);
 
-    void addScreenRectifyData();
+    void addScreenRectifyData(Map<String, Object> map);
 }

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

@@ -497,13 +497,21 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
     }
 
     @Override
-    public void addScreenRectifyData() {
+    public void addScreenRectifyData(Map<String, Object> map) {
         //删除整改数据
         DelPhysicalParam param = DelPhysicalParam.builder()
                 .type("rectify_complete")
                 .build();
+        Object projectIdObj = map.get("projectId");
+        Object machinenoObj = map.get("machineno");
+        if(projectIdObj != null && machinenoObj != null){
+            String projectId = projectIdObj.toString();
+            String machineno = machinenoObj.toString();
+            param.setPrjId(projectId);
+            param.setMachineNo(machineno);
+        }
         zhcxProjectDeviceIndicatorService.delPhysical(param);
-        List<ZhcxProjectRectifyMachineVo> listData = zhcxProjectManageDao.getScreenRectifyData();
+        List<ZhcxProjectRectifyMachineVo> listData = zhcxProjectManageDao.getScreenRectifyData(map);
         Map<String, List<ZhcxProjectRectifyMachineVo>> collect =
                 listData.stream().filter(item -> Objects.nonNull(item.getPrjid()))
                         .collect(Collectors.groupingBy(ZhcxProjectRectifyMachineVo::getPrjid));

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

@@ -226,8 +226,8 @@ public class ZhcxProjectManageController {
     }
 
     @PostMapping("/addScreenRectifyData")
-    public R addScreenRectifyData() {
-        service.addScreenRectifyData();
+    public R addScreenRectifyData(@RequestBody Map<String,Object> map) {
+        service.addScreenRectifyData(map);
         return R.ok();
     }
 }