更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -218,6 +218,12 @@ public class AllotBillController {
                     .map(User::getUserId)
                     .collect(Collectors.toList()));
         }
+        if (allotBillSaveVo.getSendUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(allotBillSaveVo.getSendUserbId());
+            MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1);
+            messageService.add(messageBto);
+        }
         MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBillEntity.getReceiveUnit()) + "发起配发",idList,1);
         messageService.add(messageBto);
         log.info("[配发模块]:" + allotBillEntity.getSendUnit() + "对" + allotBillEntity.getReceiveUnit() + "发起配发");
@@ -379,6 +385,12 @@ public class AllotBillController {
         ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getSendUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
+        if (allotReceiveVo.getReceiveUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(allotReceiveVo.getReceiveUserbId());
+            MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
+            messageService.add(messageBto);
+        }
         MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收配发装备",ids,1);
         messageService.add(messageBto);
         log.info("[配发模块]:接收并发起入库");
@@ -614,11 +626,15 @@ public class AllotBillController {
 
     @ApiOperation(value = "上传发送方签发人", notes = "上传发送方签发人")
     @PostMapping(value = "/updateAgent")
-    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity updateAgent(@RequestBody AgentVo agentVo){
         TaskBto taskBto = taskService.get(agentVo.getId());
+        List<Integer> idList = new ArrayList<>();
+        idList.add(agentVo.getSendUserbId());
+        MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"被选为签发人",idList,1);
+        messageService.add(messageBto);
         AllotBill allotBill = allotBillService.getOne(taskBto.getBillId());
         allotBill.setAgent(agentVo.getName());
+        allotBill.setSendUserbId(agentVo.getSendUserbId());
         return ResponseEntity.ok(allotBillService.update(allotBill));
     }
 }

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java

@@ -144,6 +144,12 @@ public class BackController {
         idList.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getReceiveUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
+        if (allotBillSaveVo.getSendUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(allotBillSaveVo.getSendUserbId());
+            MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1);
+            messageService.add(messageBto);
+        }
         MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBackBill.getReceiveUnit()) + "发起退回",idList,1);
         messageService.add(messageBto);
         log.info("[退回模块]:" + allotBackBill.getSendUnit() + "对" + allotBackBill.getReceiveUnit() + "发起退回");
@@ -216,6 +222,12 @@ public class BackController {
         ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getSendUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
+        if (allotBackReceiveVo.getReceiveUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(allotBackReceiveVo.getReceiveUserbId());
+            MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
+            messageService.add(messageBto);
+        }
         MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收退回装备",ids,1);
         messageService.add(messageBto);
         log.info("[退回模块]:接收并发起入库");
@@ -289,11 +301,15 @@ public class BackController {
 
     @ApiOperation(value = "上传发送方签发人", notes = "上传发送方签发人")
     @PostMapping(value = "/updateAgent")
-    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity updateAgent(@RequestBody AgentVo agentVo){
         TaskBto taskBto = taskService.get(agentVo.getId());
+        List<Integer> idList = new ArrayList<>();
+        idList.add(agentVo.getSendUserbId());
+        MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"被选为签发人",idList,1);
+        messageService.add(messageBto);
         AllotBackBill allotBackBill = allotBackBillService.getOne(taskBto.getBillId());
         allotBackBill.setAgent(agentVo.getName());
+        allotBackBill.setSendUserbId(agentVo.getSendUserbId());
         return ResponseEntity.ok(allotBackBillService.update(allotBackBill));
     }
 }

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBackBill.java

@@ -67,6 +67,9 @@ public class AllotBackBill {
     @ApiModelProperty(value = "发件经办人id(A岗位)")
     private Integer sendUseraId;
 
+    @ApiModelProperty(value = "发件方审核人id(B岗位)")
+    private Integer sendUserbId;
+
     @ApiModelProperty(value = "收件经办人id(A岗位)")
     private Integer receiveUseraId;
 

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AgentVo.java

 package com.tykj.dev.device.allot.subject.vo;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -9,4 +10,7 @@ public class AgentVo {
     private Integer id;
 
     private String name;
+
+    @ApiModelProperty(value = "发件方(B岗位)")
+    private Integer sendUserbId;
 }

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -288,7 +288,13 @@ public class DeviceApplyController {
         userIds.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getReceiveUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
-        MessageBto messageBto = new MessageBto(taskBto1.getId(),taskBto1.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBillEntity.getReceiveUnit()) + "发起配发",userIds);
+        if (deviceApplyAllotSaveVo.getSendUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(deviceApplyAllotSaveVo.getSendUserbId());
+            MessageBto messageBto = new MessageBto(taskBto1.getId(), taskBto1.getBusinessType(), "被选为签发人", idList1, 1);
+            messageService.add(messageBto);
+        }
+        MessageBto messageBto = new MessageBto(taskBto1.getId(),taskBto1.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBillEntity.getReceiveUnit()) + "发起配发",userIds,1);
         messageService.add(messageBto);
         log.info("[申请模块]:装备申请后发起配发");
         myWebSocket.sendMessage1();

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

@@ -3,6 +3,7 @@ package com.tykj.dev.misc.base;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.util.Assert;
 
 import javax.validation.constraints.Min;
@@ -64,14 +65,24 @@ public class CustomPage {
 
     @JsonIgnore
     public PageRequest getPageable() {
-//        if (orders.size() != 0) {
-//            List<Sort.Order> orders = new ArrayList<>();
-//            this.orders.stream().forEach(item ->
-//                    orders.add(new Sort.Order(item.getDirection(), item.getCoulmn())));
-//            return PageRequest.of(getPage(), getLimit(), Sort.by(orders));
-//        }
-
-
+        if (orders.size() != 0) {
+            List<Sort.Order> orders = new ArrayList<>();
+            this.orders.stream().forEach(item -> {
+                        if ("ASC".equals(item.getDirection())) {
+                            orders.add(new Sort.Order(Sort.Direction.ASC, item.getCoulmn()));
+                        }
+                        else if("DESC".equals(item.getDirection())){
+                            orders.add(new Sort.Order(Sort.Direction.DESC, item.getCoulmn()));
+                        }
+                    }
+            );
+            if (orders.size()>0) {
+                return PageRequest.of(getPage(), getLimit(), Sort.by(orders));
+            }
+            else {
+                return PageRequest.of(getPage(), getLimit());
+            }
+        }
         return PageRequest.of(getPage(), getLimit());
     }
 

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

@@ -344,7 +344,13 @@ public class RepairController {
         //添加出库白名单
         inputOutputDeviceService.addWhiteDevices(idList,userUtils.getCurrentUnitId(),1);
         //发送阅知信息
-        MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"向"+userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit())+"发起装备维修",ids);
+        if (repairBillSaveVo.getStartUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(repairBillSaveVo.getStartUserbId());
+            MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1);
+            messageService.add(messageBto);
+        }
+        MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"向"+userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit())+"发起装备维修",ids,1);
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
         return ResultUtil.success(repairBill2);
@@ -561,11 +567,17 @@ public class RepairController {
             deviceRepairDetailService.update(repairDetail);
         });
         //发送阅知信息
+        if (repairReceiveVo.getReceiveUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(repairReceiveVo.getReceiveUserbId());
+            MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
+            messageService.add(messageBto);
+        }
         List<Integer> ids = userPublicService.findOtherUser(userUtils.getCurrentUserId());
         ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(repairBill.getSendUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
-        MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收维修装备",ids);
+        MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收维修装备",ids,1);
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
         return ResultUtil.success("维修装备接收入库");
@@ -776,6 +788,7 @@ public class RepairController {
             RepairDetail repairDetail = deviceRepairDetailService.getOne(d.getId());
             repairDetail.setRepairBackBillId(deviceRepairBackBillEntity1.getId());
             repairDetail.setRepairStatus(7);
+            repairDetail.setBackRemark(d.getRemark());
             deviceRepairDetailService.update(repairDetail);
             DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(d.getDeviceId());
             deviceLibraryEntity.setLifeStatus(4);
@@ -814,7 +827,13 @@ public class RepairController {
         ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
-        MessageBto messageBto = new MessageBto(task.getId(),task.getBusinessType(),"向"+userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit())+"退回维修装备",ids);
+        if (repairBackBillSaveVo.getStartUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(repairBackBillSaveVo.getStartUserbId());
+            MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "被选为签发人", idList1, 1);
+            messageService.add(messageBto);
+        }
+        MessageBto messageBto = new MessageBto(task.getId(),task.getBusinessType(),"向"+userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit())+"退回维修装备",ids,1);
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
         return ResultUtil.success(repairBackBill1);
@@ -1099,7 +1118,13 @@ public class RepairController {
                     .map(User::getUserId)
                     .collect(Collectors.toList()));
         }
-        MessageBto messageBto = new MessageBto(taskBto2.getId(),taskBto2.getBusinessType(),"接收维修退回装备",ids);
+        if (repairReceiveVo.getReceiveUserbId()!=null) {
+            List<Integer> idList1 = new ArrayList<>();
+            idList1.add(repairReceiveVo.getReceiveUserbId());
+            MessageBto messageBto = new MessageBto(taskBto2.getId(), taskBto2.getBusinessType(), "被选为经办人", idList1, 1);
+            messageService.add(messageBto);
+        }
+        MessageBto messageBto = new MessageBto(taskBto2.getId(),taskBto2.getBusinessType(),"接收维修退回装备",ids,1);
         messageService.add(messageBto);
         messageMap.keySet().forEach(integer -> {
             List<Integer> integerList = new ArrayList<>();
@@ -1548,7 +1573,7 @@ public class RepairController {
                 deviceLibraryList.forEach(deviceLibrary -> {
                     for (RepairDetail r : repairDetailList) {
                         if (r.getDeviceId().equals(deviceLibrary.getId())) {
-                            deviceLibrary.setRemark(r.getRemark());
+                            deviceLibrary.setRemark(r.getBackRemark());
                             if (r.getPid()!=null) {
                                 deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus());
                             }
@@ -1561,7 +1586,7 @@ public class RepairController {
                 deviceLibraryList2.forEach(deviceLibrary -> {
                     for (RepairDetail r : repairDetailList) {
                         if (r.getDeviceId().equals(deviceLibrary.getId())) {
-                            deviceLibrary.setRemark(r.getRemark());
+                            deviceLibrary.setRemark(r.getBackRemark());
                             if (r.getPid()!=null) {
                                 deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus());
                             }
@@ -1784,21 +1809,31 @@ public class RepairController {
 
     @ApiOperation(value = "上传送修发送方签发人", notes = "上传发送方签发人")
     @PostMapping(value = "/updateSendAgent")
-    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity updateSendAgent(@RequestBody AgentBackVo agentBackVo){
         TaskBto taskBto = taskService.get(agentBackVo.getId());
+        List<Integer> idList = new ArrayList<>();
+        idList.add(agentBackVo.getStartUserbId());
+        MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"被选为签发人",idList,1);
+        messageService.add(messageBto);
         RepairBill repairBill = deviceRepairBillService.getOne(taskBto.getBillId());
         repairBill.setStartUserB(agentBackVo.getName());
+        RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
+        repairSendBill.setStartUserbId(agentBackVo.getStartUserbId());
+        deviceRepairSendBillService.update(repairSendBill);
         return ResponseEntity.ok(deviceRepairBillService.update(repairBill));
     }
 
     @ApiOperation(value = "上传领取发送方签发人", notes = "上传发送方签发人")
     @PostMapping(value = "/updateBackAgent")
-    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity updateBackAgent(@RequestBody AgentBackVo agentBackVo){
         TaskBto taskBto = taskService.get(agentBackVo.getId());
+        List<Integer> idList = new ArrayList<>();
+        idList.add(agentBackVo.getStartUserbId());
+        MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"被选为签发人",idList,1);
+        messageService.add(messageBto);
         RepairBackBill repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
         repairBackBill.setAgent(agentBackVo.getName());
+        repairBackBill.setStartUserbId(agentBackVo.getStartUserbId());
         return ResponseEntity.ok(deviceRepairBackBillService.update(repairBackBill));
     }
 }

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

@@ -98,6 +98,11 @@ public class RepairDetail {
      */
     @ApiModelProperty(value = "维修备注")
     private String remark;
+    /**
+     * 维修领取备注
+     */
+    @ApiModelProperty(value = "维修领取备注")
+    private String backRemark;
     /**
      * 已报废换新装备详情主键Id(null代表没有报废，0代表已报废还没有换新)
      */

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

 package com.tykj.dev.device.repair.subject.vo;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -9,4 +10,7 @@ public class AgentBackVo {
     private Integer id;
 
     private String name;
+
+    @ApiModelProperty(value = "退回确认人", example = "1")
+    private Integer startUserbId;
 }

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

@@ -51,7 +51,7 @@ public class TaskController {
     @RequestMapping(method = RequestMethod.POST, value = "/manage/summary", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity getTaskPage(@RequestBody TaskSelectVo taskSelectVo) {
         List<TaskUserVo> taskUserVos = taskService.getManageList(taskSelectVo);
-        return ResultUtil.success(PageUtil.getPerPage(taskSelectVo.getPage(), taskSelectVo.getSize(), taskUtils.orderByTopDesc(taskUserVos), taskSelectVo.getPageable()));
+        return ResultUtil.success(PageUtil.getPerPage(taskSelectVo.getPage(), taskSelectVo.getSize(), taskUserVos, taskSelectVo.getPageable()));
     }
 
     @ApiOperation(value = "业务跟踪待办列表查询", notes = "可以通过这个接口查询业务")