Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

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

@@ -272,7 +272,7 @@ public class ArchiveFileController extends BladeController {
      * 档案统计-原生数字化文件数量
      */
     @GetMapping("/allArchiveFileByContractType")
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 11)
     @ApiOperation(value = "档案统计-原生数字化文件数量")
     public R allArchiveFileByContractType(Long projectId) {
         List<Map<String, Object>> mapList = archiveFileClient.getAllArchiveFileByContractType(projectId);
@@ -283,7 +283,7 @@ public class ArchiveFileController extends BladeController {
      * 档案统计-档案总存储
      */
     @GetMapping("/allArchiveFileSize")
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 12)
     @ApiOperation(value = "档案统计-档案总存储")
     public R allArchiveFileSize(Long projectId) {
         //统计案卷文件大小
@@ -296,4 +296,19 @@ public class ArchiveFileController extends BladeController {
         String size = org.springblade.common.utils.FileUtils.formatSize(fileSize );
         return R.data(size);
     }
+    /**
+     * 批量编辑
+     */
+    @PostMapping("/batchUpdate")
+    @ApiOperationSupport(order = 13)
+    @ApiOperation(value = "批量编辑")
+    public R<Boolean> batchUpdate(@RequestBody ArchiveFileVO vo){
+        try {
+            this.archiveFileClient.updateArchiveFileSort(vo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.data(false);
+        }
+        return R.data(true);
+    }
 }

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

@@ -26,6 +26,7 @@ import javax.validation.Valid;
 
 import org.apache.commons.lang.StringUtils;
 import org.springblade.archive.service.IArchiveAutoPdfService;
+import org.springblade.business.entity.ArchiveFile;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -408,5 +409,13 @@ public class ArchivesAutoController extends BladeController {
 		return R.data("刷新成功");
 	}
 
-
+	/**
+	 * 批量编辑
+	 */
+	@PostMapping("/batchUpdate")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "批量编辑", notes = "传入archivesAutoVo")
+	public R batchUpdate(@Valid @RequestBody ArchivesAutoVO archivesAutoVo) {
+		return R.status(archivesAutoService.updateBatchById(JSONArray.parseArray(JSONObject.toJSONString(archivesAutoVo.getList()), ArchivesAuto.class)));
+	}
 }