feat: 设备优化

lh_dev_fifo^2
chenhc 3 months ago
parent 0a6811ded7
commit 47c2d5eb33

@ -107,6 +107,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
.setCreateDeptCode(user.getLocDeptCode()).setCreateDeptName(user.getDeptName()) .setCreateDeptCode(user.getLocDeptCode()).setCreateDeptName(user.getDeptName())
.setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag()) .setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag())
.setRepairUserName(param.getRepairUserName()) .setRepairUserName(param.getRepairUserName())
.setUpdateTime(LocalDateTime.now())
.setRepairUserId(param.getRepairUserId()) .setRepairUserId(param.getRepairUserId())
.setRepairUserPhone(param.getRepairUserPhone()) .setRepairUserPhone(param.getRepairUserPhone())
.setRepairDeptCode(param.getRepairDeptCode()) .setRepairDeptCode(param.getRepairDeptCode())
@ -125,6 +126,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
.set(DeviceRepairApplyDetailEntity::getConfirmDeptCode, user.getLocDeptCode()) .set(DeviceRepairApplyDetailEntity::getConfirmDeptCode, user.getLocDeptCode())
.set(DeviceRepairApplyDetailEntity::getConfirmDeptName, user.getDeptName()) .set(DeviceRepairApplyDetailEntity::getConfirmDeptName, user.getDeptName())
.set(DeviceRepairApplyDetailEntity::getDiagnosisLivePath, param.getDiagnosisLivePath()) .set(DeviceRepairApplyDetailEntity::getDiagnosisLivePath, param.getDiagnosisLivePath())
.set(DeviceRepairApplyDetailEntity::getUpdateTime,LocalDateTime.now())
.set(DeviceRepairApplyDetailEntity::getConfirmTime, now) .set(DeviceRepairApplyDetailEntity::getConfirmTime, now)
.set(!param.getRepairFlag(), DeviceRepairApplyDetailEntity::getFinishTime, now) .set(!param.getRepairFlag(), DeviceRepairApplyDetailEntity::getFinishTime, now)
.eq(DeviceRepairApplyDetailEntity::getApplyId, param.getApplyId()) .eq(DeviceRepairApplyDetailEntity::getApplyId, param.getApplyId())
@ -138,6 +140,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
//根据设备号和报修单标识更新巡检任务明细 //根据设备号和报修单标识更新巡检任务明细
deviceCheckDetailService.update(Wrappers.lambdaUpdate(DeviceCheckDetailEntity.class) deviceCheckDetailService.update(Wrappers.lambdaUpdate(DeviceCheckDetailEntity.class)
.set(DeviceCheckDetailEntity::getRepairId, repairId) .set(DeviceCheckDetailEntity::getRepairId, repairId)
.set(DeviceCheckDetailEntity::getUpdateTime,LocalDateTime.now())
.eq(DeviceCheckDetailEntity::getApplyId, param.getApplyId()) .eq(DeviceCheckDetailEntity::getApplyId, param.getApplyId())
.eq(DeviceCheckDetailEntity::getDeviceCode, param.getDeviceCode()) .eq(DeviceCheckDetailEntity::getDeviceCode, param.getDeviceCode())
); );
@ -158,10 +161,12 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
if (CollectionUtil.isNotEmpty(list)){ if (CollectionUtil.isNotEmpty(list)){
deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class) deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
.set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING) .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING)
.set(DeviceRepairApplyEntity::getUpdateTime,LocalDateTime.now())
.eq(DeviceRepairApplyEntity::getId, applyId)); .eq(DeviceRepairApplyEntity::getId, applyId));
}else { }else {
deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class) deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
.set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.FINISH) .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.FINISH)
.set(DeviceRepairApplyEntity::getUpdateTime,LocalDateTime.now())
.eq(DeviceRepairApplyEntity::getId, applyId)); .eq(DeviceRepairApplyEntity::getId, applyId));
} }
} }

@ -161,6 +161,7 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
super.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class) super.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
.setSql("finishCount = finishCount + 1") .setSql("finishCount = finishCount + 1")
.eq(DeviceRepairApplyEntity::getId, applyId) .eq(DeviceRepairApplyEntity::getId, applyId)
.set(DeviceRepairApplyEntity::getUpdateTime,LocalDateTime.now())
.eq(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING) .eq(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING)
.last("and finishCount + 1 <= deviceCount") .last("and finishCount + 1 <= deviceCount")
); );

Loading…
Cancel
Save