Commit db61564e authored by 鲁鸿波's avatar 鲁鸿波

作业开始时间修改

parent 502c834f
...@@ -629,9 +629,9 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan ...@@ -629,9 +629,9 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
//如果为安全许可证申请 //如果为安全许可证申请
if (WorkPlanStatusEnum.PERMIT.getValue().equals(workStatus) || "99".equals(workStatus)) { if (WorkPlanStatusEnum.PERMIT.getValue().equals(workStatus) || "99".equals(workStatus)) {
//更新实际开始时间 //更新实际开始时间
if (null != id) { /*if (null != id) {
tHazardWorkPlanDao.updateActualStartTime(id); tHazardWorkPlanDao.updateActualStartTime(id);
} }*/
SysDictData escalatedLevel = sysDictDataService.getDictTypeDetail(tHazardWorkPlan.getEscalatedLevel(), null, null); SysDictData escalatedLevel = sysDictDataService.getDictTypeDetail(tHazardWorkPlan.getEscalatedLevel(), null, null);
String escalatedLevelValue = escalatedLevel.getDictKey(); String escalatedLevelValue = escalatedLevel.getDictKey();
map.put("level", escalatedLevelValue); map.put("level", escalatedLevelValue);
...@@ -646,13 +646,12 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan ...@@ -646,13 +646,12 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
//如果为技术交底 //如果为技术交底
if (WorkPlanStatusEnum.TECHNICAL_EXPLANATION.getValue().equals(workStatus)) { if (WorkPlanStatusEnum.TECHNICAL_EXPLANATION.getValue().equals(workStatus)) {
//更新实际开始时间
if (null != id) {
tHazardWorkPlanDao.updateActualStartTime(id);
}
//流转到安全许可证关闭 //流转到安全许可证关闭
executionWorkProcess(id, tHazardWorkPlanDTO.getTaskId(), WorkPlanStatusEnum.TO_BE_CLOSED.getValue(), tHazardWorkPlanDTO.getMap(), tHazardWorkPlan); executionWorkProcess(id, tHazardWorkPlanDTO.getTaskId(), WorkPlanStatusEnum.TO_BE_CLOSED.getValue(), tHazardWorkPlanDTO.getMap(), tHazardWorkPlan);
//THazardWorkPlan updWorkPlan = new THazardWorkPlan();
//updWorkPlan.setId(id);
//updWorkPlan.setHazardLicensePassTime(new Date());
//this.updateById(updWorkPlan);
} }
//如果为安全许可证关闭 //如果为安全许可证关闭
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment