案卷收集

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java

@@ -19,6 +19,8 @@ package org.springblade.archive.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,10 +73,12 @@ public class ArchivesAuto extends BaseEntity {
 	/**
 	* 文件起始时间
 	*/
+		@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 		private LocalDateTime startDate;
 	/**
 	* 文件结束时间
 	*/
+		@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 		private LocalDateTime endDate;
 	/**
 	* 保管期限（单位/年）

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -70,11 +70,19 @@ public class ArchivesAutoVO extends ArchivesAuto {
 	 * 保管期限（单位/年）
 	 */
 	private String storageTimeValue;
+
+	@ApiModelProperty("批量保存")
+	private List<ArchivesAutoVO> list;
 	/**
 	* 案卷收集附件信息
 	* */
 	@ApiModelProperty("附件信息")
 	private List<ApprovalFile> approvalFileList = new ArrayList<>();
+
+	public void setApprovalFileList(List<ApprovalFile> approvalFileList) {
+		this.approvalFileList = approvalFileList;
+	}
+
 	@Data
 	public static class ApprovalFile {
 

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

@@ -15,6 +15,7 @@ import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.feign.ArchiveFileClient;
 import org.springblade.business.vo.ArchiveFileVO;
+import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
@@ -57,31 +58,42 @@ public class ArchiveFileAutoController extends BladeController {
     @PostMapping("/batchSave")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "批量新增")
-    public R<Boolean> batchSave(@RequestBody List<ArchivesAutoVO> archiveList){
+    public R<Boolean> batchSave(@RequestBody ArchivesAutoVO archiveList){
         try {
-            for(ArchivesAutoVO archive : archiveList) {
+            for(ArchivesAutoVO archive : archiveList.getList()) {
                 if(archive.getId() == null){
+
+                    archive.setId(SnowFlakeUtil.getId());
                     int l = (int) System.currentTimeMillis();
                     List<ArchivesAutoVO.ApprovalFile> saveList = archive.getApprovalFileList();
                     ArchiveFileVO saveVos = new ArchiveFileVO();
+                    Integer pageN = 0;
                     if (saveList != null && saveList.size() > 0) {
                         int i = 1;
+                        List<ArchiveFileVO> list = new ArrayList<>();
                         for (ArchivesAutoVO.ApprovalFile approvalFile : saveList) {
                             ArchiveFileVO saveVo = BeanUtil.copy(approvalFile, ArchiveFileVO.class);
                             saveVo.setSort(l + i);
                             saveVo.setIsAutoFile(1);
                             saveVo.setStatus(new Integer("0").equals(saveVo.getIsApproval()) ? 2 : 0);
                             saveVo.setIsCertification(new Integer("0").equals(saveVo.getIsNeedCertification()) ? 1 : 0);
-                            saveVos.getList().add(saveVo);
+                            saveVo.setArchiveId(archive.getId());
+                            saveVo.setOriginId(archive.getId());
+                            list.add(saveVo);
+                            pageN = pageN + saveVo.getFilePage();
                             i++;
                         }
+                        saveVos.setList(list);
                     }
                     this.archiveFileClient.saveArchiveFile(saveVos);
+                    archive.setFileN(saveVos.getSize());
+                    archive.setPageN(pageN);
+                    List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(saveVos.getNodeId());
+                    if(archiveTreeContracts != null && archiveTreeContracts.size() >0){
+                        archive.setTreeSort(archiveTreeContracts.get(0).getTreeSort());
+                    }
 
-                    String archiveId = "";
-                    //获取方式
-                    archiveId = "FromNode_" + archive.getNodeId();
-                    archive.setId(Long.parseLong(archiveId));
+                    archive.setAutoFileSort(l+archive.getAutoFileSort());
                     //待修改
                     archive.setIsDeleted(0);
                     archive.setIsArchive(0);
@@ -104,13 +116,13 @@ public class ArchiveFileAutoController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "分页")
     public R<Object> page( ArchivesAutoVO queryVo){
-        if(queryVo.getNodeId() == null || queryVo.getNodeId().equals("")){
+        if(queryVo.getNodeIds() == null || queryVo.getNodeIds().equals("")){
             return  R.data(null);
         }
         List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds());
         if(archiveTreeContracts != null && archiveTreeContracts.size() > 0){
             List<String> ids = JSONArray.parseArray(JSONObject.toJSONString(archiveTreeContracts.stream().map(ArchiveTreeContract::getId).distinct().collect(Collectors.toList())), String.class);
-            ids.add(queryVo.getNodeId().toString());
+            ids.add(queryVo.getNodeIds());
             queryVo.setNodeIdArray(ids);
         }
 
@@ -124,7 +136,7 @@ public class ArchiveFileAutoController extends BladeController {
     @PostMapping("/migrateFile")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "迁移文件", notes = "传入ids")
-    public R migrateFile(@RequestParam String ids,@RequestParam String nodeId) {
-        return R.status(archivesAutoService.updateArchivesAutoFileByNodeId(ids,nodeId));
+    public R migrateFile(@RequestParam String ids,@RequestParam String nodeId,@RequestParam String nodeSort) {
+        return R.status(archivesAutoService.updateArchivesAutoFileByNodeId(ids,nodeId,nodeSort));
     }
 }

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

@@ -44,5 +44,5 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
 	List<ArchivesAuto> selectArchivesAutoFilePage(@Param("current") Integer current, @Param("size") Integer size, @Param("vo")  ArchivesAutoVO vo);
 
-	Integer updateArchivesAutoFileByNodeId(List<Long> toLongList, String nodeId);
+	Integer updateArchivesAutoFileByNodeId(@Param("ids") List<Long> ids,@Param("nodeId") String nodeId,@Param("nodeSort") String nodeSort);
 }

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

@@ -39,10 +39,10 @@
         <result column="file_n" property="fileN"/>
         <result column="page_n" property="pageN"/>
         <result column="mileage" property="mileage"/>
-        <result column="fileType" property="fileType"/>
+        <result column="file_type" property="fileType"/>
         <result column="size" property="size"/>
-        <result column="tree_sort" property="nodeSort"/>
-        <result column="isOpen" property="isOpen"/>
+        <result column="tree_sort" property="treeSort"/>
+        <result column="is_open" property="isOpen"/>
         <result column="ischeck" property="ischeck"/>
         <result column="is_auto_file" property="isAutoFile"/>
         <result column="auto_file_sort" property="autoFileSort"/>
@@ -91,11 +91,11 @@
                 #{nodeId}
             </foreach>
         </if>
-        order by sort,create_time DESC
+        order by tree_sort DESC,auto_file_sort asc
     </select>
 
     <update id="updateArchivesAutoFileByNodeId" >
-        update u_archives_auto set node_id = #{nodeId} where
+        update u_archives_auto set node_id = #{nodeId},tree_sort = #{nodeSort} 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

@@ -40,5 +40,5 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	IPage<ArchivesAutoVO> selectArchivesAutoFilePage(ArchivesAutoVO queryVo);
 
-	boolean updateArchivesAutoFileByNodeId(String ids, String nodeId);
+	boolean updateArchivesAutoFileByNodeId(String ids, String nodeId,String nodeSort);
 }

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

@@ -75,12 +75,16 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		List<DictBiz> sheetSourceList1 = this.iDictBizClient.getList("storage_period", "notRoot").getData();
 
 		pageVoList.forEach(vos -> {
-			if(StringUtils.isNotEmpty(vos.getSecretLevel()) || StringUtils.isNotEmpty(vos.getStorageTime())){
+			if(StringUtils.isNotEmpty(vos.getSecretLevel())){
 				sheetSourceList.forEach(source -> {
-					if(StringUtils.isNotEmpty(vos.getSecretLevel()) && source.getDictKey().equals(vos.getSecretLevel())){
+					if( source.getDictKey().equals(vos.getSecretLevel())){
 						vos.setSecretLevelValue(source.getDictValue());
 					}
-					if(StringUtils.isNotEmpty(vos.getStorageTime()) && source.getDictKey().equals(vos.getStorageTime())){
+				});
+			}
+			if(StringUtils.isNotEmpty(vos.getStorageTime())){
+				sheetSourceList1.forEach(source -> {
+					if ( source.getDictKey().equals(vos.getStorageTime())) {
 						vos.setStorageTimeValue(source.getDictValue());
 					}
 				});
@@ -91,9 +95,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	}
 
 	@Override
-	public boolean updateArchivesAutoFileByNodeId(String ids, String nodeId) {
+	public boolean updateArchivesAutoFileByNodeId(String ids, String nodeId,String nodeSort) {
 		try {
-			baseMapper.updateArchivesAutoFileByNodeId(Func.toLongList(ids),nodeId);
+			baseMapper.updateArchivesAutoFileByNodeId(Func.toLongList(ids),nodeId,nodeSort);
 
 		} catch (Exception e) {
 			e.printStackTrace();