Jelajahi Sumber

后管关联表单,同步项目和合同的所有当前表单

qianxb 2 tahun lalu
induk
melakukan
d879f641bc

+ 0 - 13
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -157,19 +157,6 @@ public class WbsTreeContractController extends BladeController {
                 .eq(WbsTreeContract::getPKeyId, id).eq(WbsTreeContract::getIsDeleted, 0)));
     }
 
-    /**
-     * 同步项目下当前表的所有htmlUrl
-     */
-    @GetMapping("/syncCurrentFormInProject")
-    @ApiOperationSupport(order = 8)
-    @ApiOperation(value = "同步项目下当前表的所有htmlUrl", notes = "同步项目下当前表的所有htmlUrl")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "pKeyId", value = "主键id", required = true),
-    })
-    public R syncCurrentFormInProject(@RequestParam("pKeyId") Long pKeyId) {
-        iWbsTreeContractService.syncCurrentFormInProject(pKeyId);
-        return R.success("同步成功");
-    }
 
     /**
      * 资料填报 - 同步相同表数据(同一节点下,把施工表数据同步到监理表中)

+ 14 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -692,4 +692,18 @@ public class WbsTreePrivateController extends BladeController {
         return R.status(true);
     }
 
+    /**
+     * 同步项目下当前表的所有htmlUrl
+     */
+    @GetMapping("/syncCurrentFormInProject")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "同步项目下当前表的所有htmlUrl", notes = "同步项目下当前表的所有htmlUrl")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pKeyId", value = "主键id", required = true),
+    })
+    public R syncCurrentFormInProject(@RequestParam("pKeyId") Long pKeyId) {
+        wbsTreePrivateService.syncCurrentFormInProject(pKeyId);
+        return R.success("同步成功");
+    }
+
 }

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java

@@ -86,5 +86,5 @@ public interface WbsTreeContractMapper extends EasyBaseMapper<WbsTreeContract> {
 
     Long getAllTableFileSize(@Param("projectId") Long projectId);
 
-    void syncCurrentFormInProject(@Param("node") WbsTreeContract node);
+    void syncCurrentFormToAllContract(@Param("wbsTreePrivate") WbsTreePrivate wbsTreePrivate);
 }

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -608,10 +608,10 @@
             #{ids}
         </foreach>
     </update>
-    <update id="syncCurrentFormInProject">
+    <update id="syncCurrentFormToAllContract">
         UPDATE m_wbs_tree_contract
-        SET html_url = #{node.htmlUrl}
-        WHERE project_id = #{node.projectId} and excel_id = #{node.excelId}
+        SET html_url = #{wbsTreePrivate.htmlUrl} , init_table_name = #{wbsTreePrivate.initTableName}
+        WHERE project_id = #{wbsTreePrivate.projectId} and excel_id = #{wbsTreePrivate.excelId}
     </update>
 
     <select id="selectQueryValueLikeNodeName" resultMap="ResultMap">

+ 1 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.java

@@ -94,4 +94,5 @@ public interface WbsTreePrivateMapper extends EasyBaseMapper<WbsTreePrivate> {
 
     List<WbsTreePrivateVO5> treeRecordTrial(String wbsId, String projectId, Integer wbsType);
 
+    void syncCurrentFormInProject(@Param("wbsTreePrivate") WbsTreePrivate wbsTreePrivate);
 }

+ 5 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -312,6 +312,11 @@
             where p_key_id = #{item.pKeyId}
         </foreach>
     </update>
+    <update id="syncCurrentFormInProject">
+        UPDATE m_wbs_tree_private
+        SET html_url = #{wbsTreePrivate.htmlUrl} , init_table_name = #{wbsTreePrivate.initTableName} , init_table_id = #{wbsTreePrivate.initTableId}
+        WHERE project_id = #{wbsTreePrivate.projectId} and excel_id = #{wbsTreePrivate.excelId}
+    </update>
 
     <select id="lazyTree" resultMap="treeNodeResultMap">
         SELECT

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java

@@ -58,5 +58,6 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
     boolean addTabInfoByRan(RangeInfo info, List<Object> moreData, String[] excLenght) throws FileNotFoundException;
 
     boolean syncTabData(String pKeyId);
-    void syncCurrentFormInProject(Long pKeyId);
+
+    void syncCurrentFormToAllContract(WbsTreePrivate wbsTreePrivate);
 }

+ 1 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreePrivateService.java

@@ -90,4 +90,5 @@ public interface IWbsTreePrivateService extends BaseService<WbsTreePrivate> {
 
     Map<String, List<Object>> treeRecordTrial(String wbsId, String projectId, String pKeyId);
 
+    void syncCurrentFormInProject(Long pKeyId);
 }

+ 2 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -539,9 +539,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
     }
 
     @Override
-    public void syncCurrentFormInProject(Long pKeyId) {
-        WbsTreeContract node = this.getOne(new LambdaQueryWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId, pKeyId));
-        baseMapper.syncCurrentFormInProject(node);
+    public void syncCurrentFormToAllContract(WbsTreePrivate wbsTreePrivate) {
+        baseMapper.syncCurrentFormToAllContract(wbsTreePrivate);
     }
 
     @Override

+ 7 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -1767,6 +1767,13 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         return null;
     }
 
+    @Override
+    public void syncCurrentFormInProject(Long pKeyId) {
+        WbsTreePrivate treePrivate = this.getOne(new LambdaQueryWrapper<WbsTreePrivate>().eq(WbsTreePrivate::getPKeyId,pKeyId));
+        baseMapper.syncCurrentFormInProject(treePrivate);
+        wbsTreeContractService.syncCurrentFormToAllContract(treePrivate);
+    }
+
     private List<WbsTreePrivateVO5> buildWbsTreeByStreamTrial(List<WbsTreePrivateVO5> wbsTreeVO2s) {
         List<WbsTreePrivateVO5> list = wbsTreeVO2s.stream().filter(f -> f.getParentId() == 0L).collect(Collectors.toList());
         Map<Long, List<WbsTreePrivateVO5>> map = wbsTreeVO2s.stream().collect(Collectors.groupingBy(WbsTreePrivateVO5::getParentId));