水库工程图片列表查询修改,查询文件信息修改

src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java

@@ -90,7 +90,10 @@ public class ResProjectImgController extends AbstractCommonFileController{
     @Operation(summary = "列表")
     @PostMapping("/list")
     public R<List<ResProjectImg>> list(@Validated @RequestBody ResCodeSo so) {
-        List<ResProjectImg> list = service.lambdaQuery().eq(ResProjectImg::getResCode, so.getResCode()).list();
+        List<ResProjectImg> list = service.lambdaQuery().eq(ResProjectImg::getResCode, so.getResCode())
+                .orderByAsc(ResProjectImg::getSortOn)
+                .orderByDesc(ResProjectImg::getModitime)
+                .list();
         if (CollectionUtils.isNotEmpty(list)){
             list.forEach(o -> o.setFiles(fileService.getFiles(getGroupId(),String.valueOf( o.getId()))));
         }

src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java

@@ -27,7 +27,7 @@ public interface FileAssociationsMapper extends BaseMapper<FileAssociations> {
             	file_associations fa
             	LEFT JOIN file_descriptor fd ON fa.file_id = fd.file_id
             WHERE
-                fa.del = 0
+                fa.del = '1'
                 AND fa.business_id = #{businessId}
             	AND fa."table_name" = #{tableName}
             	AND fd.group_id = #{tableName}

src/main/java/com/gunshi/project/xyt/model/FileAssociations.java

@@ -86,7 +86,7 @@ public class FileAssociations implements Serializable {
         */
         @TableField(value="del")
         @Size(max = 1,message = "删除标识最大长度要小于 2")
-        @Schema(description="删除标识0: 未删除,1:已删除")
+        @Schema(description="删除标识1: 未删除,0:已删除")
         @NotBlank(message = "删除标识不能为空")
         private String del;
 

src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java

@@ -55,7 +55,7 @@ public class FileAssociationsService extends ServiceImpl<FileAssociationsMapper,
 
                 // 删除
                 if (this.lambdaUpdate()
-                        .set(FileAssociations::getDel, "1")
+                        .set(FileAssociations::getDel, DEL)
                         .eq(FileAssociations::getTableName, tableName)
                         .eq(FileAssociations::getBusinessId, businessId)
                         .in(FileAssociations::getFileId, fileIds)