diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 5bb9fc6a..e7250d05 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1207,6 +1207,13 @@ public class AppHotworkCfdController extends BaseController { //sendMessageUtil.sendMessages(mes, paramsList); } break; + case "-1.5": {//确认 + log.put("ACTION", "作业负责人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + break; + } case "-2": {//确认打回 log.put("ACTION", "作业单位打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); @@ -1856,6 +1863,7 @@ public class AppHotworkCfdController extends BaseController { condition.put("CORPINFO_ID",request.get("CORPINFO_ID")); condition.put("TYPE","2"); condition.put("APPROVAL_STATUS","1"); + condition.put("APPROVAL_CONTENT", request.getString("APPROVAL_CONTENT")); hotworkCfdService.confessApproval(condition, files); // 保存安全项信息 @@ -1877,6 +1885,8 @@ public class AppHotworkCfdController extends BaseController { measures.put("CONFIRM_NAME", request.get("ACTION_USER")); hotworkToMeasuresCfdService.save(measures); } + + // 保存其他审批意见 response.put("result", "success"); return response; } catch (Exception e) { diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java index 3d6e88f4..96918bc1 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -232,6 +232,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { entity.put("APPROVAL_STATUS", request.getString("APPROVAL_STATUS")); entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID"))); entity.put("APPROVAL_SIGNATURE_TIME", DateUtil.getTime()); + entity.put("APPROVAL_CONTENT",request.getString("APPROVAL_CONTENT")); busHotworkCfdExamineMapper.edit(entity); }