党员相关

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

@@ -90,4 +90,6 @@ public class PartyMembersDTO implements Serializable {
 
 	private String[] allDeptIds;
 
+	private String partyOrganization;
+
 }

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

@@ -23,6 +23,7 @@ import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import com.alibaba.fastjson.JSON;
 import com.elink.esua.epdc.async.PartyTask;
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 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;
@@ -69,7 +70,7 @@ public class PartyMembersController {
 //    private PartyTask partyTask;
 
     @GetMapping("page")
-    @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND",userId = FieldConstant.CREATED_BY)
     public Result<PageData<PartyMembersDTO>> page(@RequestParam Map<String, Object> params) {
         String realName = (String) params.get("realName");
         String mobile = (String) params.get("mobile");
@@ -143,7 +144,7 @@ public class PartyMembersController {
     }
 
     @GetMapping("export")
-    @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", userId = FieldConstant.CREATED_BY)
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<PartyMembersDTO> list = partyMembersService.list(params);
 

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

@@ -104,4 +104,10 @@ public class PartyMembersEntity extends BaseEpdcEntity {
 	 *父所有部门
 	 */
 	private String parentDeptIds;
+
+	/***
+	 * 所在党委
+	 */
+	private String partyOrganization;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java

@@ -60,4 +60,7 @@ public class PartyMembersExcel {
 
     @Excel(name = "网格")
     private String gridName;
+
+    @Excel(name = "所在党组织")
+    private String  partyOrganization;
 }

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

@@ -289,35 +289,15 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         partyMembersDto.setRealName("王小花");
         partyMembersDto.setMobile("13000000000");
         partyMembersDto.setIdentityNo("370681199903038473");
-        partyMembersDto.setPost("");
-        partyMembersDto.setCadreFlag("下沉");
-        partyMembersDto.setRegistFlag("是");
-        partyMembersDto.setRegistTime(new Date());
-        partyMembersDto.setStreetName("水清沟街道党工委");
-        partyMembersDto.setCommunityName("九江社区党委");
-        partyMembersDto.setGridName("第一网格支部");
+        partyMembersDto.setPartyOrganization("辽宁路党工委****");
         PartyMembersDTO partyMembersDtoTwo = new PartyMembersDTO();
         partyMembersDtoTwo.setRealName("徐小明");
         partyMembersDtoTwo.setMobile("13000000001");
         partyMembersDtoTwo.setIdentityNo("37068119499030542");
-        partyMembersDtoTwo.setPost("");
-        partyMembersDtoTwo.setCadreFlag("不下沉");
-        partyMembersDtoTwo.setRegistFlag("否");
-        partyMembersDtoTwo.setRegistTime(new Date());
-        partyMembersDtoTwo.setStreetName("水清沟街道党工委");
-        partyMembersDtoTwo.setCommunityName("九江社区党委");
-        partyMembersDtoTwo.setGridName("第一网格支部");
         PartyMembersDTO partyMembersDtoThrid = new PartyMembersDTO();
         partyMembersDtoThrid.setRealName("王红");
         partyMembersDtoThrid.setMobile("");
         partyMembersDtoThrid.setIdentityNo("37068119499032541");
-        partyMembersDtoThrid.setPost("");
-        partyMembersDtoThrid.setCadreFlag("");
-        partyMembersDtoThrid.setRegistFlag("");
-        partyMembersDtoThrid.setRegistTime(null);
-        partyMembersDtoThrid.setStreetName("");
-        partyMembersDtoThrid.setCommunityName("");
-        partyMembersDtoThrid.setGridName("");
         partyMembersDTOList.add(partyMembersDto);
         partyMembersDTOList.add(partyMembersDtoTwo);
         partyMembersDTOList.add(partyMembersDtoThrid);

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

@@ -36,6 +36,7 @@
         pm.ID,pm.IDENTITY_NO,pm.MOBILE,pm.POST,
         pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,pm.REGIST_TIME,
         pm.REVISION,
+        pm.PARTY_ORGANIZATION,
         GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME,
         pm.ALL_DEPT_NAMES as allDeptNames
         FROM