From 7a29fcddaab249d390d3f20d4b339179f077892b Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 14 Feb 2025 15:48:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=91=E7=90=86=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/BusinessMapper.xml | 2 +- .../project/controller/SupervisionUnitController.java | 4 ++-- .../service/impl/SupervisionUnitServiceImpl.java | 10 ++-------- .../resources/mapper/system/SupervisionUnitMapper.xml | 10 +++++----- 4 files changed, 10 insertions(+), 16 deletions(-) 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 0701f98..28eafbd 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -557,7 +557,7 @@ ) a - LEFT JOIN nxdt_ii.pt_check_comment b ON a.proc_inst_id = b.proc_inst_id and b.agree != '2' + LEFT JOIN nxdt_ii.pt_check_comment b ON a.proc_inst_id = b.proc_inst_id ) d ON c.id = d.user_id AND d.id IS NOT NULL LEFT JOIN ( SELECT user_name AS userName, nick_name AS NAME, user_id AS userId, dept_id AS deptId FROM nxdt_ii.sys_user WHERE user_type = '00' or user_type='01' or user_type='02') e ON c.id = e.userId 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 1467034..8b22c61 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 @@ -222,8 +222,8 @@ public class SupervisionUnitController extends BaseController { @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场-监理人员删除",details = "监理入场-监理人员删除") public AjaxResult delSupervisoryPersonApply(@RequestBody SupervisorPerson supervisorPerson) { try{ - if (StringUtils.isBlank(supervisorPerson.getIdCard()) || StringUtils.isBlank(supervisorPerson.getPhone())){ - return error("删除失败,身份证号码和手机号不能为空"); + if (StringUtils.isBlank(supervisorPerson.getSupUuid()) && supervisorPerson.getProId() != null){ + return error("删除失败,入参错误"); } return toAjax(suService.delSupervisoryPersonApply(supervisorPerson)); }catch (Exception e){ 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 6b009c6..e727a0d 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 @@ -420,15 +420,12 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { @Override @Transactional(rollbackFor = Exception.class) public int delSupervisoryPersonApply(SupervisorPerson supervisorPerson) { - // 删除监理人员信息(user表) - Integer i = suMapper.delUser(supervisorPerson); - if (i > 0) { Integer supUserId = suMapper.getsupUserId(supervisorPerson); - // 删除监理人员信息(pt_sup_person表) + // 删除监理人员信息(lk_sup_person表) Integer i1 = suMapper.delPtSupPerson(supervisorPerson); if (i1 > 0) { supervisorPerson.setSupId(supUserId); - // 删除监理人员信息(lk_sup_person表) + // 删除监理人员信息(pt_sup_person表) Integer i2 = suMapper.delLkSupPerson(supervisorPerson); if (i2 > 0) { return 1; @@ -438,9 +435,6 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { } else { throw new RuntimeException("删除失败"); } - } else { - throw new RuntimeException("删除失败"); - } } private int qualificationMaterialsFile(@NotNull String filePath, int proId, 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 4e12543..06750fd 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 @@ -104,10 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 phone = #{phone} and is_active = '1' + delete from lk_sup_person where pro_id = #{proId} and sup_uuid = #{supUuid} - delete from lk_sup_person where sup_persion_id = #{supId} + delete from pt_sup_person where sup_user_id = #{supId} and is_active = 1 \ No newline at end of file From f1027e9a28238ca1c50b0a3c6e8197301aaea245 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 14 Feb 2025 15:50:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=91=E7=90=86=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/project/controller/SupervisionUnitController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8b22c61..342274d 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 @@ -222,7 +222,7 @@ public class SupervisionUnitController extends BaseController { @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场-监理人员删除",details = "监理入场-监理人员删除") public AjaxResult delSupervisoryPersonApply(@RequestBody SupervisorPerson supervisorPerson) { try{ - if (StringUtils.isBlank(supervisorPerson.getSupUuid()) && supervisorPerson.getProId() != null){ + if (StringUtils.isBlank(supervisorPerson.getSupUuid()) || supervisorPerson.getProId() != null){ return error("删除失败,入参错误"); } return toAjax(suService.delSupervisoryPersonApply(supervisorPerson)); From e91234a183152030b72efdfa09ea1aba9efc0929 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 14 Feb 2025 15:51:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=91=E7=90=86=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/project/controller/SupervisionUnitController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 342274d..763a2f0 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 @@ -222,7 +222,7 @@ public class SupervisionUnitController extends BaseController { @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场-监理人员删除",details = "监理入场-监理人员删除") public AjaxResult delSupervisoryPersonApply(@RequestBody SupervisorPerson supervisorPerson) { try{ - if (StringUtils.isBlank(supervisorPerson.getSupUuid()) || supervisorPerson.getProId() != null){ + if (StringUtils.isBlank(supervisorPerson.getSupUuid()) || supervisorPerson.getProId() == null){ return error("删除失败,入参错误"); } return toAjax(suService.delSupervisoryPersonApply(supervisorPerson));