更新确认单

src/main/java/org/jeecg/modules/prowork/entity/ProWorkMilestone.java

@@ -74,6 +74,8 @@ public class ProWorkMilestone implements Serializable {
 	private String delFlag;
 	@ApiModelProperty("组织")
 	private String pkOrg;
+	@ApiModelProperty("排序")
+	private Integer sort;
 
 	public ProWorkMilestone() {
 	}

src/main/java/org/jeecg/modules/prowork/entity/ProWorkUpdateFile.java

@@ -25,29 +25,31 @@ public class ProWorkUpdateFile implements Serializable {
 
     @ApiModelProperty("id")
     @TableId(type = IdType.UUID)
-    private java.lang.String id;
+    private String id;
     @ApiModelProperty("里程碑确认单id")
     private String workMileId;
     @ApiModelProperty("文件名")
     private String fileName;
     @ApiModelProperty("fileUrl")
-    private java.lang.String fileUrl;
+    private String fileUrl;
     @ApiModelProperty("创建时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date createTime;
     @ApiModelProperty("创建人")
-    private java.lang.String createBy;
+    private String createBy;
     @ApiModelProperty("修改时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateTime;
     @ApiModelProperty("修改人")
-    private java.lang.String updateBy;
+    private String updateBy;
     @ApiModelProperty("删除状态（0，正常，1已删除）")
-    private java.lang.String delFlag;
+    private String delFlag;
     @ApiModelProperty("组织")
-    private java.lang.String pkOrg;
+    private String pkOrg;
+    @ApiModelProperty("排序")
+    private Integer sort;
 
     public ProWorkUpdateFile() {
     }

src/main/java/org/jeecg/modules/prowork/service/impl/ProWorkMilestoneServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.prowork.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.dto.prowork.ProWorkMilestoneAddReqDTO;
 import org.jeecg.common.dto.prowork.ProWorkMilestoneRespDTO;
@@ -101,6 +102,7 @@ public class ProWorkMilestoneServiceImpl extends ServiceImpl<ProWorkMilestoneMap
         queryWrapper.eq("work_mile_id", id);
         queryWrapper.lambda().eq(ProWorkUpdateFile::getDelFlag,"0");
         List<ProWorkUpdateFile> list = proWorkUpdateFileService.list(queryWrapper);
+        list.sort((x, y)-> Integer.compare(x.getSort(), y.getSort()));
         List<ProWorkUpdateFileRespDTO> fileList = Lists.newArrayList();
         for(ProWorkUpdateFile updateFile : list){
             ProWorkUpdateFileRespDTO respDTO = new ProWorkUpdateFileRespDTO(updateFile);
@@ -130,7 +132,9 @@ public class ProWorkMilestoneServiceImpl extends ServiceImpl<ProWorkMilestoneMap
             //截取文件名称
             String[] filePath = fileAddReqDTO.getFileUrl().split("/");
             int index = filePath.length;
-            String fileName = StringUtils.substringBefore(filePath[index - 1], ".");
+            String fileNameAfter = StringUtils.substringAfter(filePath[index - 1], ".");
+            String fileNameBefore = StringUtils.substringBefore(filePath[index - 1], "_");
+            String fileName = fileNameBefore + "." + fileNameAfter;
             proWorkUpdateFile.setFileName(fileName);
             proWorkUpdateFile.setWorkMileId(id);
             list.add(proWorkUpdateFile);