|
@@ -222,7 +222,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
|
|
.setModifyusername(currentUser.getName())
|
|
.setModifyusername(currentUser.getName())
|
|
.setModifyuserid(currentUser.getId())
|
|
.setModifyuserid(currentUser.getId())
|
|
.setModifydate(newDate)
|
|
.setModifydate(newDate)
|
|
- .setPlannedstatus("unlocked");
|
|
|
|
|
|
+ .setPlannedstatus(PlannedStatusEnum.UNLOCKED.getValue());
|
|
|
|
|
|
collect.forEach(item ->{
|
|
collect.forEach(item ->{
|
|
item.setId(SecurityUtil.getUUID())
|
|
item.setId(SecurityUtil.getUUID())
|
|
@@ -452,7 +452,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
|
|
BeanUtils.copyProperties( maintenanceSchedule,equMaintenanceTask);
|
|
BeanUtils.copyProperties( maintenanceSchedule,equMaintenanceTask);
|
|
BeanUtils.copyProperties( maintenancePart,equMaintenanceTask);
|
|
BeanUtils.copyProperties( maintenancePart,equMaintenanceTask);
|
|
equMaintenanceTask.setId(SecurityUtil.getUUID())
|
|
equMaintenanceTask.setId(SecurityUtil.getUUID())
|
|
- .setMonth(month<10?"0"+month:String.valueOf(month))
|
|
|
|
|
|
+ .setMonth(month.toString())
|
|
.setCreateuserid(currentUser.getId())
|
|
.setCreateuserid(currentUser.getId())
|
|
.setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
|
|
.setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
|
|
.setCreateusername(currentUser.getName())
|
|
.setCreateusername(currentUser.getName())
|
|
@@ -552,7 +552,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
|
|
.setPlantype("BY")
|
|
.setPlantype("BY")
|
|
.setSpecialequipment(aspCheckItem.getSource())
|
|
.setSpecialequipment(aspCheckItem.getSource())
|
|
.setObjecttype("1")
|
|
.setObjecttype("1")
|
|
- .setSpecification(aspCheckItem.getDeleted())
|
|
|
|
|
|
+ .setSpecification(aspCheckItem.getDevicemodel())
|
|
.setWorkshop(aspCheckItem.getUsedeptname())
|
|
.setWorkshop(aspCheckItem.getUsedeptname())
|
|
.setWorkshopid(aspCheckItem.getUsedeptid())
|
|
.setWorkshopid(aspCheckItem.getUsedeptid())
|
|
.setPlannedstatus("unlocked")
|
|
.setPlannedstatus("unlocked")
|