取消协作移除项目场景

src/main/java/com/fdkankan/manage_jp/service/impl/ProjectNumServiceImpl.java

@@ -51,7 +51,9 @@ public class ProjectNumServiceImpl extends ServiceImpl<IProjectNumMapper, Projec
             return;
         }
         LambdaQueryWrapper<ProjectNum> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ProjectNum::getProjectId,projectId);
+        if(projectId != null){
+            wrapper.eq(ProjectNum::getProjectId,projectId);
+        }
         wrapper.in(ProjectNum::getNum,delNumList);
         this.remove(wrapper);
     }

src/main/java/com/fdkankan/manage_jp/service/impl/TmColdStorageServiceImpl.java

@@ -58,6 +58,8 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
     ITmContractorNumService contractorNumService;
     @Autowired
     IProjectSceneGpsService projectSceneGpsService;
+    @Autowired
+    IProjectNumService projectNumService;
 
     @Override
     public Object pageList(ColdStorageParam param) {
@@ -167,6 +169,7 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             contractorNumService.deleteByNumList(param.getNumList());
             contractorService.checkDel();
             projectSceneGpsService.deleteByNumList(param.getNumList());
+            projectNumService.delNumList(null,param.getNumList());
         }
 
     }

src/main/resources/mapper/manage_jp/ProjectSceneGpsMapper.xml

@@ -7,7 +7,7 @@
         FROM t_scene_plus s
                  LEFT JOIN t_scene_plus_ext e on s.id = e.plus_id
                  LEFT JOIN t_project_scene_gps gps on s.num = gps.num
-        WHERE s.rec_status = 'A'and s.scene_status = -2 and s.scene_source in (4,5) and s.pay_status = 1 and gps.num is null
+        WHERE s.rec_status = 'A' and gps.rec_status = 'A' and s.scene_status = -2 and s.scene_source in (4,5) and s.pay_status = 1 and gps.num is null
     </select>
     
     <select id="listGps" resultType="com.fdkankan.manage_jp.vo.response.SceneGpsDbVp">