修改维修

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -82,13 +82,13 @@ public enum LogType {
 
     REPAIR_SEND_3(32,REPAIR.id, REPAIR_SEND_CONFIRM.id, ARCHIVE.id, "维修出库审核失败"),
 
-    REPAIR_SEND_4(33,REPAIR.id, WAIT_RECEIVE.id, REPAIRING.id, "接收维修装备并发起入库"),
+    REPAIR_SEND_4(33,REPAIR.id, WAIT_RECEIVE.id, END.id, "接收维修装备并发起入库"),
 
     DESTROY_4(100,DESTROY.id, WAIT_UPLOAD_BILL_FILE.id, END.id, "上传销毁单"),
 
-    REPAIR_SEND_5(34,REPAIR.id, REPAIR_RECEIVE_CONFIRM.id, REPAIRING.id, "审核成功并入库维修"),
+    REPAIR_SEND_5(34,REPAIR.id, WAIT_RECEIVE.id, WAIT_UPLOAD_FILE.id, "接收维修装备并发起入库(缺少单据)"),
 
-    REPAIR_SEND_6(35,REPAIR.id, REPAIR_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修装备入库审核失败"),
+    REPAIR_SEND_6(35,REPAIR.id, WAIT_UPLOAD_FILE.id, END.id, "上传送修单据"),
 
     REPAIR_SEND_7(36,REPAIR.id, REPAIR_SEND_CONFIRM.id, COUNTRY_REPAIRING.id, "审核成功并出库"),
 
@@ -170,7 +170,7 @@ public enum LogType {
     ALLOT_10(84,ALLOT.id, WAIT_ALLOT.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
     ALLOT_11(85,ALLOT.id, ALLOTING.id, ARCHIVE.id, "拒绝接收配发装备"),
     ALLOT_BACK_5(86,ALLOT_BACK.id, ALLOT_BACKING.id, END.id, "接收配发退回装备"),
-    REPAIR_SEND_10(87,REPAIR.id, ORIGIN_STATUS.id, COUNTRY_REPAIRING.id, "向(%receiveUnit)发起装备维修"),
+    REPAIR_SEND_10(87,REPAIR.id, ORIGIN_STATUS.id, END.id, "向(%receiveUnit)发起装备维修"),
     REPAIR_BACK_7(88,REPAIR_BACK.id, ORIGIN_STATUS.id, END.id, "维修退回装备接收并发起入库"),
     STORAGE_4(89,STORAGE.id, WAIT_STORAGE.id, ARCHIVE.id, "删除入库草稿"),
     ;

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -168,6 +168,7 @@ public enum StatusEnum {
     WAIT_RECEIVE(701, "等待接收维修装备"),
     REPAIR_RECEIVE_CONFIRM(702, "接收维修装备待审核"),
     REPAIRING(703, "维修中"),
+    WAIT_UPLOAD_FILE(704, "等待上传送修单"),
     COUNTRY_REPAIRING(777, "等待接收维修退回装备"),
     /**
      * 维修完成退回状态
@@ -175,6 +176,7 @@ public enum StatusEnum {
     REPAIR_BACK_CONFIRM(800, "维修退回装备出库待审核"),
     WAIT_BACK_RECEIVE(801, "等待接收维修退回装备"),
     REPAIR_BACK_RECEIVE_CONFIRM(802, "接收维修退回装备待审核"),
+    WAIT_UPLOAD_BACK_FILE(804, "等待上传回执单"),
 
     /**
      * 配发退回状态

dev-repair/src/main/java/com/tykj/dev/device/repair/repository/RepairDetailDao.java

@@ -8,4 +8,5 @@ import java.util.List;
 
 public interface RepairDetailDao extends JpaRepository<RepairDetail, Integer>, JpaSpecificationExecutor<RepairDetail> {
     List<RepairDetail> findByDeviceRepairBillId(Integer billId);
+    List<RepairDetail> findByRepairBackBillId(Integer billId);
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairDetail.java

@@ -76,6 +76,7 @@ public class RepairDetail {
      * 所在单位
      */
     @ApiModelProperty(value = "所在单位")
+    @Transient
     private String locationUnit;
     /**
      * 所属单位
@@ -130,4 +131,8 @@ public class RepairDetail {
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
 
+    @ApiModelProperty(value = "维修记录信息")
+    private String record;
+
+    private Integer repairBackBillId;
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/DeviceDetailVo.java

@@ -18,6 +18,11 @@ import javax.validation.constraints.NotNull;
 @ApiModel("维修装备详情类")
 public class DeviceDetailVo {
 
+    @NotNull(message = "id不能为空")
+    @Min(value = 1,message = "id不能小于1")
+    @ApiModelProperty(value = "维修详情ID", example = "1")
+    private Integer id;
+
     @NotNull(message = "deviceId不能为空")
     @Min(value = 1,message = "deviceId不能小于1")
     @ApiModelProperty(value = "装备ID", example = "1")

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/FileUploadVo.java

+package com.tykj.dev.device.repair.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("单据上传类")
+public class FileUploadVo {
+
+    @NotNull(message = "taskId不能为空")
+    @Min(value = 1,message = "taskId不能小于1")
+    @ApiModelProperty(value = "任务Id")
+    private Integer taskId;
+
+    @NotNull(message = "billFileName不能为空")
+    @ApiModelProperty(value = "配发单附件名字")
+    private String billFileName;
+
+    @NotNull(message = "billFileUrl不能为空")
+    @ApiModelProperty(value = "配发单附件URL")
+    private String billFileUrl;
+
+}

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/RepairReceiveVo.java

@@ -24,11 +24,11 @@ public class RepairReceiveVo {
     @ApiModelProperty(value = "任务Id")
     private Integer taskId;
 
-    @NotNull(message = "billFileName不能为空")
+//    @NotNull(message = "billFileName不能为空")
     @ApiModelProperty(value = "配发单附件名字")
     private String billFileName;
 
-    @NotNull(message = "billFileUrl不能为空")
+//    @NotNull(message = "billFileUrl不能为空")
     @ApiModelProperty(value = "配发单附件URL")
     private String billFileUrl;
 
@@ -53,5 +53,7 @@ public class RepairReceiveVo {
     @ApiModelProperty(value = "接收入库检查结果")
     private String receiveCheckResult;
 
-
+    @NotNull(message = "status不能为空")
+    @ApiModelProperty(value = "是否缺失单据（0：否，1：是）")
+    private Integer status = 0;
 }

dev-union/src/main/java/com/tykj/dev/union/LogAspect.java

@@ -278,7 +278,8 @@ public class LogAspect {
                     AllotBill allotBill = allotBillService.getOne(outPutTask.getBillId());
                     getFieldsParam(allotBill);
                     if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.ALLOTING.id))
-                            || (this.oldStatus.equals(StatusEnum.WAIT_ALLOT.id) && this.newStatus.equals(StatusEnum.ALLOTING.id))) {
+                            || (this.oldStatus.equals(StatusEnum.WAIT_ALLOT.id) && this.newStatus.equals(StatusEnum.ALLOTING.id))
+                            || (this.oldStatus.equals(StatusEnum.ALLOT_DRAFT.id) && this.newStatus.equals(StatusEnum.ALLOTING.id))) {
                         this.fileVos.add(new FileVo("出库确认单", allotBill.getFileName(), allotBill.getFileUrl()));
                     }
                     if ((this.oldStatus.equals(StatusEnum.ALLOTING.id) && this.newStatus.equals(StatusEnum.END.id))) {
@@ -315,13 +316,19 @@ public class LogAspect {
                     RepairSendBill repairSendBill = repairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
                     getFieldsParam(repairBillService.getOne(outPutTask.getBillId()));
                     if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.WAIT_RECEIVE.id))
-                    ||(this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.COUNTRY_REPAIRING.id))) {
+                    ||(this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.END.id))) {
                         this.fileVos.add(new FileVo("出库确认单", repairSendBill.getFileName(), repairSendBill.getFileUrl()));
                     }
-                    if ((this.oldStatus.equals(StatusEnum.WAIT_RECEIVE.id) && this.newStatus.equals(StatusEnum.REPAIRING.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.WAIT_RECEIVE.id) && this.newStatus.equals(StatusEnum.END.id))) {
                         this.fileVos.add(new FileVo("维修单", repairSendBill.getBillFileName(), repairSendBill.getBillFileUrl()));
                         this.fileVos.add(new FileVo("入库确认单", repairSendBill.getReceiveFileName(), repairSendBill.getReceiveFileUrl()));
                     }
+                    if ((this.oldStatus.equals(StatusEnum.WAIT_RECEIVE.id) && this.newStatus.equals(StatusEnum.WAIT_UPLOAD_FILE.id))) {
+                        this.fileVos.add(new FileVo("入库确认单", repairSendBill.getReceiveFileName(), repairSendBill.getReceiveFileUrl()));
+                    }
+                    if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) {
+                        this.fileVos.add(new FileVo("维修单", repairSendBill.getBillFileName(), repairSendBill.getBillFileUrl()));
+                    }
                 }
                 break;
             case 6: