From d8b5a24bfaea2910faf8686615b4645122d72d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 27 May 2025 18:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=91=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/core/domain/BaseBean.java | 3 + .../controller/SupervisionUnitController.java | 19 +++++ .../project/mapper/SupervisionUnitMapper.java | 14 ++++ .../service/SupervisionUnitService.java | 7 ++ .../impl/SupervisionUnitServiceImpl.java | 17 ++++- .../mapper/system/SupervisionUnitMapper.xml | 71 ++++++++++++++++++- 6 files changed, 127 insertions(+), 4 deletions(-) diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java index 48ae8fd..b998238 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java @@ -41,6 +41,9 @@ public class BaseBean implements Serializable { private String procInsId; + /** + * 用户类型（00业主用户、01监理用户、02承包商、03分包商） + */ private String userType; /** 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 cb69f54..6e8bb91 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 @@ -1,5 +1,6 @@ package com.bonus.project.controller; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -256,4 +257,22 @@ public class SupervisionUnitController extends BaseController { } return error("系统异常,请联系管理员"); } + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + @GetMapping("/getPtSupPerson") + @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场",details = "监理入场申请") + public TableDataInfo getPtSupPerson(SupervisorPerson bean) { + try{ + startPage(); + List list = suService.getPtSupPerson(bean); + return getDataTable(list); + }catch (Exception e){ + logger.error(e.toString(),e); + } + return getDataTableError(null); + } } 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 1dc4d7a..d23e873 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 @@ -196,4 +196,18 @@ public interface SupervisionUnitMapper { * @param userId */ void deleteUserById(@Param("userId") String userId); + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + List getPtSupPerson(SupervisorPerson bean); + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + List getPtSupPersonAll(SupervisorPerson bean); } 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 388335a..8341317 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 @@ -88,4 +88,11 @@ public interface SupervisionUnitService { AjaxResult delSupervisionUnitUser(Long[] addressId); int delSupervisoryPersonApply(SupervisorPerson supervisorPerson); + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + List getPtSupPerson(SupervisorPerson bean); } 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 94ed539..459cd88 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 @@ -468,11 +468,10 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { @Override @Transactional(rollbackFor = Exception.class) public int delSupervisoryPersonApply(SupervisorPerson supervisorPerson) { - Integer supUserId = suMapper.getsupUserId(supervisorPerson); // 删除监理人员信息(lk_sup_person表) Integer i1 = suMapper.delPtSupPerson(supervisorPerson); if (i1 > 0) { - supervisorPerson.setSupId(supUserId); + supervisorPerson.setSupId(Integer.valueOf(supervisorPerson.getUserId())); // 删除监理人员信息(pt_sup_person表) Integer i2 = suMapper.delLkSupPerson(supervisorPerson); if (i2 > 0) { @@ -485,6 +484,20 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { } } + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + @Override + public List getPtSupPerson(SupervisorPerson bean) { + //判断如果是业主,查询全部 + if (StaticVariableUtils.ZERO_00.equals(bean.getUserType())) { + return suMapper.getPtSupPersonAll(bean); + } + return suMapper.getPtSupPerson(bean); + } + 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 80f332b..d65316e 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 @@ -109,7 +109,7 @@ 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 lk_sup_person where pro_id = #{proId} and sup_uuid = #{supUuid} + delete from lk_sup_person where pro_id = #{proId} and sup_uuid = #{supUuid} and sup_persion_id = #{userId} delete from pt_sup_person where sup_user_id = #{supId} and is_active = 1 @@ -243,13 +243,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +