[chg] 备件申请归还状态值更新

[fix] 预工单详情文件错乱 bug 修复

src/main/java/vion/dto/SparePartDTO.java

@@ -94,7 +94,7 @@ public class SparePartDTO extends BaseDTO {
     private Integer shipStatus;
     private Integer shipStatus;
 
 
     /**
     /**
-     * 归还状态 0：未归还 1：已归还
+     * 归还状态 0：未归还 1：全部归还 2：部分归还
      */
      */
     private Integer returnStatus;
     private Integer returnStatus;
 
 

src/main/java/vion/model/SparePart.java

@@ -114,7 +114,7 @@ public class SparePart {
     private Integer shipStatus;
     private Integer shipStatus;
 
 
     /**
     /**
-     * 归还状态 0：未归还 1：已归还
+     * 归还状态 0：未归还 1：全部归还 2：部分归还
      */
      */
     @TableField(value = "return_status")
     @TableField(value = "return_status")
     private Integer returnStatus;
     private Integer returnStatus;

src/main/java/vion/service/impl/TaskTempServiceImpl.java

@@ -66,6 +66,7 @@ public class TaskTempServiceImpl extends MPJBaseServiceImpl<TaskTempMapper, Task
                 .selectCollection(FileInfo.class, TaskTempVO::getFileList)
                 .selectCollection(FileInfo.class, TaskTempVO::getFileList)
                 .leftJoin(FileInfo.class, on -> on
                 .leftJoin(FileInfo.class, on -> on
                         .eq(FileInfo::getSourceId, TaskTemp::getId)
                         .eq(FileInfo::getSourceId, TaskTemp::getId)
+                        .eq(FileInfo::getSourceType, 2L)
                         .eq(FileInfo::getStoreId, 0L))
                         .eq(FileInfo::getStoreId, 0L))
                 .eq(TaskTemp::getId, id);
                 .eq(TaskTemp::getId, id);
         return Opt.ofNullable(this.selectJoinOne(TaskTempVO.class, wrapper))
         return Opt.ofNullable(this.selectJoinOne(TaskTempVO.class, wrapper))
@@ -163,3 +164,4 @@ public class TaskTempServiceImpl extends MPJBaseServiceImpl<TaskTempMapper, Task
         return jsonObj;
         return jsonObj;
     }
     }
 }
 }
+

src/main/java/vion/vo/SparePartVO.java

@@ -108,7 +108,7 @@ public class SparePartVO {
     private Integer shipStatus;
     private Integer shipStatus;
 
 
     /**
     /**
-     * 归还状态 0：未归还 1：已归还
+     * 归还状态 0：未归还 1：全部归还 2：部分归还
      */
      */
     private Integer returnStatus;
     private Integer returnStatus;