Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialSelfInspectionRecord.java

@@ -1,5 +1,7 @@
 package org.springblade.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -78,6 +80,7 @@ public class TrialSelfInspectionRecord extends BaseEntity {
     private String pdfUrl;
 
     @ApiModelProperty(value = "委托单Id")
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private Long entrustId;
 
     @ApiModelProperty("判断依据：规范id")

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

@@ -42,6 +42,7 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.service.IExcelTabService;
 import org.springblade.manager.service.IWbsTreeContractService;
 import org.springblade.manager.service.IWbsTreePrivateService;
+import org.springblade.manager.vo.AppWbsTreeContractVO;
 import org.springblade.manager.vo.ExcelTabVO;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -288,11 +289,17 @@ public class TableFileController extends BladeController {
     @PostMapping("/sort")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "附件排序", notes = "传入listids")
-    public R sort(@RequestBody List<TableFile> list){
-        int i=1;
-        for (TableFile file : list) {
-            file.setSort(i++);
+    public R sort(@RequestBody List<AppWbsTreeContractVO> fileList){
+        for (AppWbsTreeContractVO vo : fileList) {
+            List<TableFile> list = vo.getFileList();
+            if(!list.isEmpty()){
+                int i=1;
+                for (TableFile file : list) {
+                    file.setSort(i++);
+                }
+            }
+            tableFileService.updateBatchById(list);
         }
-      return R.status(tableFileService.updateBatchById(list));
+      return R.status(true);
     }
 }