Skip to content

D
device-back
提交 780ebfd5 authored 作者: zjm's avatar zjm
浏览文件
操作

fix(退役，报废模块): 修改了对应的任务标题格式，以及阅知模块

修改了对应的任务标题格式，以及阅知模块
上级 27384a91
显示空白字符变更
内嵌 并排
正在显示 包含 15 行增加 和 16 行删除
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java
浏览文件 @ 780ebfd5
...@@ -93,7 +93,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -93,7 +93,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
} }
} }
); );
String title="退役型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+count.get()+"件"; String title="["+decommissioningOrderOutData.getReceiveUnit()+"]型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+count.get()+"件";
if (decommissioningOrderOutData.getTaskId()==null){ if (decommissioningOrderOutData.getTaskId()==null){
deviceDecommissioningDetail = decommissioningOrderOutData.toDeviceDecommissioningDetail(); deviceDecommissioningDetail = decommissioningOrderOutData.toDeviceDecommissioningDetail();
if (decommissioningOrderOutData.getApplyId()!=null) { if (decommissioningOrderOutData.getApplyId()!=null) {
...@@ -106,7 +106,6 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -106,7 +106,6 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId()); deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
taskBto= sendDraftTask(units.getUnitId(), deviceDecommissioningDetail.getId(),userId,title); taskBto= sendDraftTask(units.getUnitId(), deviceDecommissioningDetail.getId(),userId,title);
deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus()); deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"保存退役任务草稿",gainThisUser(userId,units.getUnitId())));
}else { }else {
taskBto=taskService.get(decommissioningOrderOutData.getTaskId()); taskBto=taskService.get(decommissioningOrderOutData.getTaskId());
deviceDecommissioningDetail = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId()); deviceDecommissioningDetail = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
...@@ -162,18 +161,20 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -162,18 +161,20 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
if (decommissioningOrderOutData.getSenderUserB()!=null){ if (decommissioningOrderOutData.getSenderUserB()!=null){
deviceDecommissioningDetail.setSenderUserB(decommissioningOrderOutData.getSenderUserB()); deviceDecommissioningDetail.setSenderUserB(decommissioningOrderOutData.getSenderUserB());
} }
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"发起退役任务,待上传回执单据",gainThisUser(userId,units.getUnitId()))); // addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"发起退役任务,待上传回执单据",gainThisUser(userId,units.getUnitId())));
}else { }else {
String title="退役型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+count.get()+"件"; String title="["+decommissioningOrderOutData.getReceiveUnit()+"]型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+count.get()+"件";
deviceDecommissioningDetail = decommissioningOrderOutData.toDeviceDecommissioningDetail(); deviceDecommissioningDetail = decommissioningOrderOutData.toDeviceDecommissioningDetail();
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail); deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
taskBto= sendOutSuperior(units.getUnitId(), deviceDecommissioningDetail.getId(),userId,title); taskBto= sendOutSuperior(units.getUnitId(), deviceDecommissioningDetail.getId(),userId,title);
addMessage(new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "发起退役任务,待上传回执单据", gainThisUser(user.getUserId(), user.getUnitsId()))); // addMessage(new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "发起退役任务,待上传回执单据", gainThisUser(user.getUserId(), user.getUnitsId())));
deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId()); deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus()); deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
deviceDecommissioningDetail.setSendUserbId(decommissioningOrderOutData.getSendUserbId()); deviceDecommissioningDetail.setSendUserbId(decommissioningOrderOutData.getSendUserbId());
deviceDecommissioningDetail.setSenderUserB(decommissioningOrderOutData.getSenderUserB()); deviceDecommissioningDetail.setSenderUserB(decommissioningOrderOutData.getSenderUserB());
} }
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起退役任务:"+MessageFormatUtil.spellTwoWicket(decommissioningOrderOutData.getSendUnit(),decommissioningOrderOutData.getReceiveUnit()),gainThisUser(userId,units.getUnitId())));
deviceDecommissioningDetail.setReceiveUnit(decommissioningOrderOutData.getReceiveUnit()); deviceDecommissioningDetail.setReceiveUnit(decommissioningOrderOutData.getReceiveUnit());
deviceDecommissioningDetail.setReceiveUnitId(decommissioningOrderOutData.getReceiveUnitId()); deviceDecommissioningDetail.setReceiveUnitId(decommissioningOrderOutData.getReceiveUnitId());
deviceDecommissioningDetail.setLeftSignatureId(decommissioningOrderOutData.getLeftSignatureId()); deviceDecommissioningDetail.setLeftSignatureId(decommissioningOrderOutData.getLeftSignatureId());
...@@ -245,7 +246,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -245,7 +246,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceDecommissioningDetail.getReceiveUnit(),0,seqNumbers); deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceDecommissioningDetail.getReceiveUnit(),0,seqNumbers);
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail); deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"退役任务回执单据上传成功任务结束",gainThisUser(user.getUserId(),user.getUnitsId()))); addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"退役任务回执单据上传成功任务结束",gainThisUser(user.getUserId(),user.getUnitsId())));
devLogAdd(seqNumbers,"退役任务完成,状态转化为已退役",storageDeviceDevommissiong.getUserId(),taskBto.getId()); devLogAdd(seqNumbers,"办结退役任务:"+MessageFormatUtil.spellTwoWicket(deviceDecommissioningDetail.getSendUnit(),deviceDecommissioningDetail.getReceiveUnit()),storageDeviceDevommissiong.getUserId(),taskBto.getId());
} }
...@@ -264,7 +265,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -264,7 +265,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
} }
); );
if (orderOutData.getTaskId()==null){ if (orderOutData.getTaskId()==null){
String title="退役型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+count.get()+"件"; String title="["+orderOutData.getReceiveUnit()+"]型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+count.get()+"件";
deviceDecommissioningDetail = orderOutData.toDeviceDecommissioningDetail(); deviceDecommissioningDetail = orderOutData.toDeviceDecommissioningDetail();
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail); deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId()); deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java
浏览文件 @ 780ebfd5
...@@ -95,8 +95,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService { ...@@ -95,8 +95,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
scrap.setId(scrap1.get().getId()); scrap.setId(scrap1.get().getId());
} }
} }
String title="报废型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+seqNumbers.size()+"件"; String title="["+scrapOrderOutData.getReceiveUnit()+"]型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+seqNumbers.size()+"件";
scrapService.saveScrap(scrap); scrapService.saveScrap(scrap);
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId()); scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
taskBto=sendDraftTask(units.getUnitId(), scrap.getId(), userId,title); taskBto=sendDraftTask(units.getUnitId(), scrap.getId(), userId,title);
...@@ -150,20 +149,19 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService { ...@@ -150,20 +149,19 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums); TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
scrap=scrapService.findScrap(taskBto.getBillId()); scrap=scrapService.findScrap(taskBto.getBillId());
taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2222,"country"); taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2222,"country");
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
scrap.setScrapStatus(taskBto.getBillStatus()); scrap.setScrapStatus(taskBto.getBillStatus());
scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit()); scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId()); scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
}else { }else {
scrap = scrapOrderOutData.toScrap(); scrap = scrapOrderOutData.toScrap();
scrapService.saveScrap(scrap); scrapService.saveScrap(scrap);
String title="报废型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+seqNumbers.size()+"件"; String title="["+scrapOrderOutData.getReceiveUnit()+"]型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+seqNumbers.size()+"件";
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId()); scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
taskBto= sendOutSuperior(units.getUnitId(), scrap.getId(),userId,title); taskBto= sendOutSuperior(units.getUnitId(), scrap.getId(),userId,title);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
scrap.setScrapStatus(taskBto.getBillStatus()); scrap.setScrapStatus(taskBto.getBillStatus());
} }
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务:"+MessageFormatUtil.spellTwoWicket(scrapOrderOutData.getSendUnit(),scrapOrderOutData.getReceiveUnit()),gainThisUser(user.getUserId(),user.getUnitsId())));
scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit()); scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId()); scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
scrap.setLeftSignatureId(scrapOrderOutData.getLeftSignatureId()); scrap.setLeftSignatureId(scrapOrderOutData.getLeftSignatureId());
...@@ -232,7 +230,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService { ...@@ -232,7 +230,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SCRAP_I.id,scrap.getReceiveUnit(),0,seqNumbers); deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SCRAP_I.id,scrap.getReceiveUnit(),0,seqNumbers);
scrapService.saveScrap(scrap); scrapService.saveScrap(scrap);
devLogAdd(seqNumbers,"报废任务完成,状态转化为已报废",user.getUserId(),taskBto.getId()); devLogAdd(seqNumbers,"报废任务完成,状态转化为已报废",user.getUserId(),taskBto.getId());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"报废单据上传，任务结束",gainThisUser(user.getUserId(),user.getUnitsId()))); addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"办结报废业务:"+MessageFormatUtil.spellTwoWicket(scrap.getSendUnit(),scrap.getReceiveUnit()),gainThisUser(user.getUserId(),user.getUnitsId())));
} }
@Override @Override
...@@ -252,7 +250,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService { ...@@ -252,7 +250,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
if (scrapOrderOutData.getTaskId()==null){ if (scrapOrderOutData.getTaskId()==null){
scrap = scrapOrderOutData.toScrap(); scrap = scrapOrderOutData.toScrap();
scrapService.saveScrap(scrap); scrapService.saveScrap(scrap);
String title="报废型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+seqNumbers.size()+"件"; String title="["+scrapOrderOutData.getReceiveUnit()+"]型号为"+ StringSplitUtil.stringListToString(scriptSaveVos.stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的设备共"+seqNumbers.size()+"件";
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId()); scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
TaskBto taskBto= sealOfAuditTask(units.getUnitId(), scrap.getId(),user.getUserId(),title); TaskBto taskBto= sealOfAuditTask(units.getUnitId(), scrap.getId(),user.getUserId(),title);
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ 780ebfd5
...@@ -1090,9 +1090,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService { ...@@ -1090,9 +1090,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
log.info("更新数据装备以及所属单位-{}", libraries.size()); log.info("更新数据装备以及所属单位-{}", libraries.size());
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if (units.getLevel() == 2) { if (units.getLevel() == 2) {
deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SEND_BACK.id, deviceRepelDetail.getSendUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds())); deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SEND_BACK.id, unitsService.findById(deviceRepelDetail.getSendUnitId()).getName(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
} else { } else {
deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getSendUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds())); deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), unitsService.findById(deviceRepelDetail.getSendUnitId()).getName(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
log.info("更新数据装备以及所属单位{}", System.currentTimeMillis() - time); log.info("更新数据装备以及所属单位{}", System.currentTimeMillis() - time);
} }
devLogAdd(libraries, "省本级清退，把装备转变为待清退", userId, taskId); devLogAdd(libraries, "省本级清退，把装备转变为待清退", userId, taskId);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论