From 1fb21ef912c23989008bae908a299c64fc57e551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 29 May 2025 18:13:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=90=86=E4=BA=BA=E5=91=98=E5=85=A5?= =?UTF-8?q?=E5=9C=BA=E5=87=BA=E5=9C=BA=E5=AE=A1=E6=A0=B8=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/listener/StageEndListener.java | 8 + .../bonus/flowable/mapper/BusinessMapper.java | 41 +++ .../flowable/service/BusinessService.java | 12 + .../service/impl/BusinessServiceImpl.java | 33 +++ .../main/resources/mapper/BusinessMapper.xml | 32 +++ .../controller/SupervisionUnitController.java | 54 ++++ .../project/domain/SupervisorPerson.java | 12 + .../project/mapper/SupervisionUnitMapper.java | 34 ++- .../service/SupervisionUnitService.java | 21 ++ .../impl/SupervisionUnitServiceImpl.java | 74 ++++++ .../mapper/system/SupervisionUnitMapper.xml | 250 +++++++++++++++++- 11 files changed, 566 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java index 26d4db7..edc64be 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java @@ -252,6 +252,14 @@ public class StageEndListener implements ExecutionListener, ApplicationContextAw //修改延期申请状态 businessService.updateExtensionApplicationByUuid(id, statusType,""); break; + case "18": + //监理入场申请状态 + businessService.updateSupPersonIntoStatusByUuid(id, statusType); + break; + case "19": + //监理出场申请状态 + businessService.updateSupPersonOutStatusByUuid(id, statusType); + break; default: } } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java index c1a77a1..b8d5bfb 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java @@ -545,4 +545,45 @@ public interface BusinessMapper { String getCheckTree(String taskId); void updateAuditUserInfo(ConfigurationVo add); + + /** + * 修改监理中途入场任务id流程实例id 审核状态 + * @param uuid + * @param taskId + * @param processInstanceId + * @param enterStatus + * @return + */ + Integer updateSupPersonStatus(@Param("uuid") String uuid, @Param("taskId")String taskId,@Param("processInstanceId") String processInstanceId,@Param("enterStatus") String enterStatus); + /** + * 修改监理中途出场任务id流程实例id 审核状态 + * @param uuid + * @param taskId + * @param processInstanceId + * @param enterStatus + * @return + */ + Integer updateSupPersonOutStatus(@Param("uuid") String uuid, @Param("taskId")String taskId, @Param("processInstanceId")String processInstanceId, @Param("enterStatus") String enterStatus); + + /** + * 修改用户状态 + * @param uuid + */ + void updateSupPersonSysUserStatus(String uuid); + + /** + * 修改监理中途入场审核状态 + * @param uuid + * @param statusType + * @return + */ + int updateSupPersonIntoStatusByUuid(@Param("uuid")String uuid, @Param("statusType")String statusType); + + /** + * 修改监理中途出场审核状态 + * @param uuid + * @param statusType + * @return + */ + int updateSupPersonOutStatusByUuid(@Param("uuid")String uuid, @Param("statusType")String statusType); } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java index 47d677f..21ea84d 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java @@ -204,4 +204,16 @@ public interface BusinessService { void updateExtensionApplicationByUuid(String uuid,String statusType,String rejectReason); List checkHistory(RequestEntity entity); + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + int updateSupPersonIntoStatusByUuid(String uuid, String statusType); + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + int updateSupPersonOutStatusByUuid(String uuid, String statusType); } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index 37ccc8e..116b629 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -790,6 +790,12 @@ public class BusinessServiceImpl implements BusinessService { case "17": //延期申请---修改任务ID和流程实例ID return mapper.updateExtensionApplicationStatus(uuid, taskId, processInstanceId, enterStatus); + case "18": + //监理施工中入场审批---修改任务ID和流程实例ID + return mapper.updateSupPersonStatus(uuid, taskId, processInstanceId, enterStatus); + case "19": + //监理施工中出场审批---修改任务ID和流程实例ID + return mapper.updateSupPersonOutStatus(uuid, taskId, processInstanceId, enterStatus); default: break; } @@ -1048,6 +1054,33 @@ public class BusinessServiceImpl implements BusinessService { return list; } + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + @Override + public int updateSupPersonIntoStatusByUuid(String uuid, String statusType) { + try { + if ("3".equals(statusType)) { + mapper.updateSupPersonSysUserStatus(uuid); + } + } catch (Exception e) { + log.error("修改监理人员状态失败"); + } + return mapper.updateSupPersonIntoStatusByUuid(uuid, statusType); + } + + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + @Override + public int updateSupPersonOutStatusByUuid(String uuid, String statusType) { + return mapper.updateSupPersonOutStatusByUuid(uuid, statusType); + } + @Override public void addComment(@Param("uuid") String taskId, @Param("uuid") String processInstanceId, @Param("uuid") String userId, @Param("uuid") String comment, @Param("agree") String agree, @Param("rejectReason") String rejectReason) { mapper.addComment(taskId, processInstanceId, userId, comment, agree, rejectReason); diff --git a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml index 7c0f887..27d26fe 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -325,6 +325,7 @@ update nxdt_ii.lk_sup_person set status = #{statusType}, + into_status = #{statusType}, admission_date = DATE(NOW()) where sup_uuid = (select sup_uuid from nxdt_ii.lk_pro_sup where uuid = #{uuid}) @@ -704,6 +705,37 @@ SET audit_status=#{state},is_audit=#{isAudit},is_now=#{isNow} where task_id=#{taskId} and audit_user=#{userId} + + update nxdt_ii.lk_sup_person + set into_status =#{enterStatus}, + task_id_into = #{taskId}, + proc_inst_id_into = #{processInstanceId} + where uuid = #{uuid} + + + update nxdt_ii.lk_sup_person + set out_status =#{enterStatus}, + task_id_out = #{taskId}, + proc_inst_id_out = #{processInstanceId} + where uuid = #{uuid} + + + update nxdt_ii.sys_user + set status = '0' + where parent_uuid = (select sup_uuid from nxdt_ii.lk_sup_person where uuid = #{uuid}) + + + update nxdt_ii.lk_sup_person + set into_status =#{statusType}, + admission_date = DATE(NOW()) + where uuid = #{uuid} + + + update nxdt_ii.lk_sup_person + set out_status =#{statusType}, + departure_date = DATE(NOW()) + where uuid = #{uuid} + - select (@rowNum := @rowNum + 1) as exportId, lsp.pro_id as proId, lsp.sup_uuid as supUuid, lsp.uuid as uuid, lsp.status as status, + lsp.into_status as intoStatus, + lsp.out_status as outStatus, + lsp.task_id_into as taskId, + lsp.proc_inst_id_into as procInsId, sup_user_id as id, sup_name as name, if(sex = '0','男','女') as sex, @@ -305,7 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" on psp.sup_user_id = lsp.sup_persion_id left join sys_dict_data sdd on sdd.dict_value = psp.post and sdd.dict_type = 'sys_sup_post' and sdd.status = '0' - where psp.is_active = '1' and lsp.status!='3' + where psp.is_active = '1' and lsp.sup_uuid = (select uuid from pt_sup_info where sup_id = #{supId}) @@ -316,6 +327,237 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and psp.sup_name like concat('%', #{name}, '%') + + and lsp.into_status = #{intoStatus} + + + + + + +