档案同步

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -322,7 +322,7 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
                  if (b.getFileTime() == null) return 1;
                  return a.getFileTime().compareTo(b.getFileTime());
              });
-             int sort = 1;
+             int sort = 0;
              for (ArchiveFile file : archiveFiles) {
                  file.setSort(sort++);
              }

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

@@ -253,7 +253,7 @@ public class ArchiveAutoRuleSyncImpl {
             if (contractVO2.getExtType() == null && fromId != null && archiveAutoType != null && archiveAutoType == 2) {
                 Long contract_groupId = contractVO2.getArchiveAutoGroupId();
                 //如果当前contractVO2的groupID是客户级（19位数）,需要先保存关联集合
-                if (contract_groupId.toString().length() == 19) {
+                if (contract_groupId!=null&&contract_groupId.toString().length() == 19) {
                     //1.通过fromid找出项目级
                     ArchiveTreeVO2 proTreeVO2 = proMap.get(fromId);
                     //2.获取项目级groupID
@@ -332,7 +332,7 @@ public class ArchiveAutoRuleSyncImpl {
                         //分合同段的 给archiveAutoGroupId
                         Long groupId = contractVO2.getArchiveAutoGroupId();
                         //客户级的groupID用19位数字  系统级和项目级用16位数字
-                        if (groupId.toString().length() == 16) {
+                        if (groupId!=null&&groupId.toString().length() == 16) {
                             String key = "";
                             if (contractId == null) {
                                 key = groupId + "";

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

@@ -1,5 +1,6 @@
 package org.springblade.manager.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -17,6 +18,7 @@ import org.springblade.manager.dto.ArchiveTreeDTO;
 import org.springblade.manager.dto.ArchiveTreeSortDTO;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.mapper.ArchiveAutoRuleWbsMapper;
+import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.manager.service.IProjectInfoService;
 import org.springblade.manager.service.IWbsTreePrivateService;
 import org.springblade.manager.service.IWbsTreeService;
@@ -27,6 +29,10 @@ import org.springblade.manager.vo.*;
 import org.springblade.manager.mapper.ArchiveTreeMapper;
 import org.springblade.manager.service.IArchiveTreeService;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -1167,6 +1173,14 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
 
         this.saveBatch(saveList);
         this.updateBatchById(upList);
+//        for (ArchiveTree archiveTree : upList) {
+//            String sql="select * from m_archive_tree_contract where from_id="+archiveTree.getId()+" and project_id="+archiveTree.getProjectId()+" and is_deleted=0";
+//            List<ArchiveTreeContract> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ArchiveTreeContract.class));
+//            for (ArchiveTreeContract archiveTreeContract : list) {
+//                archiveTreeContract.sync(archiveTree);
+//                archiveTreeContractMapper.update(archiveTreeContract,new LambdaQueryWrapper<>(ArchiveTreeContract.class).eq(ArchiveTreeContract::getId,archiveTreeContract.getId()));
+//            }
+//        }
         return true;
     }
 

blade-service/blade-repair/pom.xml

@@ -76,5 +76,10 @@
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
     </dependencies>
 </project>