From 8a1d193ac98d1245b438308fafb160814d89d916 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 13 Feb 2025 16:36:47 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessController.java | 17 ++- .../bonus/flowable/entity/CheckComment.java | 1 + .../bonus/flowable/utils/FlowTaskUtils.java | 2 +- .../main/resources/mapper/BusinessMapper.xml | 13 ++- .../AdmissionRequestController.java | 2 +- .../controller/SupervisionUnitController.java | 11 ++ .../project/mapper/SupervisionUnitMapper.java | 4 + .../service/SupervisionUnitService.java | 3 + .../impl/SupervisionUnitServiceImpl.java | 105 +++++++++++------- .../mapper/system/SupervisionUnitMapper.xml | 6 + 10 files changed, 112 insertions(+), 52 deletions(-) diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java index 1a0310b..af13a22 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java @@ -48,11 +48,16 @@ public class BusinessController { @SysLog(title = "入场申请", businessType = OperaType.QUERY, logType = 0, module = "入场申请", details = "提交审批") public AjaxResult submitMulApproval(@RequestBody AuditTask auditTask) { String[] uuidArr = auditTask.getUuid().split(","); - String[] taskIdArr = auditTask.getTaskId().split(","); + String[] taskIdArr = new String[0]; + if (StringUtils.isNotBlank(auditTask.getTaskId())){ + taskIdArr = auditTask.getTaskId().split(","); + } AjaxResult code = null; for (int i = 0; i < uuidArr.length; i++) { auditTask.setUuid(uuidArr[i]); - auditTask.setTaskId(taskIdArr[i]); + if (taskIdArr.length > 0) { + auditTask.setTaskId(taskIdArr[i]); + } code = businessService.submitApproval(auditTask); if (!StaticVariableUtils.REVIEW_SUBMITTED_SUCCESSFULLY.equals(code.get("msg"))) { if (StaticVariableUtils.THEAUDITFLOWNEEDSTOBECONFIGURED.equals(code.get("msg"))) { @@ -86,12 +91,12 @@ public class BusinessController { if (!StaticVariableUtils.REVIEW_SUBMITTED_SUCCESSFULLY.equals(code.get("msg"))) { if (StaticVariableUtils.THEAUDITFLOWNEEDSTOBECONFIGURED.equals(code.get("msg"))) { return code; - }else { + } else { throw new RuntimeException("提交失败"); } } } - }else{ + } else { return businessService.submitApproval(auditTask); } } catch (Exception e) { @@ -117,7 +122,7 @@ public class BusinessController { @ApiOperation(value = "审批记录") @PostMapping(value = "/approvalHistory") public AjaxResult approvalHistory(@RequestBody RequestEntity entity) { - return flowTaskUtils.approvalHistory(entity); + return flowTaskUtils.approvalHistory(entity); } @@ -127,7 +132,7 @@ public class BusinessController { if (StringUtils.isEmpty(entity.getTaskId())) { return AjaxResult.error("任务id不能为空"); } - return AjaxResult.success(businessService.approvalHistoryUser(entity.getTaskId())); + return AjaxResult.success(businessService.approvalHistoryUser(entity.getTaskId())); } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java index 35f36ff..2e16051 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java @@ -22,5 +22,6 @@ public class CheckComment { private String status; private String examType; private String sort; + private Integer agree; } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java index 802f644..1974290 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java @@ -911,7 +911,7 @@ public class FlowTaskUtils extends FlowServiceFactory { tempList.add(checkComment); sortList.add(checkComment.getSort()); } - checkComment.setStatus(StringUtils.isBlank(time) ? "未审核" : "已审核"); +// checkComment.setStatus(StringUtils.isBlank(time) ? "未审核" : "已审核"); } List newList = new ArrayList<>(); sortList.forEach(sort -> { 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 0bc0667..4d94a4b 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -406,8 +406,11 @@ from (select pcc.user_id as userId, pcc.comment as reason, IFNULL(pcc.reject,'') as turnDownReason, - pcc.create_time as time, - '已审核' as status + case when pcc.agree = '1' then '审核通过' + when pcc.agree = '2' then '审核驳回' + when pcc.agree = '3' then '终审通过' + when pcc.agree = '4' then '已撤回' + else '' end as status from nxdt_ii.pt_check_comment pcc where proc_inst_id = #{processInstanceId}) a left join (select user_name as userName, nick_name as name, user_id as userId, dept_id as deptId @@ -509,6 +512,11 @@ IFNULL( d.time, '' ) AS time, IFNULL( c.examType, '' ) AS examType, IFNULL( e.`name`, '' ) AS `name`, + case when d.agree = '1' then '审核通过' + when d.agree = '2' then '审核驳回' + when d.agree = '3' then '终审通过' + when d.agree = '4' then '已撤回' + else '' end as status, IFNULL( f.dept_name, '' ) AS section, IFNULL( c.sort, '' ) AS sort, #{taskId} as taskId @@ -526,6 +534,7 @@ user_id, `comment`, reject, + b.agree, create_time AS time FROM ( diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java index 64f58f1..b9d54a4 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java @@ -299,7 +299,7 @@ public class AdmissionRequestController extends BaseController { try{ int code = arService.judgeIsFileComplete(bean); if (code > 0) { - return success("部分人员文件不存在，请先仔细核对，上传相关文件！"); + return error("部分人员文件不存在，请先仔细核对，上传相关文件！"); }else{ return success(); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java index 2e57230..e7c6b3c 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java @@ -9,6 +9,7 @@ import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.project.domain.SupervisionUnit; import com.bonus.project.domain.SupervisionOfAdmission; +import com.bonus.project.domain.SupervisorPerson; import com.bonus.project.service.SupervisionUnitService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -216,6 +217,16 @@ public class SupervisionUnitController extends BaseController { } return error("系统异常,请联系管理员"); } + @PostMapping("/delSupervisoryPersonApply") + @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场-监理人员删除",details = "监理入场-监理人员删除") + public AjaxResult delSupervisoryPersonApply(@RequestBody SupervisorPerson supervisorPerson) { + try{ + return toAjax(suService.delSupervisoryPersonApply(supervisorPerson)); + }catch (Exception e){ + logger.error(e.toString(),e); + } + return error("系统异常,请联系管理员"); + } /** * 监理入场申请 diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java index ae4fd6e..395e87a 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java @@ -168,4 +168,8 @@ public interface SupervisionUnitMapper { * @return */ int getUserMapper(Long id); + + Integer delUser(SupervisorPerson supervisorPerson); + + Integer delPtSupPerson(SupervisorPerson supervisorPerson); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java index ed396d5..388335a 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java @@ -3,6 +3,7 @@ package com.bonus.project.service; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.project.domain.SupervisionUnit; import com.bonus.project.domain.SupervisionOfAdmission; +import com.bonus.project.domain.SupervisorPerson; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -85,4 +86,6 @@ public interface SupervisionUnitService { * @return */ AjaxResult delSupervisionUnitUser(Long[] addressId); + + int delSupervisoryPersonApply(SupervisorPerson supervisorPerson); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java index 5ee7c7a..8440fc8 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java @@ -56,6 +56,7 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { public List listSupervisionUnit(SupervisionUnit bean) { return suMapper.listSupervisionUnit(bean); } + /** * 获取监理单位列表 * @@ -66,6 +67,7 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { public List listSupervisionUnitUser(SupervisionUnit bean) { return suMapper.listSupervisionUnitUser(bean); } + /** * 修改监理单位管理 * @@ -74,14 +76,14 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { */ @Override public AjaxResult updateSupervisionUnit(SupervisionUnit bean) { - int isActive= suMapper.getUnitNameById(bean); - if(isActive>0){ - return AjaxResult.error("监理单位名称已存在"); - } - int num= suMapper.updateSupervisionUnit(bean); - if(num>0){ - return AjaxResult.success("修改成功"); - } + int isActive = suMapper.getUnitNameById(bean); + if (isActive > 0) { + return AjaxResult.error("监理单位名称已存在"); + } + int num = suMapper.updateSupervisionUnit(bean); + if (num > 0) { + return AjaxResult.success("修改成功"); + } return AjaxResult.error("修改失败"); } @@ -98,22 +100,20 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { if (StringUtils.isNotEmpty(list)) { return AjaxResult.success(list.get(0).getSupervisorUnit() + "存在工程信息,不允许删除"); } - int userNum=suMapper.getUserMapper(id); - if(userNum>0){ + int userNum = suMapper.getUserMapper(id); + if (userNum > 0) { return AjaxResult.success(list.get(0).getSupervisorUnit() + "该监理下存在总监,不允许删除"); } } - int num= suMapper.deleteSupervisionUnitById(addressId); - if(num>0){ - return AjaxResult.success("删除成功"); - } - return AjaxResult.error("删除失败"); + int num = suMapper.deleteSupervisionUnitById(addressId); + if (num > 0) { + return AjaxResult.success("删除成功"); + } + return AjaxResult.error("删除失败"); } - - /** * 获取监理入场列表 * @@ -178,14 +178,14 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { bean.setCreateTime(DateUtils.getDate()); bean.setCreateUser(String.valueOf(SecurityUtils.getUserId())); String ids = jsonObject.optString("id"); - if(StringUtils.isNotEmpty(ids)){ + if (StringUtils.isNotEmpty(ids)) { bean.setId(Integer.valueOf(ids)); } String delFileIds = jsonObject.optString("delFileIds"); - if (StringUtils.isNotEmpty(delFileIds)){ + if (StringUtils.isNotEmpty(delFileIds)) { commonMapper.deleteFile(delFileIds); } - if("".equals(jsonObject.optString("id"))){ + if ("".equals(jsonObject.optString("id"))) { code = suMapper.insertPersonEnterInfo(bean); if (code == 0) { throw new Exception("新增监理人员入场申请失败"); @@ -197,7 +197,7 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { if (code == 0) { throw new Exception("新增人员工程关联申请失败"); } - }else{ + } else { bean.setUuid(jsonObject.optString("uuid")); uuid = bean.getUuid(); code = suMapper.updatePersonEnterInfo(bean); @@ -263,13 +263,15 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { } return code; } + /** * 监理入场申请 + * * @param enterpriseQualificationFiles 企业资质文件 - * @param securityAgreementFiles 安全协议文件 - * @param supervisionPlanningFiles 监理规划文件 - * @param implementationRulesFiles 实施细则文件 - * @param allRequestParams 参数 + * @param securityAgreementFiles 安全协议文件 + * @param supervisionPlanningFiles 监理规划文件 + * @param implementationRulesFiles 实施细则文件 + * @param allRequestParams 参数 * @return 是否新增成功 */ @Override @@ -287,14 +289,14 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { bean.setSupUuid(jsonObject.optString("supUuid")); bean.setUuid(jsonObject.optString("uuid")); String delFileIds = jsonObject.optString("delFileIds"); - if (StringUtils.isNotEmpty(delFileIds)){ + if (StringUtils.isNotEmpty(delFileIds)) { commonMapper.deleteFile(delFileIds); } bean.setCreateUser(String.valueOf(SecurityUtils.getUserId())); String submitType = jsonObject.optString("submitType"); if (StaticVariableUtils.SUBMIT.equals(submitType)) { bean.setStatus("8"); - }else{ + } else { bean.setStatus("9"); } code = suMapper.updateLinkRelation(bean); @@ -371,48 +373,67 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { /** * 修改监理单位人员 + * * @param bean * @return */ @Override public AjaxResult updateSupervisionUnitUser(SupervisionUnit bean) { - try{ - int num=suMapper.updateUnitUser(bean); - if(num>0){ + try { + int num = suMapper.updateUnitUser(bean); + if (num > 0) { suMapper.updateUserInfo(bean); suMapper.updateProUserInfo(bean); - return AjaxResult.success("修改成功"); + return AjaxResult.success("修改成功"); } - }catch (Exception e){ - log.error(e.toString(),e); + } catch (Exception e) { + log.error(e.toString(), e); } - return AjaxResult.error("修改失败"); + return AjaxResult.error("修改失败"); } /** * 删除监理人员数据 + * * @param addressId * @return */ @Override public AjaxResult delSupervisionUnitUser(Long[] addressId) { - if(addressId.length>0){ - for (Long id:addressId){ + if (addressId.length > 0) { + for (Long id : addressId) { List list = suMapper.getSupProUserNum(id); - if(StringUtils.isNotEmpty(list)){ - return AjaxResult.success(list.get(0).getSupervisorUnit()+"存在工程信息,不允许删除"); + if (StringUtils.isNotEmpty(list)) { + return AjaxResult.success(list.get(0).getSupervisorUnit() + "存在工程信息,不允许删除"); } } } - int num= suMapper.delSupervisionUnitUser(addressId); - if(num>0){ - return AjaxResult.success("删除成功"); + int num = suMapper.delSupervisionUnitUser(addressId); + if (num > 0) { + return AjaxResult.success("删除成功"); } - return AjaxResult.error("删除失败"); + return AjaxResult.error("删除失败"); } + @Override + @Transactional(rollbackFor = Exception.class) + public int delSupervisoryPersonApply(SupervisorPerson supervisorPerson) { + // 删除监理人员信息(user表) + Integer i = suMapper.delUser(supervisorPerson); + if (i > 0) { + Integer i1 = suMapper.delPtSupPerson(supervisorPerson); + if (i1 > 0) { + return suMapper.delPtSupPerson(supervisorPerson); + } else { + throw new RuntimeException("删除失败"); + } + } else { + throw new RuntimeException("删除失败"); + } + } + private int qualificationMaterialsFile(@NotNull String filePath, int proId, long fileSize, String fromType, String informationType, String uuid) { diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml index 08da246..5c443e8 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml @@ -100,6 +100,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{addressId} + + delete from sys_user where id_card = #{idCard} and phonenumber = #{phone} and del_flag = '0' + + + delete from pt_sup_person where id_card = #{idCard} and phonen = #{phone} and is_active = '1' +