福利人员增加发放标识、福利类别名称

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java

@@ -1,6 +1,8 @@
 package com.epmet.dto;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,7 +18,7 @@ import java.util.Date;
 public class ChangeWelfareDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    public interface AddUserShowGroup extends CustomerClientShowGroup {}
     /**
      * 主键
      */
@@ -116,4 +118,14 @@ public class ChangeWelfareDTO implements Serializable {
      * 是否享受福利，1是 0否 空是
      */
     private String isWelfare;
+
+    /**
+     * 福利发放标识：1：已发放；0：未发放
+     */
+    private Integer grantFlag;
+    /**
+     * 福利类别
+     */
+    @Length(max = 100,message = "福利类别最多输入100字",groups = AddUserShowGroup.class)
+    private String categoryName;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java

@@ -72,6 +72,14 @@ public class ChangeWelfareEntity extends BaseEpmetEntity {
      * 移除原因
      */
 	private String removeReason;
+	/**
+	 * 福利发放标识：1：已发放；0：未发放
+	 */
+	private Integer grantFlag;
+	/**
+	 * 福利类别
+	 */
+	private String categoryName;
 
     /**
      * 客户ID

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java

@@ -21,13 +21,13 @@ public class ChangeWelfareExcel {
 //    @Excel(name = "epmet网格ID")
 //    private String gridId;
 
-    @Excel(name = "姓名")
+    @Excel(name = "姓名",width = 20)
     private String name;
 
-    @Excel(name = "证件号")
+    @Excel(name = "证件号",width = 20)
     private String idCard;
 
-    @Excel(name = "手机号")
+    @Excel(name = "手机号",width = 20)
     private String mobile;
 
     @Excel(name = "性别",replace = { "男_1", "女_0", "女_2", " _null"} )
@@ -36,8 +36,18 @@ public class ChangeWelfareExcel {
 //    @Excel(name = "类型")
 //    private String type;
 //
-    @Excel(name = "加入时间")
+    @Excel(name = "加入时间",width = 25)
     private String joinDate;
+    /**
+     * 福利发放标识：1：已发放；0：未发放
+     */
+    @Excel(name = "福利发放",replace = { "已发放_1", "未发放_0", "_null"},width = 20)
+    private Integer grantFlag;
+    /**
+     * 福利类别
+     */
+    @Excel(name = "福利类别",width = 120)
+    private String categoryName;
 //
 //    @Excel(name = "加入原因")
 //    private String joinReason;

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java

@@ -33,6 +33,16 @@ public class ChangeWelfareImportExcel {
 
 //    @Excel(name = "客户ID")
 //    private String customerId;
+    /**
+     * 福利发放标识：1：已发放；0：未发放
+     */
+    @Excel(name = "福利发放",replace = { "已发放_1", "未发放_0", "_null"})
+    private Integer grantFlag;
+    /**
+     * 福利类别
+     */
+    @Excel(name = "福利类别")
+    private String categoryName;
 
     @ExcelIgnore
     private Boolean addStatus = false;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java

@@ -21,7 +21,7 @@ import java.util.Map;
 public interface ChangeWelfareService extends BaseService<ChangeWelfareEntity> {
 
     /**
-     * 默认分页
+     * 福利人员管理-分页查询
      *
      * @param params
      * @return PageData<ChangeWelfareDTO>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java

@@ -16,10 +16,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.ExcelPoiUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
@@ -38,7 +35,6 @@ import com.epmet.entity.ChangeWelfareEntity;
 import com.epmet.excel.ChangeWelfareImportExcel;
 import com.epmet.excel.error.ChangeWelfareErrorExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
-import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.redis.ChangeWelfareRedis;
 import com.epmet.service.ChangeWelfareService;
@@ -88,12 +84,15 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
     @Autowired
     private OssFeignClient ossFeignClient;
 
-    @Autowired
-    private GovOrgFeignClient govOrgFeignClient;
-
     @Autowired
     private IcResiUserDao icResiUserDao;
 
+    /**
+     * 福利人员管理-分页查询
+     *
+     * @param params
+     * @return
+     */
     @Override
     public PageData<ChangeWelfareDTO> page(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
@@ -137,6 +136,12 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
         return ConvertUtils.sourceToTarget(entity, ChangeWelfareDTO.class);
     }
 
+    /**
+     * 新增福利人员
+     *
+     * @param dto
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result save(ChangeWelfareDTO dto) {
@@ -147,7 +152,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
         formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
         RentTenantDataResultDTO result = icResiUserServiceImpl.getRentResiUserInfo(formDTO);
-
+        // 入参里的idCard、mobile加密的，这里重新赋值了
         dto.setIdCard(result.getIdCard());
         dto.setMobile(result.getMobile());
         dto.setGridId(result.getGridId());
@@ -163,6 +168,11 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
         return new Result();
     }
 
+    /**
+     * 修改福利人员
+     *
+     * @param dto
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ChangeWelfareDTO dto) {
@@ -177,12 +187,19 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 移除福利人员
+     *
+     * @param dto
+     * @return
+     */
     @Override
     public Result removeWelfare(ChangeWelfareDTO dto) {
         if (StringUtils.isBlank(dto.getId())) {
             return new Result().error("id不可为空");
         }
         dto.setRemoveDate(DateUtils.format(new Date()));
+        dto.setUpdatedBy(EpmetRequestHolder.getLoginUserId());
         baseDao.removeWelfare(dto);
         return new Result().ok("移除成功");
     }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.94__pli_change_welfare.sql

@@ -0,0 +1,4 @@
+ALTER TABLE pli_change_welfare ADD COLUMN GRANT_FLAG TINYINT ( 1 ) DEFAULT 0
+ COMMENT '福利发放标识：1：已发放；0：未发放' AFTER  REMOVE_REASON;
+ALTER TABLE pli_change_welfare ADD COLUMN CATEGORY_NAME VARCHAR(255) DEFAULT ''
+    COMMENT '福利类别' AFTER  GRANT_FLAG;

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml

@@ -40,7 +40,9 @@
         w.REMOVE_DATE,
         w.REMOVE_REASON,
         w.CREATED_TIME,
-        w.UPDATED_TIME
+        w.UPDATED_TIME,
+        w.GRANT_FLAG,
+        w.CATEGORY_NAME
         FROM
         pli_change_welfare w
         LEFT JOIN ic_resi_user u ON u.ID_CARD = w.ID_CARD and u.DEL_FLAG = '0'
@@ -68,6 +70,12 @@
         <if test="endTime != null and endTime != ''">
             AND w.JOIN_DATE &lt;= #{endTime}
         </if>
+        <if test="categoryName != null and categoryName != ''">
+            AND w.CATEGORY_NAME  like concat('%',#{categoryName},'%')
+        </if>
+        <if test="grantFlag != null">
+            AND w.GRANT_FLAG = #{grantFlag}
+        </if>
         order by w.CREATED_TIME desc
     </select>
 
@@ -76,12 +84,14 @@
         where ID_CARD=#{idCard}
               and del_flag='0'
     </select>
-
+    <!-- 移除福利人员 -->
     <update id="removeWelfare">
         update pli_change_welfare
             set REMOVE_DATE=#{removeDate},
                 REMOVE_REASON=#{removeReason},
-                del_flag='1'
+                del_flag='1',
+                UPDATED_BY = #{updatedBy},
+                UPDATED_TIME = #{removeDate}
             where del_flag='0'
         <if test="id != null and id != ''">
             AND ID = #{id}