党员管理

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java

@@ -32,9 +32,9 @@ import lombok.Data;
 public class PartyMembersDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private String tagName;
+	private String tagIds;
 
-    private String tagDesc;
+	private String tagName;
 
 	private String id;
 
@@ -46,7 +46,7 @@ public class PartyMembersDTO implements Serializable {
 
 	private String post;
 
-	private String postId;
+	private String postValue;
 
 	private String cadreFlag;
 
@@ -56,17 +56,17 @@ public class PartyMembersDTO implements Serializable {
 
 	private String streetName;
 
-	private String streetId;
+	private long streetId;
 
 	private String communityName;
 
-	private String communityId;
+	private long communityId;
 
 	private String gridName;
 
-	private String gridId;
+	private long gridId;
 
-	private String deptId;
+	private long deptId;
 
 	private Integer revision;
 

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -50,9 +51,7 @@ public class PartyMembersController {
 
     @GetMapping("page")
     public Result<PageData<PartyMembersDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PartyMembersDTO> page = partyMembersService.pageDIY(params);
+        return partyMembersService.pageDIY(params);
-
-        return new Result<PageData<PartyMembersDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
@@ -66,7 +65,7 @@ public class PartyMembersController {
     public Result save(@RequestBody PartyMembersDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-
+        dto.setDeptId(SecurityUser.getDeptId());
         partyMembersService.save(dto);
 
         return new Result();

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

@@ -51,10 +51,15 @@ public class UserTagController {
     @GetMapping("page")
     public Result<PageData<UserTagDTO>> page(@RequestParam Map<String, Object> params){
         PageData<UserTagDTO> page = userTagService.page(params);
-
         return new Result<PageData<UserTagDTO>>().ok(page);
     }
 
+    @GetMapping("list")
+    public Result<List<UserTagDTO>> list(@RequestParam Map<String, Object> params){
+        List<UserTagDTO> list = userTagService.list(params);
+        return new Result<List<UserTagDTO>>().ok(list);
+    }
+
     @GetMapping("{id}")
     public Result<UserTagDTO> get(@PathVariable("id") String id){
         UserTagDTO data = userTagService.get(id);

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

@@ -36,5 +36,4 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
 
     List<PartyMembersDTO> pageDIY(Map<String, Object> params);
 
-
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java

@@ -60,7 +60,7 @@ public class PartyMembersEntity extends BaseEpdcEntity {
     /**
      * 职务ID（字典表）
      */
-	private String postId;
+	private String postValue;
     /**
      * 干部下沉标识(0-否，1-是)
      */
@@ -80,7 +80,7 @@ public class PartyMembersEntity extends BaseEpdcEntity {
     /**
      * 街道ID
      */
-	private String streetId;
+	private long streetId;
     /**
      * 社区名称
      */
@@ -88,7 +88,7 @@ public class PartyMembersEntity extends BaseEpdcEntity {
     /**
      * 社区ID
      */
-	private String communityId;
+	private long communityId;
     /**
      * 网格名称
      */

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 
@@ -35,7 +36,7 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
 
     PageData<PartyMembersDTO> page(Map<String, Object> params);
 
-    PageData<PartyMembersDTO> pageDIY(Map<String, Object> params);
+    Result<PageData<PartyMembersDTO>> pageDIY(Map<String, Object> params);
 
     List<PartyMembersDTO> list(Map<String, Object> params);
 

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

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyMembersDao;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
@@ -61,10 +62,10 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     }
 
     @Override
-    public PageData<PartyMembersDTO> pageDIY(Map<String, Object> params) {
+    public Result<PageData<PartyMembersDTO>> pageDIY(Map<String, Object> params) {
-        //IPage<PartyMembersDTO> page = getPage(params);
+        IPage<PartyMembersDTO> page = getPage(params);
-
+        List<PartyMembersDTO> list = baseDao.pageDIY(params);
-        return null;
+        return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(list,page.getTotal()));
     }
 
     @Override

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

@@ -9,7 +9,7 @@
         <result property="mobile" column="MOBILE"/>
         <result property="identityNo" column="IDENTITY_NO"/>
         <result property="post" column="POST"/>
-        <result property="postId" column="POST_ID"/>
+        <result property="postValue" column="POST_VALUE"/>
         <result property="cadreFlag" column="CADRE_FLAG"/>
         <result property="registFlag" column="REGIST_FLAG"/>
         <result property="registTime" column="REGIST_TIME"/>
@@ -36,7 +36,7 @@
         <result property="mobile" column="MOBILE"/>
         <result property="identityNo" column="IDENTITY_NO"/>
         <result property="post" column="POST"/>
-        <result property="postId" column="POST_ID"/>
+        <result property="postValue" column="POST_VALUE"/>
         <result property="cadreFlag" column="CADRE_FLAG"/>
         <result property="registFlag" column="REGIST_FLAG"/>
         <result property="registTime" column="REGIST_TIME"/>
@@ -56,8 +56,41 @@
     </resultMap>
 
     <select id="pageDIY" resultMap="partyMembersDtoMap">
-        SELECT pm.*,tag.TAG_NAME,tag.TAG_DESC FROM epdc_party_members as pm, epdc_user_tag as tag,epdc_party_tag_relation as partytag
+        select pm.*,tag.TAG_NAME from epdc_party_members as pm, epdc_user_tag as tag,epdc_party_tag_relation as partytag
-        WHERE pm.ID = partytag.PARTY_ID and tag.ID = partytag.TAG_ID AND pm.DEL_FLAG = '0'
+        where 1 = 1
+        and pm.ID = partytag.PARTY_ID
+        and tag.ID = partytag.TAG_ID
+        and 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 != null and streetId != '' ">
+            and pm.STREET_ID = #{streetId}
+        </if>
+        <if test="identityNo != null and identityNo != '' ">
+            and pm.IDENTITY_NO = #{identityNo}
+        </if>
+        <if test="communityId != null and communityId != '' ">
+            and pm.COMMUNITY_ID = #{communityId}
+        </if>
+        <if test="gridId != null and gridId != '' ">
+            and pm.GRID_ID = #{gridId}
+        </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 pm.REGIST_TIME >= #{startTime}
+        </if>
+        <if test="endTime != null  ">
+            <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}
+        </if>
     </select>
 
 </mapper>