From ff79f02ef8b98243c5f9ffe3200af5341d00125a Mon Sep 17 00:00:00 2001 From: wxz Date: Sun, 23 Apr 2023 16:27:28 +0800 Subject: [PATCH] =?UTF-8?q?1.fix=EF=BC=9A=E7=89=B9=E6=AE=8A=E4=BA=BA?= =?UTF-8?q?=E7=BE=A4=EF=BC=8C=E8=B0=83=E6=95=B4=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/enums/ZhzlResiCategoryEnum.java | 2 +- .../LingShanSpecialCrowdController.java | 5 ++-- .../LingshanSpecialCrowdPersonTypeDao.java | 2 +- .../service/LingShanSpecialCrowdService.java | 2 +- .../impl/LingShanSpecialCrowdServiceImpl.java | 23 +++++++------------ .../LingshanSpecialCrowdPersonTypeDao.xml | 2 +- 6 files changed, 14 insertions(+), 22 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java index 66def5e16c..90709fe179 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java @@ -20,7 +20,7 @@ public enum ZhzlResiCategoryEnum { buliangqingshaonian("buliangqingshaonian", "不良青少年", "list_equal", "ic_special", "SPECIAL_RQLB", "buliangqingshaonian", 4), shequjiaozheng("shequjiaozheng", "社区矫正", "list_equal", "ic_special", "SPECIAL_RQLB", "shequjiaozheng", 5), zhaoshizhaohuojingshenbing("zhaoshizhaohuojingshenbing", "肇事肇祸精神病", "list_equal", "ic_special", "SPECIAL_RQLB", "zhaoshizhaohuojingshenbing", 6), - xidurenyuan("jiedurenyuan", "戒毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7); + jiedurenyuan("jiedurenyuan", "戒毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7); private String code; private String name; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java index ed46a4ae89..97eb46b233 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java @@ -251,14 +251,13 @@ public class LingShanSpecialCrowdController { */ @PostMapping("deleteByType") public Result deleteByType(@RequestBody Map params) { - String specialType = params.get("specialType"); String resiId = params.get("resiId"); - if (StringUtils.isAnyBlank(specialType, resiId)) { + if (StringUtils.isAnyBlank(resiId, resiId)) { throw new ValidateException("特殊人群类型或身份证不能为空"); } - lingShanSpecialCrowdService.deleteByType(specialType, resiId); + lingShanSpecialCrowdService.deleteByType(resiId); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/LingshanSpecialCrowdPersonTypeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/LingshanSpecialCrowdPersonTypeDao.java index 56d7132edf..8be11fb77d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/LingshanSpecialCrowdPersonTypeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/LingshanSpecialCrowdPersonTypeDao.java @@ -27,5 +27,5 @@ public interface LingshanSpecialCrowdPersonTypeDao extends BaseDao listSpecialCrowds(String orgId, String orgType, String specialType, String name, String mobile, String idCard, Integer pageNo, Integer pageSize); - void deleteByType(String specialType, String resiId); + void deleteByType(String resiId); /** * @description: 保存或修改 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java index a8874bf67f..b859446a93 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java @@ -608,24 +608,17 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ @Transactional @Override - public void deleteByType(String specialType, String resiId) { - LambdaQueryWrapper q = new LambdaQueryWrapper<>(); - q.eq(LingshanSpecialCrowdPersonTypeEntity::getSpecialType, specialType); - q.eq(LingshanSpecialCrowdPersonTypeEntity::getResiId, resiId); - + public void deleteByType(String resiId) { // 先删除type - specialCrowdPersonTypeDao.deletePhysical(specialType, resiId); + specialCrowdPersonTypeDao.deletePhysical(resiId); - LingshanSpecialCrowdPersonTypeEntity personType = specialCrowdPersonTypeDao.selectOne(q); - if (personType == null) { - return; - } + IcResiUserEntity resiInfo = icResiUserDao.selectById(resiId); // 再删除detail - specialCrowdDetailAzbjDao.deletePhysical(personType.getIdCard()); - specialCrowdDetailXfryDao.deletePhysical(personType.getIdCard()); - specialCrowdDetailJdryDao.deletePhysical(personType.getIdCard()); - specialCrowdDetailSqjzDao.deletePhysical(personType.getIdCard()); - specialCrowdDetailJzhzDao.deletePhysical(personType.getIdCard()); + specialCrowdDetailAzbjDao.deletePhysical(resiInfo.getIdCard()); + specialCrowdDetailXfryDao.deletePhysical(resiInfo.getIdCard()); + specialCrowdDetailJdryDao.deletePhysical(resiInfo.getIdCard()); + specialCrowdDetailSqjzDao.deletePhysical(resiInfo.getIdCard()); + specialCrowdDetailJzhzDao.deletePhysical(resiInfo.getIdCard()); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdPersonTypeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdPersonTypeDao.xml index 9c2eeca66b..93ad9b6242 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdPersonTypeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdPersonTypeDao.xml @@ -32,7 +32,7 @@ , UPDATED_TIME = values(UPDATED_TIME) - delete from lingshan_special_crowd_person_type where RESI_ID = #{resiId} and SPECIAL_TYPE = #{specialType} + delete from lingshan_special_crowd_person_type where RESI_ID = #{resiId}