Merge remote-tracking branch 'origin/master' into master

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -541,8 +541,8 @@ public class ArchivesAutoController extends BladeController {
 	@GetMapping("/getArchiveDestroyUser")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "获取档案销毁人列表", notes = "获取档案销毁人列表")
-	public R getArchiveDestroyUser(){
-		return R.data(archivesAutoService.getArchiveDestroyUser());
+	public R getArchiveDestroyUser(Long projectId){
+		return R.data(archivesAutoService.getArchiveDestroyUser(projectId));
 	}
 
 

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -130,9 +130,9 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
 	List<DictBiz> getCarrierTypeByDict();
 
-	void batchDestroyByIds(@Param("ids")List<String> ids);
+	void batchDestroyByIds(@Param("ids")List<String> ids,@Param("userId") Long userId);
 
-	List<User> getArchiveDestroyUser();
+	List<User> getArchiveDestroyUser(@Param("projectId") Long projectId);
 
     String getUserRoleName(@Param("projectId") Long projectId, @Param("contractId") Long contractId, @Param("userId") Long userId);
 

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -919,7 +919,7 @@
     </select>
     <select id="getArchiveDestroyUser" resultType="org.springblade.system.user.entity.User">
         SELECT id,real_name  FROM blade_user WHERE id IN (SELECT uaa.update_user  FROM u_archives_auto uaa
-                                                          WHERE uaa.is_deleted = 1 AND  uaa.is_destroy = 1
+                                                          WHERE uaa.is_deleted = 1 AND  uaa.is_destroy = 1 and project_id = #{projectId}
                                                           GROUP BY uaa.update_user )
     </select>
     <select id="getAllArchiveFileSize" resultType="java.lang.Long">
@@ -939,7 +939,7 @@
         </foreach>
     </update>
     <update id="batchDestroyByIds">
-        update u_archives_auto set is_deleted = 1 ,is_destroy = 1 where
+        update u_archives_auto set is_deleted = 1 ,is_destroy = 1 ,update_user = #{userId} where
         id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -86,7 +86,7 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	void archiveAutoMethodThread(Long projectId, Long contractId, Long nodeId);
 
-	List<User> getArchiveDestroyUser();
+	List<User> getArchiveDestroyUser(Long projectId);
 
 	List<Map<String, List<Map<String, String>>>> getArchivesCabinet(ArchivesAutoVO archivesAuto);
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -53,6 +53,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.FileUtil;
 import org.springblade.core.tool.utils.Func;
@@ -771,7 +772,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			archiveFileClient.batchDeleteArchiveFile(collect);
 		}
 		//销毁案卷
-		baseMapper.batchDestroyByIds(list);
+		Long userId = SecureUtil.getUserId();
+		baseMapper.batchDestroyByIds(list,userId);
 	}
 
 
@@ -2077,8 +2079,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	}
 
 	@Override
-	public List<User> getArchiveDestroyUser() {
-		return autoMapper.getArchiveDestroyUser();
+	public List<User> getArchiveDestroyUser(Long projectId) {
+		return autoMapper.getArchiveDestroyUser(projectId);
 	}
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -510,12 +510,11 @@ public class ContractInfoController extends BladeController {
     @PostMapping("/submit-wbsTree-contract")
     @ApiOperationSupport(order = 17)
     @ApiOperation(value = "保存或修改分配合同段wbs树", notes = "传入WbsTreeContractDTO")
-    public R submitWbsTreeInContract(@RequestBody WbsTreeContractDTO wbsTreeContractDTO) {
-        boolean b = wbsTreeContractService.submitWbsTreeInContract(wbsTreeContractDTO);
-        if (b) {
-            return R.success("关联合同段树成功");
+    public R<Object> submitWbsTreeInContract(@RequestBody WbsTreeContractDTO wbsTreeContractDTO) {
+        if (wbsTreeContractService.submitWbsTreeInContract(wbsTreeContractDTO)) {
+            return R.success("操作成功");
         }
-        return R.fail("关联合同段树失败");
+        return R.fail("操作失败");
     }
 
     /**

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

@@ -263,7 +263,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     throw new ServiceException("当前施工合同段wbs树被监理或业主合同段引用中，删除失败！");
                 }
                 List<Long> ids1 = delIds.stream().map(Long::parseLong).collect(Collectors.toList());
-
                 //获取当前节点、表
                 List<WbsTreeContract> wbsTreeContractList = baseMapper.selectTableListInfo(ids1, pawDTO.getWbsId(), pawDTO.getProjectId(), pawDTO.getContractId());
                 List<WbsTreeContract> tableNames = new ArrayList<>();
@@ -274,9 +273,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         }
                     });
                 }
-
                 List<String> nodeNames = tableNames.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList());
-
                 if (nodeNames.size() > 0) {
                     String names = StringUtils.join(nodeNames, " , ");
                     throw new ServiceException(StringUtil.format("节点下的 {} 中存在填报数据，删除失败！", names));
@@ -286,59 +283,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
             //TODO ---------新增---------
             if (saveIds.size() > 0) {
-                /*List<WbsTreePrivate> wbsTreePrivatesList = new ArrayList<>();
-                List<WbsTreeContract> wbsTreeContractList = new ArrayList<>();
-                ArrayList<ConstructionLedger> constructionLedgerList = new ArrayList<>();
-
-                //获取wbs私有树下节点、表
-                List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectNodeAndTable2(pawDTO.getWbsId(), pawDTO.getProjectId());
-                for (WbsTreePrivate wbsTreePrivate : wbsTreePrivates) {
-                    for (String id : saveIds) {
-                        if (Long.parseLong(id) == (wbsTreePrivate.getId())) {
-                            wbsTreePrivatesList.add(wbsTreePrivate);
-                        } else if (Long.parseLong(id) == (wbsTreePrivate.getParentId()) && wbsTreePrivate.getType() == 2) {
-                            wbsTreePrivatesList.add(wbsTreePrivate);
-                        }
-                    }
-                }
-
-                //初始化
-                wbsTreePrivatesList.forEach(wbsTreePrivate -> {
-                    WbsTreeContract wbsTreeContract = BeanUtil.copyProperties(wbsTreePrivate, WbsTreeContract.class);
-                    if (wbsTreeContract != null) {
-                        wbsTreeContract.setPKeyId(SnowFlakeUtil.getId());
-                        wbsTreeContract.setWbsId(pawDTO.getWbsId());
-                        wbsTreeContract.setWbsType(Integer.valueOf(wbsTreePrivate.getWbsType()));
-                        wbsTreeContract.setIsBussShow(1);
-                        wbsTreeContract.setProjectId(pawDTO.getProjectId());
-                        wbsTreeContract.setContractId(pawDTO.getContractId());
-                        wbsTreeContract.setIsConcealedWorksNode(0);
-                        wbsTreeContract.setIsTypePrivatePid(wbsTreePrivate.getPKeyId());
-                        wbsTreeContract.setCreateTime(new Date());
-                        if (wbsTreePrivate.getType() == 2) {
-                            wbsTreeContract.setIsTypePrivatePid(wbsTreePrivate.getPKeyId());
-                        }
-                        if (wbsTreePrivate.getType() == 1) {
-                            wbsTreeContract.setImportMatchingInfo(wbsTreePrivate.getFullName());
-                        }
-                        wbsTreeContractList.add(wbsTreeContract);
-
-                        //台账
-                        if (wbsTreeContract.getNodeType() == 6) {
-                            ConstructionLedger constructionLedger = new ConstructionLedger();
-                            constructionLedger.setIsBeton(0);
-                            constructionLedger.setWbsId(wbsTreeContract.getPKeyId());
-                            constructionLedger.setSite(wbsTreeContract.getNodeName());
-                            constructionLedger.setStation(wbsTreeContract.getNodeName());
-                            constructionLedger.setContractId(Long.parseLong(pawDTO.getContractId()));
-                            constructionLedgerList.add(constructionLedger);
-                        }
-                    }
-                });
-
-                this.insertBatch(wbsTreeContractList, 1000);
-                constructionLedgerFeign.initConstructionLedger(constructionLedgerList);*/
-
                 ArrayList<ConstructionLedger> constructionLedgerList = new ArrayList<>();
                 List<WbsTreePrivate> wbsTreePrivatesList = wbsTreePrivateMapper.selectNodeAndTable2(pawDTO.getWbsId(), pawDTO.getProjectId());
                 Set<Long> saveIdsSet = saveIds.stream().map(Long::parseLong).collect(Collectors.toSet());

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -796,38 +796,11 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     List<WbsTreePrivate> insertData2 = new ArrayList<>();
 
                     if (pawDTO.getReferenceType().equals("public")) {
-                        /*List<WbsTree> addListData = new ArrayList<>();
-                        //获取当前树下所有节点、表信息
-                        List<WbsTree> treesAll = baseMapper.selectList(Wrappers.<WbsTree>lambdaQuery().eq(WbsTree::getWbsId, pawDTO.getWbsId()).eq(WbsTree::getStatus, 1));
-                        for (WbsTree wbsTree : treesAll) {
-                            for (String id : saveIds) {
-                                if (Long.parseLong(id) == (wbsTree.getId())) {
-                                    addListData.add(wbsTree);
-                                } else if (Long.parseLong(id) == (wbsTree.getParentId()) && wbsTree.getType() == 2) {
-                                    addListData.add(wbsTree);
-                                }
-                            }
-                        }
-
-                        addListData.forEach(tree -> {
-                            WbsTreePrivate wbsTreePrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
-                            if (wbsTreePrivate != null) {
-                                wbsTreePrivate.setPKeyId(SnowFlakeUtil.getId());
-                                wbsTreePrivate.setWbsType(String.valueOf(pawDTO.getWbsType()));
-                                wbsTreePrivate.setProjectId(pawDTO.getProjectId());
-                                wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());
-                                wbsTreePrivate.setInitTableId(ObjectUtil.isNotEmpty(tree.getInitTableId()) ? String.valueOf(tree.getInitTableId()) : null);
-                            }
-                            insertData1.add(wbsTreePrivate);
-                        });*/
-
                         //获取当前树下所有节点、表信息
                         List<WbsTree> treesAll = baseMapper.selectList(Wrappers.<WbsTree>lambdaQuery()
                                 .eq(WbsTree::getWbsId, pawDTO.getWbsId())
                                 .eq(WbsTree::getStatus, 1));
-
                         Set<Long> saveIdsSet = saveIds.stream().map(Long::parseLong).collect(Collectors.toSet());
-
                         insertData1 = treesAll.stream()
                                 .filter(wbsTree -> saveIdsSet.contains(wbsTree.getId()) || (saveIdsSet.contains(wbsTree.getParentId()) && wbsTree.getType() == 2))
                                 .map(tree -> {
@@ -854,54 +827,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
                         //获取当前项目下的所有独立表
                         List<WbsTreePrivate> wbsTreePrivatesTableDL = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().select(WbsTreePrivate::getId).eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()).eq(WbsTreePrivate::getType, 10).eq(WbsTreePrivate::getParentId, -10).eq(WbsTreePrivate::getStatus, 1));
-
-                        /*for (WbsTreePrivate wbsTreePrivate : wbsTreePrivatesNodeAndTab) {
-                            if (wbsTreePrivate.getType() == 1 || wbsTreePrivate.getType() == 2) {
-                                for (String id : saveIds) {
-                                    if (Long.parseLong(id) == (wbsTreePrivate.getId())) {
-                                        addListData.add(wbsTreePrivate);
-
-                                    } else if (Long.parseLong(id) == (wbsTreePrivate.getParentId()) && wbsTreePrivate.getType() == 2) {
-                                        addListData.add(wbsTreePrivate);
-                                    }
-                                }
-                            }
-
-                            if (wbsTreePrivate.getType() == 10 && wbsTreePrivate.getParentId() == -10) { //type=10,parentId=-10 独立库
-                                //判断是否存在独立表单，存在则不新增
-                                List<WbsTreePrivate> collect = wbsTreePrivatesTableDL.stream().filter(f -> f.getId().equals(wbsTreePrivate.getId())).collect(Collectors.toList());
-                                if (collect.size() == 0) {
-                                    addListData.add(wbsTreePrivate);
-                                }
-                            }
-                        }
-
-                        //只同步独立库中有关联过清表的元素表type=10，以及原始方式的元素表type=2，节点信息type=1
-                        List<WbsTreePrivate> collect = addListData.stream().filter(f -> f.getType().equals(1) || f.getType().equals(2) || (f.getHtmlUrl() != null && f.getType().equals(10))).collect(Collectors.toList());
-
-                        collect.forEach(tree -> {
-                            WbsTreePrivate wbsTreePrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
-                            if (wbsTreePrivate != null) {
-                                wbsTreePrivate.setPKeyId(SnowFlakeUtil.getId());
-                                wbsTreePrivate.setProjectId(pawDTO.getProjectId());
-                                wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());
-                                wbsTreePrivate.setInitTableId(ObjectUtil.isNotEmpty(tree.getInitTableId()) ? String.valueOf(tree.getInitTableId()) : null);
-
-                                wbsTreePrivate.setHtmlUrl(ObjectUtil.isNotEmpty(tree.getHtmlUrl()) ? tree.getHtmlUrl() : null);
-
-                                if (tree.getType() == 10) {  //独立表单数据
-                                    wbsTreePrivate.setWbsId(null);
-                                    wbsTreePrivate.setWbsType(null);
-                                } else { //非独立库形式
-                                    wbsTreePrivate.setWbsId(pawDTO.getPrimaryKeyId());
-                                    wbsTreePrivate.setWbsType(String.valueOf(pawDTO.getWbsType()));
-                                }
-                                insertData2.add(wbsTreePrivate);
-                            }
-                        });*/
-
                         Set<Long> saveIdsSet = saveIds.stream().map(Long::parseLong).collect(Collectors.toSet());
-
                         wbsTreePrivatesNodeAndTab.forEach(wbsTreePrivate -> {
                             boolean isType1Or2 = wbsTreePrivate.getType() == 1 || wbsTreePrivate.getType() == 2;
                             boolean isType10WithParentIdMinus10 = wbsTreePrivate.getType() == 10 && wbsTreePrivate.getParentId() == -10;