update

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

@@ -24,7 +24,7 @@ public enum RepairStatusEnum {
     /**
      * 库存换新
      */
-    CHANGE_NEW(3, "库存换新"),
+    CHANGE_NEW(3, "库存换新"),//不用了
     /**
      * 已报废
      */

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -242,6 +242,7 @@ public class RepairController {
             repairDetail.setModel(deviceLibraryEntity.getModel());
             repairDetail.setName(deviceLibraryEntity.getName());
             repairDetail.setOwnUnit(deviceLibraryEntity.getOwnUnit());
+            //设置状态为等待送修
             repairDetail.setRepairStatus(9);
             repairDetail.setRfidSurfaceId(deviceLibraryEntity.getRfidSurfaceId());
             repairDetail.setSeqNumber(deviceLibraryEntity.getSeqNumber());
@@ -455,7 +456,7 @@ public class RepairController {
         List<Integer> idList = StringSplitUtil.split(deviceIdDetail);
         //如果当前为省，改变装备的所在为中办
         if (level == 1) {
-            //获取当前业务维修详情
+            //获取当前业务维修详情  记录
             List<RepairDetail> repairDetailEntities = deviceRepairDetailService.findByBillId(repairBill.getId());
             //改变维修详情装备所在单位为中办,状态为维修中
             repairDetailEntities.forEach(repairDetail -> {
@@ -807,7 +808,7 @@ public class RepairController {
     }
 
     @ApiOperation(value = "修好装备出库", notes = "可以通过这个接口修好装备出库")
-    @PostMapping(value = "/back")
+    @PostMapping(value = "/back")//开始维修退回
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity repairBack(@RequestBody @Validated RepairBackBillSaveVo repairBackBillSaveVo) {
         //存放详情id
@@ -994,7 +995,7 @@ public class RepairController {
             }
             else {
                 userIds.add(0);
-                TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE.id, repairBackBill.getSendUnit()+"维修退回型号："+StringSplitUtil.stringListToString(repairReceiveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBill.getReceiveCount()+"件至"+repairBackBill.getReceiveUnit(), null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
+                TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE.id, repairBackBill.getSendUnit()+"维修退回型号"+StringSplitUtil.stringListToString(repairReceiveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBill.getReceiveCount()+"件至"+repairBackBill.getReceiveUnit(), null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
                 taskBto2 = taskService.start(taskBto1);
             }
             //遍历改变维修详情
@@ -1968,7 +1969,7 @@ public class RepairController {
     }
 
     @ApiOperation(value = "上传送修发送方签发人", notes = "上传发送方签发人")
-    @PostMapping(value = "/updateSendAgent")
+    @PostMapping(value = "/updateSendAgent")//不用
     public ResponseEntity updateSendAgent(@RequestBody AgentBackVo agentBackVo){
         TaskBto taskBto = taskService.get(agentBackVo.getId());
         List<Integer> idList = new ArrayList<>();
@@ -1985,7 +1986,7 @@ public class RepairController {
     }
 
     @ApiOperation(value = "上传领取发送方签发人", notes = "上传发送方签发人")
-    @PostMapping(value = "/updateBackAgent")
+    @PostMapping(value = "/updateBackAgent")//不用
     public ResponseEntity updateBackAgent(@RequestBody AgentBackVo agentBackVo){
         TaskBto taskBto = taskService.get(agentBackVo.getId());
         List<Integer> idList = new ArrayList<>();

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

@@ -149,7 +149,7 @@ public class RepairBackBill {
     /**
      * 退回状态(1:维修成功出库待审核,2:维修成功出库审核失败,3:重新配发出库待审核,4:重新配发出库审核失败,5:退回中,5:送修方接收待审核,6:送修方接收审核失败,7:维修退回完成)
      */
-    @ApiModelProperty(value = "退回状态(0:草稿,2:维修成功出库审核失败,3:重新配发出库待审核,4:重新配发出库审核失败,5:退回中,5:送修方接收待审核,6:送修方接收审核失败,7:维修退回完成)")
+    @ApiModelProperty(value = "退回状态(0:草稿,2:退回中,5:维修退回完成)")
     private Integer backStatus;
     /**
      * 维修完成出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

 package com.tykj.dev.device.task.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.tykj.dev.config.GlobalMap;
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.task.repository.TaskDao;
@@ -21,7 +20,6 @@ import com.tykj.dev.misc.utils.StringSplitUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.OrderComparator;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -222,7 +220,7 @@ public class TaskController {
     }
 
     @ApiOperation(value = "查询业务日志", notes = "可以通过这个接口查询查询业务日志")
-    @GetMapping("/manage/detail/log/{id}")
+    @GetMapping("/manage/detail/log/{id}")//业务履历
     public ResponseEntity selectLog(@PathVariable("id") int taskId) {
         //添加当前业务日志
         List<TaskLogUserVo> taskLogUserVos = taskLogService.getByTaskId(taskId);