管理端可在资产管理模块编辑资产所属单位信息，并同步至任务中

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java

@@ -651,9 +651,28 @@ public class AssetCurrentController extends BaseController {
                 unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
             }
         });
+        //根据修改的单位名称查询任务表中是否有此单位的任务，如果有修改资产中的任务id，如果没有删除
+        List<AssetTask> dwmcList = assetTaskService.findByDwmc(assetCurrent.getDwmc());
+        if (dwmcList.isEmpty()) {
+            delete(assetCurrent);
+        }else{
+            delete(assetCurrent);
+            for (AssetTask s:dwmcList){
+
+            }
+        }
+
         return success();
     }
 
+    private void delete(AssetCurrent assetCurrent) {
+        assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), null);
+        assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), null);
+        assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), null);
+        unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), null);
+        assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), null);
+    }
+
     /**
      * 删除数据
      *

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java

@@ -35,7 +35,7 @@ public interface AssetBusinessFormCpMapper extends BaseMapper<AssetBusinessFormC
      * @param taskId  任务id
      */
     @Delete("delete from asset_business_form_cp where asset_id=#{assetId} and task_id =#{taskId}   ")
-    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")int taskId);
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")Integer taskId);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java

@@ -23,7 +23,7 @@ public interface AssetCurrentCpMapper extends BaseMapper<AssetCurrentCpPo> {
      * @param taskId
      */
     @Delete("delete from asset_current_cp where id=#{assetId} and task_id =#{taskId}  ")
-    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId);
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") Integer taskId);
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java

@@ -35,7 +35,7 @@ public interface AssetSupplyChainCpMapper extends BaseMapper<AssetSupplyChainCpP
      * @param taskId  任务id
      */
     @Delete("delete from asset_supply_chain_cp where asset_id=#{assetId} and task_id =#{taskId}   ")
-    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")int taskId);
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")Integer taskId);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java

@@ -289,5 +289,17 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
      * @return
      */
    List<AssetdwHcBlResponse>  dwHcBl(@Param("req") AssetdwHcRequest req);
+
+
+
+
+
+    /**
+     * 根据单位名称查询在进行中的任务
+     *
+     * @param dwmc 单位名称
+     * @return
+     */
+    List<AssetTask> findByDwmc(@Param("dwmc") String dwmc);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java

@@ -33,7 +33,7 @@ public interface UnitOtherConcatCpMapper extends BaseMapper<UnitOtherConcatCpPo>
      * @param taskId  任务id
      */
     @Delete("delete from unit_other_contact_cp where asset_id=#{assetId} and task_id =#{taskId}   ")
-    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")int taskId);
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")Integer taskId);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java

@@ -30,7 +30,7 @@ public interface AssetBasicNetworkCpService extends IService<AssetBasicNetworkCp
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    void deletByAssetIdandTaskId(Long assetId, Integer  taskId);
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java

@@ -29,7 +29,7 @@ public interface AssetBusinessFormCpService extends IService<AssetBusinessFormCp
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    void deletByAssetIdandTaskId(Long assetId, Integer taskId);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java

@@ -22,7 +22,7 @@ public interface AssetCurrentCpService extends IService<AssetCurrentCpPo> {
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    void deletByAssetIdandTaskId(Long assetId, Integer taskId);
 
 
     /**
@@ -54,5 +54,13 @@ public interface AssetCurrentCpService extends IService<AssetCurrentCpPo> {
      */
     AssetCurrentCpPo findByassetIdandTaskId(Integer assetId, Integer taskId);
 
+
+    /**
+     * 根据资产id查询
+     * @param id
+     * @return
+     */
+    Integer findByAssetId(Long id);
+
 }
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java

@@ -40,6 +40,6 @@ public interface AssetSupplyChainCpService extends IService<AssetSupplyChainCpPo
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    void deletByAssetIdandTaskId(Long assetId, Integer taskId);
 
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java

@@ -177,5 +177,14 @@ public interface AssetTaskService extends IService<AssetTask> {
      *
      * @return
      */
-    List<AssetdwHcBlResponse>  dwHcBl(AssetdwHcRequest req);
+    List<AssetdwHcBlResponse> dwHcBl(AssetdwHcRequest req);
+
+
+    /**
+     * 根据单位名称查询在进行中的任务
+     *
+     * @param dwmc 单位名称
+     * @return
+     */
+    List<AssetTask> findByDwmc(String dwmc);
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java

@@ -29,7 +29,7 @@ public interface UnitOtherConcatCpService extends IService<UnitOtherConcatCpPo>
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    void deletByAssetIdandTaskId(Long assetId, Integer taskId);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java

@@ -27,7 +27,7 @@ public class AssetBasicNetworkCpServiceImpl extends ServiceImpl<AssetBasicNetWor
     }
 
     @Override
-    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+    public void deletByAssetIdandTaskId(Long assetId, Integer taskId) {
          assetBasicNetWorkCpMapper.deletByAssetIdandTaskId(assetId, taskId);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java

@@ -27,7 +27,7 @@ public class AssetBusinessFormCpServiceImpl extends ServiceImpl<AssetBusinessFor
     }
 
     @Override
-    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+    public void deletByAssetIdandTaskId(Long assetId, Integer taskId) {
          assetBusinessFormCpMapper.deletByAssetIdandTaskId(assetId,taskId);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java

@@ -25,7 +25,7 @@ public class AssetCurrentCpServiceImpl extends ServiceImpl<AssetCurrentCpMapper,
 
 
     @Override
-    public void deletByAssetIdandTaskId(Long assetId,int taskId) {
+    public void deletByAssetIdandTaskId(Long assetId,Integer taskId) {
         assetCurrentCpMapper.deletByAssetIdandTaskId(assetId,taskId);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java

@@ -32,7 +32,7 @@ public class AssetSupplyChainCpServiceImpl extends ServiceImpl<AssetSupplyChainC
     }
 
     @Override
-    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+    public void deletByAssetIdandTaskId(Long assetId, Integer taskId) {
         assetSupplyChainCpMapper.deletByAssetIdandTaskId(assetId,taskId);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java

@@ -820,6 +820,11 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
         return assetTaskDao.dwHcBl(req);
     }
 
+    @Override
+    public List<AssetTask> findByDwmc(String dwmc) {
+        return assetTaskDao.findByDwmc(dwmc);
+    }
+
     //创建任务流程
     private void getTaskStatus(AssetCurrentShRequest req) {
         AssetLc assetLc = new AssetLc();

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java

@@ -26,7 +26,7 @@ public class UnitOtherConcatCpServiceImpl extends ServiceImpl<UnitOtherConcatCpM
     }
 
     @Override
-    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+    public void deletByAssetIdandTaskId(Long assetId, Integer taskId) {
         unitOtherConcatCpMapper.deletByAssetIdandTaskId(assetId,taskId);
     }
 

ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml

@@ -936,6 +936,9 @@
         taskStatus
         )f group by taskStatus
     </select>
+    <select id="findByDwmc" resultType="com.ruoyi.tc.entity.AssetTask" parameterType="java.lang.String">
+        select * from  asset_task where dwmc like concat('%', #{dwmc}, '%') and task_status=1
+    </select>
     <update id="xcxsh"
             parameterType="com.ruoyi.tc.entity.request.AssetCurrentShRequest">
         update asset_mini_programs_cp