Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java

@@ -85,6 +85,23 @@ public class PartyMembersController {
         }
         return partyMembersService.pageDIY(params);
     }
+    @GetMapping("hasAuthenticationPartyPage")
+    @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<PartyMembersDTO>> hasAuthenticationPartyPage(@RequestParam Map<String, Object> params) {
+        String realName = (String) params.get("realName");
+        String mobile = (String) params.get("mobile");
+        String identityNo = (String) params.get("identityNo");
+        if (StringUtils.isNotBlank(realName)) {
+            params.put("realName", realName.trim());
+        }
+        if (StringUtils.isNotBlank(mobile)) {
+            params.put("mobile", mobile.trim());
+        }
+        if (StringUtils.isNotBlank(identityNo)) {
+            params.put("identityNo", identityNo.trim());
+        }
+        return partyMembersService.hasAuthenticationPartyPage(params);
+    }
 
     @GetMapping("{id}")
     public Result<PartyMembersDTO> get(@PathVariable("id") String id) {

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java

@@ -38,4 +38,6 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
     List<PartyMembersDTO> pageDIY(Map<String, Object> params);
 
     PartyMembersDTO selectByIdNew(String id);
+
+    List<PartyMembersDTO> hasAuthenticationPartyPage(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java

@@ -40,6 +40,8 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
 
     Result<PageData<PartyMembersDTO>> pageDIY(Map<String, Object> params);
 
+    Result<PageData<PartyMembersDTO>> hasAuthenticationPartyPage(Map<String, Object> params);
+
     List<PartyMembersDTO> list(Map<String, Object> params);
 
     PartyMembersDTO get(String id);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java

@@ -85,6 +85,12 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         List<PartyMembersDTO> list = baseDao.pageDIY(params);
         return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(list, page.getTotal()));
     }
+    @Override
+    public Result<PageData<PartyMembersDTO>> hasAuthenticationPartyPage(Map<String, Object> params) {
+        IPage<PartyMembersDTO> page = getPage(params);
+        List<PartyMembersDTO> list = baseDao.hasAuthenticationPartyPage(params);
+        return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(list, page.getTotal()));
+    }
 
     @Override
     public List<PartyMembersDTO> list(Map<String, Object> params) {

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml

@@ -84,6 +84,64 @@
         ORDER BY
         pm.CREATED_TIME DESC
     </select>
+    <select id="hasAuthenticationPartyPage" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+        SELECT
+        pm.CADRE_FLAG,
+        pm.CREATED_BY,pm.CREATED_TIME,
+        pm.DEPT_ID,
+        pm.ID,pm.IDENTITY_NO,pm.MOBILE,pm.POST,
+        pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,pm.REGIST_TIME,
+        pm.REVISION,
+        GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME,
+        pm.ALL_DEPT_NAMES as allDeptNames
+        FROM
+        epdc_party_members pm
+        LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
+        LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
+        AND ut.DEL_FLAG = '0'
+        INNER JOIN  epdc_user user ON user.IDENTITY_NO = pm.IDENTITY_NO
+        AND user.DEL_FLAG = '0' AND user.PARTY_FLAG = '1'
+        WHERE
+        pm.DEL_FLAG = '0'
+        <if test="realName != null and realName != '' ">
+            and pm.REAL_NAME = #{realName}
+        </if>
+        <if test="mobile != null and mobile != '' ">
+            and pm.MOBILE = #{mobile}
+        </if>
+
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},pm.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},pm.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},pm.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},pm.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            and (pm.grid_id = #{gridId}
+            OR find_in_set(#{gridId},pm.ALL_DEPT_IDS))
+        </if>
+        <if test="identityNo != null and identityNo != '' ">
+            and pm.IDENTITY_NO = #{identityNo}
+        </if>
+        <if test="registFlag != null and registFlag != '' ">
+            and pm.REGIST_FLAG = #{registFlag}
+        </if>
+        <if test="postId != null and postId != '' ">
+            and pm.POST_ID = #{postId}
+        </if>
+        <if test="startTime != null and startTime != '' ">
+            and pm.REGIST_TIME >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != '' ">
+            <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}
+        </if>
+        GROUP BY
+        pm.ID
+        ORDER BY
+        pm.CREATED_TIME DESC
+    </select>
     <!--管理系统-->
     <select id="selectByIdNew"  resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
 		SELECT