日志重签和档案项目级同步

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

@@ -309,7 +309,7 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
 
     @Override
     public boolean sortByFileTime(Long nodeId) {
-     String sql="SELECT id,file_time FROM u_archive_file WHERE node_id IN (SELECT id FROM m_archive_tree_contract WHERE  FIND_IN_SET("+nodeId+",ancestors)) AND is_deleted=0";
+     String sql="SELECT id,file_time,node_id FROM u_archive_file WHERE node_id IN (SELECT id FROM m_archive_tree_contract WHERE  FIND_IN_SET("+nodeId+",ancestors)) AND is_deleted=0";
      List<ArchiveFile> list=jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(ArchiveFile.class));
      if(list.size()>0){
          Map<String, List<ArchiveFile>> group = list.stream()

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

@@ -261,7 +261,7 @@ public class ArchiveTreeContractController extends BladeController {
                 newTrees.add(tree.get(0));
                 tree = newTrees;
             }
-            archiveTreeContractService.fillDefaultArchiveAutoInfo(tree, projectId);
+            archiveTreeContractService.fillDefaultArchiveAutoInfo(tree, projectId,contractId);
             return R.data(tree);
         }
         return R.fail(200, "未查询到信息");

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeContractService.java

@@ -99,7 +99,7 @@ public interface IArchiveTreeContractService extends BaseService<ArchiveTreeCont
 
     boolean deleteTree(Long id);
 
-    void fillDefaultArchiveAutoInfo(List<ArchiveTreeContractVO2> tree, Long projectId);
+    void fillDefaultArchiveAutoInfo(List<ArchiveTreeContractVO2> tree, Long projectId,Long contractId);
 
     void fillDefaultArchiveAutoInfo(List<ArchiveTreeContract> archiveTreeContracts);
 

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

@@ -49,6 +49,7 @@ import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.SingleColumnRowMapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
@@ -820,7 +821,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 	 * @param trees
 	 * @param projectId
 	 */
-	public  void  fillDefaultArchiveAutoInfo(List<ArchiveTreeContractVO2> trees,Long projectId){
+	public  void  fillDefaultArchiveAutoInfo(List<ArchiveTreeContractVO2> trees,Long projectId,Long contractId){
 
 		List<ContractInfo> contractInfos = contractInfoService.selectContractInfoPageByPid(projectId.toString());
 		if (contractInfos == null || contractInfos.size() == 0) {
@@ -835,7 +836,6 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		}
 
 		for (ArchiveTreeContractVO2 child: trees) {
-			Long contractId = 0L;
 			if (child.getContractId() != null ) {
 				contractId = child.getContractId();
 			}
@@ -857,9 +857,14 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		if (StringUtils.isEmpty(node.getFileNumberPrefix())) {
 			node.setFileNumberPrefix(contractInfo.getPrefix());
 		}
-		if (StringUtils.isEmpty(node.getStorageTime()) && contractInfo.getStoragePeriod() != null) {
-			node.setStorageTime(contractInfo.getStoragePeriod().toString());
-		}
+//		if (StringUtils.isEmpty(node.getStorageTime()) && contractInfo.getStoragePeriod() != null) {
+//			node.setStorageTime(contractInfo.getStoragePeriod().toString());
+//		}
+        String sql="select storage_time from m_archive_tree where id="+node.getFromId();
+        List<String> list = jdbcTemplate.query(sql, new SingleColumnRowMapper<>(String.class));
+        if (StringUtils.isEmpty(node.getStorageTime()) && !list.isEmpty()) {
+            node.setStorageTime(list.get(0));
+        }
 		if (StringUtils.isEmpty(node.getRollor())) {
 			node.setRollor(contractInfo.getFiler());
 		}

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -3949,6 +3949,7 @@ public class TaskController extends BladeController {
             }
             //查询出当前计量期对应的任务
             String selectTask = "SELECT * from u_task WHERE approval_type =? and form_data_id = ? and is_deleted = 0 and status in (1,2)";
+
             List<Task> list = jdbcTemplate.query(selectTask, new BeanPropertyRowMapper<>(Task.class), type1,periodId);
             System.out.println("wewecq"+selectTask);
             if (list.size() == 0){