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 dc795311..e7250d05 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -895,7 +895,8 @@ public class AppHotworkCfdController extends BaseController { pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("CONFIRM_CONTENT", pd.get("APPROVAL_CONTENT")); + pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); + pd2.put("CONFIRM_OTHER_CONTENT", pd.get("APPROVAL_CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); hotworkCfdService.edit(pd2); log.put("ACTION", "作业单位通过"); @@ -1096,6 +1097,14 @@ public class AppHotworkCfdController extends BaseController { case "7"://班长 if (files != null && files.length > 0) { + PageData condition = new PageData(); + condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID")); + List acceptUsers = hotworkAcceptUserCfdService.listAll(condition); + if (acceptUsers.size() <= 0){ + map.put("code","9999"); + map.put("errorMessage","接受交底人未签字"); + return map; + } MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -1198,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")); @@ -1847,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); // 保存安全项信息 @@ -1868,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/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java index 523de699..b1c821aa 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java @@ -26,5 +26,7 @@ public interface BusHotworkCfdExamineMapper { List findByCondition(PageData condition); List safetylistPage(Page page); + + List listAllByHotWorkId(PageData condition); } 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 2916c7c2..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); } @@ -284,7 +285,8 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { hotworkCfdMapper.delete(pd); PageData condition = new PageData(); condition.put("HOTWORK_ID", pd.getString("HOTWORK_ID")); - List oldEntity = busHotworkCfdExamineMapper.listAll(condition); +// List oldEntity = busHotworkCfdExamineMapper.listAll(condition); + List oldEntity = busHotworkCfdExamineMapper.listAllByHotWorkId(condition); for (PageData entity : oldEntity) { entity.put("IS_DELETE", "1"); busHotworkCfdExamineMapper.edit(entity); diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml index 7df5eee7..820319df 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml @@ -308,5 +308,9 @@ ORDER BY f.APPLY_STATUS,f.CREATTIME DESC + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index 34b7d9de..a4f28db3 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -88,7 +88,8 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, - f.ANALYZE_TIME + f.ANALYZE_TIME, + f.CONFIRM_OTHER_CONTENT @@ -167,7 +168,8 @@ ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, ACCEPT_CONFESS_USER_SIGNER_TIME, - ANALYZE_TIME + ANALYZE_TIME, + CONFIRM_OTHER_CONTENT @@ -246,7 +248,8 @@ #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, #{ACCEPT_CONFESS_USER_SIGNER_TIME}, - #{ANALYZE_TIME} + #{ANALYZE_TIME}, + #{CONFIRM_OTHER_CONTENT} @@ -355,6 +358,7 @@ ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT}, HOTWORK_ID = HOTWORK_ID where HOTWORK_ID = #{HOTWORK_ID} @@ -542,6 +546,7 @@ f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, f.HOTWORK_ID, + f.CONFIRM_OTHER_CONTENT, ad.NAME as APPLY_DEPARTMENT_NAME, au.NAME as APPLY_USER_NAME,