From c55848200edf7406a68a6117a516fdfe371d8320 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 13 Feb 2025 18:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=90=86=E4=BA=BA=E5=91=98=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/SupervisionUnitController.java | 4 ++++ .../bonus/project/mapper/SupervisionUnitMapper.java | 4 ++++ .../service/impl/SupervisionUnitServiceImpl.java | 11 ++++++++++- .../resources/mapper/system/OutsourcingProMapper.xml | 1 + .../resources/mapper/system/SupervisionUnitMapper.xml | 10 +++++++++- 5 files changed, 28 insertions(+), 2 deletions(-) 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 9fb8fde..1467034 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 @@ -12,6 +12,7 @@ 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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -221,6 +222,9 @@ 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("删除失败,身份证号码和手机号不能为空"); + } return toAjax(suService.delSupervisoryPersonApply(supervisorPerson)); }catch (Exception e){ logger.error(e.toString(),e); 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 395e87a..1cbef34 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 @@ -172,4 +172,8 @@ public interface SupervisionUnitMapper { Integer delUser(SupervisorPerson supervisorPerson); Integer delPtSupPerson(SupervisorPerson supervisorPerson); + + Integer getsupUserId(SupervisorPerson supervisorPerson); + + Integer delLkSupPerson(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 8440fc8..6b009c6 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 @@ -423,9 +423,18 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { // 删除监理人员信息(user表) Integer i = suMapper.delUser(supervisorPerson); if (i > 0) { + Integer supUserId = suMapper.getsupUserId(supervisorPerson); + // 删除监理人员信息(pt_sup_person表) Integer i1 = suMapper.delPtSupPerson(supervisorPerson); if (i1 > 0) { - return suMapper.delPtSupPerson(supervisorPerson); + supervisorPerson.setSupId(supUserId); + // 删除监理人员信息(lk_sup_person表) + Integer i2 = suMapper.delLkSupPerson(supervisorPerson); + if (i2 > 0) { + return 1; + } else { + throw new RuntimeException("删除失败"); + } } else { throw new RuntimeException("删除失败"); } diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml index 7b15a1d..806188f 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml @@ -76,6 +76,7 @@ if(sex = '0','男','女') as sex, age, phone, + id_card as idCard, sdd.dict_label as postName, face_path as faceUrl from (select @rowNum := 0) r,pt_sup_person psp 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 5532a7f..4e12543 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,7 +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 phonen = #{phone} and is_active = '1' + delete from pt_sup_person where id_card = #{idCard} and phone = #{phone} and is_active = '1' + + + delete from lk_sup_person where sup_persion_id = #{supId} + \ No newline at end of file