Merge branch 'feature/dangjian'

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

@@ -19,7 +19,9 @@ package com.elink.esua.epdc.user.dto.party;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -42,16 +44,19 @@ public class ReportPartyDTO implements Serializable {
     /**
      * 党员姓名
      */
+    @NotBlank(message = "姓名不能为空")
     private String name;
 
     /**
      * 身份证号码
      */
+    @NotBlank(message = "身份证号码不能为空")
     private String idCard;
 
     /**
      * 联系电话
      */
+    @NotBlank(message = "手机号码不能为空")
     private String mobile;
 
     /**
@@ -72,11 +77,13 @@ public class ReportPartyDTO implements Serializable {
     /**
      * 居住小区名称
      */
+    @NotBlank(message = "小区名称不能为空")
     private String homeName;
 
     /**
      * 现工作单位
      */
+    @NotBlank(message = "现工作单位不能为空")
     private String workUnit;
 
     /**
@@ -97,21 +104,25 @@ public class ReportPartyDTO implements Serializable {
     /**
      * 是否党员 0、否  1、是
      */
+    @NotBlank(message = "是否党员不能为空")
     private Integer party;
 
     /**
      * 是否愿意加入志愿者 0、否  1、是
      */
+    @NotBlank(message = "是否愿意加入志愿者不能为空")
     private Integer volunteer;
 
     /**
      * 是否愿意加入网格员 0、否 1、是
      */
+    @NotBlank(message = "是否愿意加入网格员不能为空")
     private Integer gridStaff;
 
     /**
      * 是否愿意加入业务委员会 0、否  1、是
      */
+    @NotBlank(message = "是否愿意加入业务委员会不能为空")
     private Integer owners;
 
     /**
@@ -147,5 +158,11 @@ public class ReportPartyDTO implements Serializable {
     /**
      * 包联社区
      */
+    @NotBlank(message = "包联单位不能为空")
     private String[] couplingCommunity;
+
+    /**
+     * 报到时间
+     */
+    private Date createdTime;
 }

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

@@ -104,7 +104,7 @@ public class ReportPartyController {
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ReportPartyDTO> list = reportPartyService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, ReportPartyExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "在职党员报道明细表", list, ReportPartyExcel.class);
     }
 
 }

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

@@ -22,6 +22,8 @@ import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 党员报道
  *
@@ -124,4 +126,9 @@ public class ReportPartyEntity extends DeptScope {
      * 包联社区
      */
     private String couplingCommunity;
+
+    /**
+     * 报到时间
+     */
+    private Date createdTime;
 }

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

@@ -20,6 +20,8 @@ package com.elink.esua.epdc.party.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 党员报道
  *
@@ -38,8 +40,8 @@ public class ReportPartyExcel {
     @Excel(name = "联系电话")
     private String mobile;
 
-    @Excel(name = "社区id")
+    @Excel(name = "社区名称")
-    private Long deptId;
+    private String allDeptNames;
 
     @Excel(name = "居住小区名称")
     private String homeName;
@@ -53,19 +55,22 @@ public class ReportPartyExcel {
     @Excel(name = "工作单位行业")
     private String workIndustry;
 
+    @Excel(name = "报到时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date createdTime;
+
     @Excel(name = "特长")
     private String specialty;
 
-    @Excel(name = "是否党员 0、否  1、是")
+    @Excel(name = "是否党员", replace = {"否_0", "是_1"})
     private Integer party;
 
-    @Excel(name = "是否愿意加入志愿者 0、否  1、是")
+    @Excel(name = "是否愿意加入志愿者", replace = {"否_0", "是_1"})
     private Integer volunteer;
 
-    @Excel(name = "是否愿意加入网格员 0、否 1、是")
+    @Excel(name = "是否愿意加入网格员", replace = {"否_0", "是_1"})
     private Integer gridStaff;
 
-    @Excel(name = "是否愿意加入业务委员会 0、否  1、是")
+    @Excel(name = "是否愿意加入业务委员会", replace = {"否_0", "是_1"})
     private Integer owners;
 
 }

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

@@ -83,11 +83,13 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
         String name = (String) params.get(FieldConstant.NAME_HUMP);
         String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
         String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        String deptId = (String) params.get("deptId");
         QueryWrapper<ReportPartyEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
         wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name);
         wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard);
         wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile);
+        wrapper.likeLeft(StringUtils.isNotBlank(deptId), "PARENT_DEPT_IDS", deptId);
         return wrapper;
     }
 
@@ -172,7 +174,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
 
     @Override
     public int findByIdCardAndName(String idCard, String name) {
-       return baseDao.findByIdCardAndName(idCard, name);
+        return baseDao.findByIdCardAndName(idCard, name);
     }
 
     private void setDeptId(ReportPartyDTO dto) {
@@ -181,5 +183,4 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
         dto.setDeptId(user.getDeptId());
         dto.setAllDeptIds(new String[]{deptId});
     }
-
 }