Skip to content

D
device-back
提交 3588b8cb authored 作者: 邓砥奕's avatar 邓砥奕
浏览文件
操作

更新

上级 b47f3fe3
显示空白字符变更
内嵌 并排
正在显示 包含 296 行增加 和 45 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ 3588b8cb
...@@ -218,6 +218,12 @@ public class AllotBillController { ...@@ -218,6 +218,12 @@ public class AllotBillController {
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBillEntity.getReceiveUnit()) + "发起配发",idList,1);
messageService.add(messageBto); messageService.add(messageBto);
log.info("[配发模块]:" + allotBillEntity.getSendUnit() + "对" + allotBillEntity.getReceiveUnit() + "发起配发"); log.info("[配发模块]:" + allotBillEntity.getSendUnit() + "对" + allotBillEntity.getReceiveUnit() + "发起配发");
...@@ -379,6 +385,12 @@ public class AllotBillController { ...@@ -379,6 +385,12 @@ public class AllotBillController {
ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getSendUnit())).stream() ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getSendUnit())).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收配发装备",ids,1);
messageService.add(messageBto); messageService.add(messageBto);
log.info("[配发模块]:接收并发起入库"); log.info("[配发模块]:接收并发起入库");
...@@ -614,11 +626,15 @@ public class AllotBillController { ...@@ -614,11 +626,15 @@ public class AllotBillController {
@ApiOperation(value = "上传发送方签发人", notes = "上传发送方签发人") @ApiOperation(value = "上传发送方签发人", notes = "上传发送方签发人")
@PostMapping(value = "/updateAgent") @PostMapping(value = "/updateAgent")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity updateAgent(@RequestBody AgentVo agentVo){ public ResponseEntity updateAgent(@RequestBody AgentVo agentVo){
TaskBto taskBto = taskService.get(agentVo.getId()); 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 allotBill = allotBillService.getOne(taskBto.getBillId());
allotBill.setAgent(agentVo.getName()); allotBill.setAgent(agentVo.getName());
allotBill.setSendUserbId(agentVo.getSendUserbId());
return ResponseEntity.ok(allotBillService.update(allotBill)); return ResponseEntity.ok(allotBillService.update(allotBill));
} }
} }
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ 3588b8cb
...@@ -144,6 +144,12 @@ public class BackController { ...@@ -144,6 +144,12 @@ public class BackController {
idList.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getReceiveUnit())).stream() idList.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getReceiveUnit())).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBackBill.getReceiveUnit()) + "发起退回",idList,1);
messageService.add(messageBto); messageService.add(messageBto);
log.info("[退回模块]:" + allotBackBill.getSendUnit() + "对" + allotBackBill.getReceiveUnit() + "发起退回"); log.info("[退回模块]:" + allotBackBill.getSendUnit() + "对" + allotBackBill.getReceiveUnit() + "发起退回");
...@@ -216,6 +222,12 @@ public class BackController { ...@@ -216,6 +222,12 @@ public class BackController {
ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getSendUnit())).stream() ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getSendUnit())).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收退回装备",ids,1);
messageService.add(messageBto); messageService.add(messageBto);
log.info("[退回模块]:接收并发起入库"); log.info("[退回模块]:接收并发起入库");
...@@ -289,11 +301,15 @@ public class BackController { ...@@ -289,11 +301,15 @@ public class BackController {
@ApiOperation(value = "上传发送方签发人", notes = "上传发送方签发人") @ApiOperation(value = "上传发送方签发人", notes = "上传发送方签发人")
@PostMapping(value = "/updateAgent") @PostMapping(value = "/updateAgent")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity updateAgent(@RequestBody AgentVo agentVo){ public ResponseEntity updateAgent(@RequestBody AgentVo agentVo){
TaskBto taskBto = taskService.get(agentVo.getId()); 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 allotBackBill = allotBackBillService.getOne(taskBto.getBillId());
allotBackBill.setAgent(agentVo.getName()); allotBackBill.setAgent(agentVo.getName());
allotBackBill.setSendUserbId(agentVo.getSendUserbId());
return ResponseEntity.ok(allotBackBillService.update(allotBackBill)); return ResponseEntity.ok(allotBackBillService.update(allotBackBill));
} }
} }
dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBackBill.java
浏览文件 @ 3588b8cb
...@@ -67,6 +67,9 @@ public class AllotBackBill { ...@@ -67,6 +67,9 @@ public class AllotBackBill {
@ApiModelProperty(value = "发件经办人id(A岗位)") @ApiModelProperty(value = "发件经办人id(A岗位)")
private Integer sendUseraId; private Integer sendUseraId;
@ApiModelProperty(value = "发件方审核人id(B岗位)")
private Integer sendUserbId;
@ApiModelProperty(value = "收件经办人id(A岗位)") @ApiModelProperty(value = "收件经办人id(A岗位)")
private Integer receiveUseraId; private Integer receiveUseraId;
......
dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AgentVo.java
浏览文件 @ 3588b8cb
package com.tykj.dev.device.allot.subject.vo; package com.tykj.dev.device.allot.subject.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -9,4 +10,7 @@ public class AgentVo { ...@@ -9,4 +10,7 @@ public class AgentVo {
private Integer id; private Integer id;
private String name; private String name;
@ApiModelProperty(value = "发件方(B岗位)")
private Integer sendUserbId;
} }
dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java
浏览文件 @ 3588b8cb
...@@ -288,7 +288,13 @@ public class DeviceApplyController { ...@@ -288,7 +288,13 @@ public class DeviceApplyController {
userIds.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getReceiveUnit())).stream() userIds.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getReceiveUnit())).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); messageService.add(messageBto);
log.info("[申请模块]:装备申请后发起配发"); log.info("[申请模块]:装备申请后发起配发");
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
......
dev-misc/src/main/java/com/tykj/dev/misc/base/CustomPage.java
浏览文件 @ 3588b8cb
...@@ -3,6 +3,7 @@ package com.tykj.dev.misc.base; ...@@ -3,6 +3,7 @@ package com.tykj.dev.misc.base;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
...@@ -64,14 +65,24 @@ public class CustomPage { ...@@ -64,14 +65,24 @@ public class CustomPage {
@JsonIgnore @JsonIgnore
public PageRequest getPageable() { public PageRequest getPageable() {
// if (orders.size() != 0) { if (orders.size() != 0) {
// List<Sort.Order> orders = new ArrayList<>(); List<Sort.Order> orders = new ArrayList<>();
// this.orders.stream().forEach(item -> this.orders.stream().forEach(item -> {
// orders.add(new Sort.Order(item.getDirection(), item.getCoulmn()))); if ("ASC".equals(item.getDirection())) {
// return PageRequest.of(getPage(), getLimit(), Sort.by(orders)); 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()); return PageRequest.of(getPage(), getLimit());
} }
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 3588b8cb
...@@ -344,7 +344,13 @@ public class RepairController { ...@@ -344,7 +344,13 @@ public class RepairController {
//添加出库白名单 //添加出库白名单
inputOutputDeviceService.addWhiteDevices(idList,userUtils.getCurrentUnitId(),1); 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); messageService.add(messageBto);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
return ResultUtil.success(repairBill2); return ResultUtil.success(repairBill2);
...@@ -561,11 +567,17 @@ public class RepairController { ...@@ -561,11 +567,17 @@ public class RepairController {
deviceRepairDetailService.update(repairDetail); 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()); List<Integer> ids = userPublicService.findOtherUser(userUtils.getCurrentUserId());
ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(repairBill.getSendUnit())).stream() ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(repairBill.getSendUnit())).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); messageService.add(messageBto);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
return ResultUtil.success("维修装备接收入库"); return ResultUtil.success("维修装备接收入库");
...@@ -776,6 +788,7 @@ public class RepairController { ...@@ -776,6 +788,7 @@ public class RepairController {
RepairDetail repairDetail = deviceRepairDetailService.getOne(d.getId()); RepairDetail repairDetail = deviceRepairDetailService.getOne(d.getId());
repairDetail.setRepairBackBillId(deviceRepairBackBillEntity1.getId()); repairDetail.setRepairBackBillId(deviceRepairBackBillEntity1.getId());
repairDetail.setRepairStatus(7); repairDetail.setRepairStatus(7);
repairDetail.setBackRemark(d.getRemark());
deviceRepairDetailService.update(repairDetail); deviceRepairDetailService.update(repairDetail);
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(d.getDeviceId()); DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(d.getDeviceId());
deviceLibraryEntity.setLifeStatus(4); deviceLibraryEntity.setLifeStatus(4);
...@@ -814,7 +827,13 @@ public class RepairController { ...@@ -814,7 +827,13 @@ public class RepairController {
ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit())).stream() ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit())).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); messageService.add(messageBto);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
return ResultUtil.success(repairBackBill1); return ResultUtil.success(repairBackBill1);
...@@ -1099,7 +1118,13 @@ public class RepairController { ...@@ -1099,7 +1118,13 @@ public class RepairController {
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .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); messageService.add(messageBto);
messageMap.keySet().forEach(integer -> { messageMap.keySet().forEach(integer -> {
List<Integer> integerList = new ArrayList<>(); List<Integer> integerList = new ArrayList<>();
...@@ -1548,7 +1573,7 @@ public class RepairController { ...@@ -1548,7 +1573,7 @@ public class RepairController {
deviceLibraryList.forEach(deviceLibrary -> { deviceLibraryList.forEach(deviceLibrary -> {
for (RepairDetail r : repairDetailList) { for (RepairDetail r : repairDetailList) {
if (r.getDeviceId().equals(deviceLibrary.getId())) { if (r.getDeviceId().equals(deviceLibrary.getId())) {
deviceLibrary.setRemark(r.getRemark()); deviceLibrary.setRemark(r.getBackRemark());
if (r.getPid()!=null) { if (r.getPid()!=null) {
deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus()); deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus());
} }
...@@ -1561,7 +1586,7 @@ public class RepairController { ...@@ -1561,7 +1586,7 @@ public class RepairController {
deviceLibraryList2.forEach(deviceLibrary -> { deviceLibraryList2.forEach(deviceLibrary -> {
for (RepairDetail r : repairDetailList) { for (RepairDetail r : repairDetailList) {
if (r.getDeviceId().equals(deviceLibrary.getId())) { if (r.getDeviceId().equals(deviceLibrary.getId())) {
deviceLibrary.setRemark(r.getRemark()); deviceLibrary.setRemark(r.getBackRemark());
if (r.getPid()!=null) { if (r.getPid()!=null) {
deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus()); deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus());
} }
...@@ -1784,21 +1809,31 @@ public class RepairController { ...@@ -1784,21 +1809,31 @@ public class RepairController {
@ApiOperation(value = "上传送修发送方签发人", notes = "上传发送方签发人") @ApiOperation(value = "上传送修发送方签发人", notes = "上传发送方签发人")
@PostMapping(value = "/updateSendAgent") @PostMapping(value = "/updateSendAgent")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity updateSendAgent(@RequestBody AgentBackVo agentBackVo){ public ResponseEntity updateSendAgent(@RequestBody AgentBackVo agentBackVo){
TaskBto taskBto = taskService.get(agentBackVo.getId()); 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 repairBill = deviceRepairBillService.getOne(taskBto.getBillId());
repairBill.setStartUserB(agentBackVo.getName()); repairBill.setStartUserB(agentBackVo.getName());
RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
repairSendBill.setStartUserbId(agentBackVo.getStartUserbId());
deviceRepairSendBillService.update(repairSendBill);
return ResponseEntity.ok(deviceRepairBillService.update(repairBill)); return ResponseEntity.ok(deviceRepairBillService.update(repairBill));
} }
@ApiOperation(value = "上传领取发送方签发人", notes = "上传发送方签发人") @ApiOperation(value = "上传领取发送方签发人", notes = "上传发送方签发人")
@PostMapping(value = "/updateBackAgent") @PostMapping(value = "/updateBackAgent")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity updateBackAgent(@RequestBody AgentBackVo agentBackVo){ public ResponseEntity updateBackAgent(@RequestBody AgentBackVo agentBackVo){
TaskBto taskBto = taskService.get(agentBackVo.getId()); 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 repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
repairBackBill.setAgent(agentBackVo.getName()); repairBackBill.setAgent(agentBackVo.getName());
repairBackBill.setStartUserbId(agentBackVo.getStartUserbId());
return ResponseEntity.ok(deviceRepairBackBillService.update(repairBackBill)); return ResponseEntity.ok(deviceRepairBackBillService.update(repairBackBill));
} }
} }
dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairDetail.java
浏览文件 @ 3588b8cb
...@@ -98,6 +98,11 @@ public class RepairDetail { ...@@ -98,6 +98,11 @@ public class RepairDetail {
*/ */
@ApiModelProperty(value = "维修备注") @ApiModelProperty(value = "维修备注")
private String remark; private String remark;
/**
* 维修领取备注
*/
@ApiModelProperty(value = "维修领取备注")
private String backRemark;
/** /**
* 已报废换新装备详情主键Id(null代表没有报废，0代表已报废还没有换新) * 已报废换新装备详情主键Id(null代表没有报废，0代表已报废还没有换新)
*/ */
......
dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/AgentBackVo.java
浏览文件 @ 3588b8cb
package com.tykj.dev.device.repair.subject.vo; package com.tykj.dev.device.repair.subject.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -9,4 +10,7 @@ public class AgentBackVo { ...@@ -9,4 +10,7 @@ public class AgentBackVo {
private Integer id; private Integer id;
private String name; private String name;
@ApiModelProperty(value = "退回确认人", example = "1")
private Integer startUserbId;
} }
dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java
浏览文件 @ 3588b8cb
...@@ -51,7 +51,7 @@ public class TaskController { ...@@ -51,7 +51,7 @@ public class TaskController {
@RequestMapping(method = RequestMethod.POST, value = "/manage/summary", produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(method = RequestMethod.POST, value = "/manage/summary", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity getTaskPage(@RequestBody TaskSelectVo taskSelectVo) { public ResponseEntity getTaskPage(@RequestBody TaskSelectVo taskSelectVo) {
List<TaskUserVo> taskUserVos = taskService.getManageList(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 = "可以通过这个接口查询业务") @ApiOperation(value = "业务跟踪待办列表查询", notes = "可以通过这个接口查询业务")
......
dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java
浏览文件 @ 3588b8cb
...@@ -20,6 +20,7 @@ import com.tykj.dev.device.user.cache.UserCache; ...@@ -20,6 +20,7 @@ import com.tykj.dev.device.user.cache.UserCache;
import com.tykj.dev.device.user.subject.entity.User; import com.tykj.dev.device.user.subject.entity.User;
import com.tykj.dev.device.user.subject.service.UserPublicService; import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.device.user.util.UserUtils; import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.CustomOrder;
import com.tykj.dev.misc.base.BusinessEnum; import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.StatusEnum; import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException; import com.tykj.dev.misc.exception.ApiException;
...@@ -377,25 +378,88 @@ public class TaskServiceImpl implements TaskService { ...@@ -377,25 +378,88 @@ public class TaskServiceImpl implements TaskService {
@Override @Override
public List<TaskUserVo> getList(TaskSelectVo taskSelectVo) { public List<TaskUserVo> getList(TaskSelectVo taskSelectVo) {
List<TaskUserVo> taskEntities = getTaskUserVoList(taskSelectVo); List<TaskUserVo> taskEntities = getTaskUserVoList(taskSelectVo);
if (taskSelectVo.getSelectNum()==2){
taskEntities = taskEntities.stream().sorted(Comparator.comparing(TaskUserVo::getTrackingTimeDate,Comparator.nullsFirst(Date::compareTo))).collect(Collectors.toList());
}
if (taskSelectVo.getSelectNum()==3){
taskEntities = taskEntities.stream().sorted(Comparator.comparing(TaskUserVo::getUserTimeDate,Comparator.nullsFirst(Date::compareTo))).collect(Collectors.toList());
}
if (taskSelectVo.getOrders().size() > 0) { if (taskSelectVo.getOrders().size() > 0) {
//根据vo待办和跟踪时间的查询顺序按顺序或降序排序输出 List<Comparator<TaskUserVo>> comparators = new ArrayList<>();
if (taskSelectVo.getSelectNum() == 2 && "trackingTime".equals(taskSelectVo.getOrders().get(0).getCoulmn())) { if (taskSelectVo.getOrders().size() > 0) {
if ("ASC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) { for (CustomOrder c:taskSelectVo.getOrders()) {
return taskUtils.orderByTrackingTimeDateAsc(taskEntities); if ("trackingTime".equals(c.getCoulmn())){
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTrackingTimeDate,Comparator.nullsFirst(Date::compareTo)));
}
else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTrackingTimeDate,Comparator.nullsFirst(Date::compareTo)).reversed());
}
}
else if ("userTime".equals(c.getCoulmn())){
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getUserTimeDate,Comparator.nullsFirst(Date::compareTo)));
}
else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getUserTimeDate,Comparator.nullsFirst(Date::compareTo)).reversed());
}
}
else if ("title".equals(c.getCoulmn())){
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTitle,Comparator.nullsFirst(String::compareTo)));
}
else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTitle,Comparator.nullsFirst(String::compareTo)).reversed());
}
}
else if ("startUnit".equals(c.getCoulmn())){
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStartUnit,Comparator.nullsFirst(String::compareTo)));
}
else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStartUnit,Comparator.nullsFirst(String::compareTo)).reversed());
}
}
else if ("status".equals(c.getCoulmn())){
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStatus,Comparator.nullsFirst(String::compareTo)));
}
else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStatus,Comparator.nullsFirst(String::compareTo)).reversed());
} }
if ("DESC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
return taskUtils.orderByTrackingTimeDateDesc(taskEntities);
} }
if (comparators.size()==1){
taskEntities = taskEntities.stream().sorted(comparators.get(0)).collect(Collectors.toList());
} }
if (taskSelectVo.getSelectNum() == 3 && "userTime".equals(taskSelectVo.getOrders().get(0).getCoulmn())) { else if(comparators.size()==2){
if ("ASC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) { taskEntities = taskEntities.stream().sorted(comparators.get(0).thenComparing(comparators.get(1))).collect(Collectors.toList());
return taskUtils.orderByUserTimeDateAsc(taskEntities);
} }
if ("DESC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) { else if(comparators.size()==3){
return taskUtils.orderByUserTimeDateDesc(taskEntities); taskEntities = taskEntities.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2))).collect(Collectors.toList());
} }
else if(comparators.size()==4){
taskEntities = taskEntities.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2)).thenComparing(comparators.get(3))).collect(Collectors.toList());
} }
} }
}
//根据vo待办和跟踪时间的查询顺序按顺序或降序排序输出
// if (taskSelectVo.getSelectNum() == 2 && "trackingTime".equals(taskSelectVo.getOrders().get(0).getCoulmn())) {
// if ("ASC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
// return taskUtils.orderByTrackingTimeDateAsc(taskEntities);
// }
// if ("DESC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
// return taskUtils.orderByTrackingTimeDateDesc(taskEntities);
// }
// }
// if (taskSelectVo.getSelectNum() == 3 && "userTime".equals(taskSelectVo.getOrders().get(0).getCoulmn())) {
// if ("ASC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
// return taskUtils.orderByUserTimeDateAsc(taskEntities);
// }
// if ("DESC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
// return taskUtils.orderByUserTimeDateDesc(taskEntities);
// }
// }
}
return taskEntities; return taskEntities;
} }
...@@ -419,14 +483,61 @@ public class TaskServiceImpl implements TaskService { ...@@ -419,14 +483,61 @@ public class TaskServiceImpl implements TaskService {
.collect(Collectors.toList()); .collect(Collectors.toList());
//判断是否需要按发起时间排序 //判断是否需要按发起时间排序
if (taskSelectVo.getOrders().size() > 0) { if (taskSelectVo.getOrders().size() > 0) {
if ("createTime".equals(taskSelectVo.getOrders().get(0).getCoulmn())) { List<Comparator<TaskUserVo>> comparators = new ArrayList<>();
if ("ASC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) { if (taskSelectVo.getOrders().size() > 0) {
return taskUtils.orderByCreateTimeAsc2(taskUserVos); for (CustomOrder c : taskSelectVo.getOrders()) {
} if ("createTime".equals(c.getCoulmn())) {
if ("DESC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) { if ("ASC".equals(c.getDirection().toString())) {
return taskUtils.orderByCreateTimeDesc2(taskUserVos); comparators.add(Comparator.comparing(TaskUserVo::getCreateTime, Comparator.nullsFirst(Date::compareTo)));
} } else if ("DESC".equals(c.getDirection().toString())) {
} comparators.add(Comparator.comparing(TaskUserVo::getCreateTime, Comparator.nullsFirst(Date::compareTo)).reversed());
}
} else if ("title".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTitle, Comparator.nullsFirst(String::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTitle, Comparator.nullsFirst(String::compareTo)).reversed());
}
} else if ("businessType".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getBusinessType, Comparator.nullsFirst(Integer::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getBusinessType, Comparator.nullsFirst(Integer::compareTo)).reversed());
}
} else if ("status".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStatus, Comparator.nullsFirst(String::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStatus, Comparator.nullsFirst(String::compareTo)).reversed());
}
} else if ("startUnit".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStartUnit, Comparator.nullsFirst(String::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStartUnit, Comparator.nullsFirst(String::compareTo)).reversed());
}
}
if (comparators.size() == 1) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0)).collect(Collectors.toList());
} else if (comparators.size() == 2) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1))).collect(Collectors.toList());
} else if (comparators.size() == 3) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2))).collect(Collectors.toList());
} else if (comparators.size() == 4) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2)).thenComparing(comparators.get(3))).collect(Collectors.toList());
} else if (comparators.size() == 5) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2)).thenComparing(comparators.get(3)).thenComparing(comparators.get(4))).collect(Collectors.toList());
}
}
}
// if ("createTime".equals(taskSelectVo.getOrders().get(0).getCoulmn())) {
// if ("ASC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
// return taskUtils.orderByCreateTimeAsc2(taskUserVos);
// }
// if ("DESC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
// return taskUtils.orderByCreateTimeDesc2(taskUserVos);
// }
// }
} }
return taskUserVos; return taskUserVos;
} }
...@@ -490,14 +601,54 @@ public class TaskServiceImpl implements TaskService { ...@@ -490,14 +601,54 @@ public class TaskServiceImpl implements TaskService {
taskUserVo.setIsTop(1); taskUserVo.setIsTop(1);
} }
} }
taskUserVos = taskUserVos.stream().sorted(Comparator.comparing(TaskUserVo::getCreateTime,Comparator.nullsFirst(Date::compareTo)).reversed()).collect(Collectors.toList());
//判断是否需要按发起时间排序 //判断是否需要按发起时间排序
if (!taskSelectVo.getOrders().isEmpty()) { if (!taskSelectVo.getOrders().isEmpty()) {
if ("createTime".equals(taskSelectVo.getOrders().get(0).getCoulmn())) { List<Comparator<TaskUserVo>> comparators = new ArrayList<>();
if ("ASC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) { if (taskSelectVo.getOrders().size() > 0) {
return taskUtils.orderByCreateTimeAsc2(taskUserVos); for (CustomOrder c : taskSelectVo.getOrders()) {
if ("createTime".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getCreateTime, Comparator.nullsFirst(Date::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getCreateTime, Comparator.nullsFirst(Date::compareTo)).reversed());
}
} else if ("title".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTitle, Comparator.nullsFirst(String::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getTitle, Comparator.nullsFirst(String::compareTo)).reversed());
}
} else if ("businessType".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getBusinessType, Comparator.nullsFirst(Integer::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getBusinessType, Comparator.nullsFirst(Integer::compareTo)).reversed());
}
} else if ("status".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStatus, Comparator.nullsFirst(String::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStatus, Comparator.nullsFirst(String::compareTo)).reversed());
}
} else if ("startUnit".equals(c.getCoulmn())) {
if ("ASC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStartUnit, Comparator.nullsFirst(String::compareTo)));
} else if ("DESC".equals(c.getDirection().toString())) {
comparators.add(Comparator.comparing(TaskUserVo::getStartUnit, Comparator.nullsFirst(String::compareTo)).reversed());
}
}
if (comparators.size() == 1) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0)).collect(Collectors.toList());
} else if (comparators.size() == 2) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1))).collect(Collectors.toList());
} else if (comparators.size() == 3) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2))).collect(Collectors.toList());
} else if (comparators.size() == 4) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2)).thenComparing(comparators.get(3))).collect(Collectors.toList());
} else if (comparators.size() == 5) {
taskUserVos = taskUserVos.stream().sorted(comparators.get(0).thenComparing(comparators.get(1)).thenComparing(comparators.get(2)).thenComparing(comparators.get(3)).thenComparing(comparators.get(4))).collect(Collectors.toList());
} }
if ("DESC".equals(taskSelectVo.getOrders().get(0).getDirection().toString())) {
return taskUtils.orderByCreateTimeDesc2(taskUserVos);
} }
} }
} }
...@@ -663,7 +814,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -663,7 +814,7 @@ public class TaskServiceImpl implements TaskService {
boolean userConfirm = userId.equals(taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint())); boolean userConfirm = userId.equals(taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint()));
boolean noUserHandle = taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint()) == 0; boolean noUserHandle = taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint()) == 0;
boolean belongUnit = taskBto.getOwnUnit().equals(userUtils.getCurrentUnitId()); boolean belongUnit = taskBto.getOwnUnit().equals(userUtils.getCurrentUnitId());
boolean isCountry = taskSelectVo.getType()==1?(taskBto.getCustomInfo()==null|| !"country".equals(taskBto.getCustomInfo())):(taskBto.getCustomInfo()!=null&& "country".equals(taskBto.getCustomInfo())); boolean isCountry = taskSelectVo.getType() == null || (taskSelectVo.getType() == 1 ? (taskBto.getCustomInfo() == null || !"country".equals(taskBto.getCustomInfo())) : (taskBto.getCustomInfo() != null && "country".equals(taskBto.getCustomInfo())));
return involveExists && pointExists && (userConfirm || (noUserHandle && belongUnit)) && isCountry; return involveExists && pointExists && (userConfirm || (noUserHandle && belongUnit)) && isCountry;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论