提交 50552adb authored 作者: zhoushaopan's avatar zhoushaopan

fix(维修模块): 省维修设备,维修完成后履历不对

省维修设备,维修完成后履历不对
上级 078c6ffa
...@@ -608,7 +608,7 @@ public class RepairController { ...@@ -608,7 +608,7 @@ public class RepairController {
// DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修", null, null); // DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修", null, null);
// DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修", null, null); // DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修", null, null);
DeviceLogDto deviceLogDto; DeviceLogDto deviceLogDto;
if (repairBillSaveVo.getLeftSignatureId() != null && "".equals(repairBillSaveVo.getLeftSignatureId())){ if (repairBillSaveVo.getLeftSignatureId() != null && !"".equals(repairBillSaveVo.getLeftSignatureId())){
//说明是签章出库 //说明是签章出库
deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修(签章出库)", null, null,saveEntity.getId()); deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修(签章出库)", null, null,saveEntity.getId());
}else { }else {
...@@ -1593,10 +1593,12 @@ public class RepairController { ...@@ -1593,10 +1593,12 @@ public class RepairController {
//各单位阅知map //各单位阅知map
Map<Integer, List<Integer>> messageMap = new HashMap<>(); Map<Integer, List<Integer>> messageMap = new HashMap<>();
// List<DeviceLibrary> deviceLibraries = new ArrayList<>(); // List<DeviceLibrary> deviceLibraries = new ArrayList<>();
Integer unitId1 = userUtils.getCurrentUnitId();
for (Integer id : repairStatusChangeVo.getId()) { for (Integer id : repairStatusChangeVo.getId()) {
//获取维修详情单 //获取维修详情单
RepairDetail repairDetail1 = deviceRepairDetailService.getOne(id); RepairDetail repairDetail1 = deviceRepairDetailService.getOne(id);
if (repairDetail1.getDeviceRepairBillId() == 0) { // if (repairDetail1.getDeviceRepairBillId() == 0) {
if (repairDetail1.getOwnUnitId().equals(unitId1)) {
//已领取入库(本级) //已领取入库(本级)
repairDetail1.setRepairStatus(5); repairDetail1.setRepairStatus(5);
deviceRepairDetailService.update(repairDetail1); deviceRepairDetailService.update(repairDetail1);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论