From 81fbe32e27e9d8a908d8d7417390a2b3141bc1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 19 Mar 2020 14:55:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E9=80=9F=E5=BA=A6=E6=85=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BB=A5=E5=8F=8A=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A?= =?UTF-8?q?=E5=91=98=E8=B7=9F=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PartyMembersController.java | 12 ++ .../elink/esua/epdc/dao/PartyMembersDao.java | 22 ++++ .../epdc/service/PartyMembersService.java | 9 ++ .../service/impl/PartyMembersServiceImpl.java | 15 +++ .../main/resources/mapper/PartyMembersDao.xml | 106 +++++++++++++++--- 5 files changed, 147 insertions(+), 17 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index 02b900a23..dcd0b362f 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -166,5 +166,17 @@ public class PartyMembersController { ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcel.class); } + /*** + * 已认证党员优化 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/3/19 13:34 + */ + @GetMapping("optimizeHasAuthenticationPartyPage") + @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false) + public Result> optimizeHasAuthenticationPartyPage(@RequestParam Map params) { + return partyMembersService.optimizeHasAuthenticationPartyPage(params); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java index 3d422439c..723273495 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java @@ -21,6 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.entity.PartyMembersEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.PathVariable; import java.io.Serializable; import java.util.List; @@ -62,4 +64,24 @@ public interface PartyMembersDao extends BaseDao { * @since 2020/3/7 1:20 */ void updateGridByDeptId(String newDeptName, Long deptId); + + /*** + * 已认证党员查询优化 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/3/19 13:32 + */ + + List optimizeHasAuthenticationPartyPage(Map params); + + /*** + * 已认证党员查询优化 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/3/19 13:33 + */ + + List optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List userIdList); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java index 9a87a9026..2f900f6bf 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java @@ -100,4 +100,13 @@ public interface PartyMembersService extends BaseService { * @since 2020/3/7 1:23 */ void modifyOrganizationInfo(OrganizationModifyDTO dto); + + /*** + * 已认证党员优化 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/3/19 13:36 + */ + Result> optimizeHasAuthenticationPartyPage(Map params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index 9d2d4a082..0806f1b9d 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -445,6 +445,8 @@ public class PartyMembersServiceImpl extends BaseServiceImpl> optimizeHasAuthenticationPartyPage(Map params) { + IPage page = getPage(params); + List userIds = baseDao.optimizeHasAuthenticationPartyPage(params); + if(userIds.size()>0){ + List partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfo(userIds); + return new Result>().ok(new PageData<>(partyMembersDTOList, page.getTotal())); + }else { + return new Result>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO)); + } + + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml index 71e9f1e0a..d013e0a25 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml @@ -88,25 +88,25 @@ - SELECT pm.*, pm.ALL_DEPT_IDS as deptStrIds, @@ -154,4 +154,76 @@ UPDATE epdc_party_members SET GRID_NAME = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId} + + + + From 2af789a3fb4b7a3b3e3cfc7feae410473dda5248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 20 Mar 2020 10:22:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=9A=E5=91=98?= =?UTF-8?q?=E5=89=8D=E5=88=A4=E6=96=AD=E6=AD=A4=E5=85=9A=E5=91=98=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E8=A2=AB=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PartyMembersController.java | 5 +-- .../elink/esua/epdc/dao/PartyMembersDao.java | 9 ++++++ .../epdc/service/PartyMembersService.java | 11 ++++++- .../service/impl/PartyMembersServiceImpl.java | 32 ++++++++++++------- .../main/resources/mapper/PartyMembersDao.xml | 9 ++++++ 5 files changed, 50 insertions(+), 16 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index dcd0b362f..67ef6c2ac 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -112,10 +112,7 @@ public class PartyMembersController { public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - - partyMembersService.delete(ids); - - return new Result(); + return partyMembersService.delete(ids); } @GetMapping("export") diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java index 723273495..9a482741e 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java @@ -84,4 +84,13 @@ public interface PartyMembersDao extends BaseDao { */ List optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List userIdList); + + /*** + * 删除时校验党员是否被认证 + * @param IdentityNo + * @return + * @author qushutong + * @date 2020/3/20 9:21 + */ + Integer selectCountByIdentity(String IdentityNo); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java index 2f900f6bf..7fa20345f 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java @@ -52,7 +52,7 @@ public interface PartyMembersService extends BaseService { void update(PartyMembersDTO dto); - void delete(String[] ids); + Result delete(String[] ids); /*** @@ -109,4 +109,13 @@ public interface PartyMembersService extends BaseService { * @date 2020/3/19 13:36 */ Result> optimizeHasAuthenticationPartyPage(Map params); + + /*** + * 通过身份证校验此党员是否被认证 + * @param IdentityNo + * @return java.lang.Integer + * @author qushutong + * @date 2020/3/20 9:10 + */ + Integer checkCertificationByIdentityNo(String IdentityNo); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index 0806f1b9d..490cc85e0 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -142,7 +142,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl + * @return java.util.Map * @author work@yujt.net.cn * @date 2020/2/24 16:43 */ @@ -246,12 +246,19 @@ public class PartyMembersServiceImpl extends BaseServiceImpl partyList) { @@ -446,19 +453,17 @@ public class PartyMembersServiceImpl extends BaseServiceImpl + * @params [dto, partyList] * @author liuchuang * @since 2020/3/7 15:17 */ private List handleOrganizationInfo(OrganizationModifyDTO dto, List partyList) { List entities = new ArrayList<>(); - for (PartyMembersDTO party: partyList) { + for (PartyMembersDTO party : partyList) { PartyMembersEntity entity = new PartyMembersEntity(); if (StringUtils.isNotEmpty(party.getParentDeptIds()) && StringUtils.isNotEmpty(party.getParentDeptNames())) { List parentDeptIds = Arrays.asList(party.getParentDeptIds().split(",")); @@ -492,12 +497,17 @@ public class PartyMembersServiceImpl extends BaseServiceImpl> optimizeHasAuthenticationPartyPage(Map params) { IPage page = getPage(params); List userIds = baseDao.optimizeHasAuthenticationPartyPage(params); - if(userIds.size()>0){ + if (userIds.size() > 0) { List partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfo(userIds); return new Result>().ok(new PageData<>(partyMembersDTOList, page.getTotal())); - }else { + } else { return new Result>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO)); } } + + @Override + public Integer checkCertificationByIdentityNo(String IdentityNo) { + return baseDao.selectCountByIdentity(IdentityNo); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml index d013e0a25..1d7250d69 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml @@ -226,4 +226,13 @@ ORDER BY allu.registTime DESC + +