Quellcode durchsuchen

质检附件排序

cr vor 1 Monat
Ursprung
Commit
49299ae359

+ 2 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/TableFile.java

@@ -96,4 +96,6 @@ public class TableFile implements Serializable {
     @ApiModelProperty(value = "1施工2监理")
     private Integer classify;
 
+    private Integer sort;
+
 }

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -4417,7 +4417,7 @@ public class ExcelTabController extends BladeController {
             @ApiImplicitParam(name = "nodeId", value = "nodeId", required = true),
 
     })
-    public R addBussFile(@RequestParam("file") MultipartFile[] file, String nodeId, Integer type, Long contractId, Integer classify, BladeUser b) {
+    public R addBussFile(@RequestParam("file") MultipartFile[] file, String nodeId, Integer type, Long contractId, Integer classify, BladeUser b,Integer sort) {
         List<TableFile> fileList = new ArrayList<>();
         if (file != null && file.length >= 1) {
             for (MultipartFile multipartFile : file) {
@@ -4438,6 +4438,7 @@ public class ExcelTabController extends BladeController {
                 tableFile.setIsDeleted(0);
                 tableFile.setExtension(fileExtension);
                 tableFile.setClassify(classify);
+                tableFile.setSort(sort);
                 fileList.add(tableFile);
             }
             tableFileService.saveOrUpdateBatch(fileList);

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

@@ -279,4 +279,14 @@ public class TableFileController extends BladeController {
         }
         return R.data("成功");
     }
+    @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++);
+        }
+      return R.status(tableFileService.updateBatchById(list));
+    }
 }

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TableFileMapper.xml

@@ -41,6 +41,7 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY sort ASC
     </select>
 
     <delete id="delDataById">
@@ -51,7 +52,7 @@
     </delete>
 
     <select id="selectTableFileListByTen" resultMap="TableFileVO">
-        select *,domain_url as url from m_table_file where is_deleted = 0  and classify = #{classify} and type in (10,11,12,20,21,22) and tab_id = #{pKid}
+        select *,domain_url as url from m_table_file where is_deleted = 0  and classify = #{classify} and type in (10,11,12,20,21,22) and tab_id = #{pKid} Order by sort ASC
     </select>
 
     <select id="selectTableFileList1" resultMap="TableFileVO">