添加 热心居民审核历史

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java

@@ -1,8 +1,17 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
+import com.epmet.service.ResiWarmheartedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description 政府端管理热心居民业务
  * @ClassName ResiWarmheartedController
@@ -13,4 +22,18 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("resi/warmhearted")
 public class ResiWarmheartedController {
 
+	@Autowired
+	private ResiWarmheartedService resiWarmheartedService;
+
+	/**
+	 * 热心居民审核历史列表
+	 *
+	 * @param formDTO 参数
+	 * @return
+	 */
+	@PostMapping("audited")
+	public Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) {
+		return resiWarmheartedService.audited(formDTO);
+	}
+
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java

@@ -0,0 +1,31 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 调用epmet-user服务
+ *
+ * @author 赵奇风
+ */
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class,
+        url = "http://localhost:8096")
+public interface ResiPartymemberFeignClient {
+	/**
+	 * 居民端-热心居民申请-提交申请数据
+	 *
+	 * @author zhaoqf
+	 **/
+	@PostMapping(value = "resi/partymember/resiwarmheartedapply/audited")
+	Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO);
+
+
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java

@@ -0,0 +1,22 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/16 17:01
+ */
+@Component
+public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient {
+	@Override
+	public Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO) {
+		return null;
+	}
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiWarmheartedService.java

@@ -1,5 +1,11 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
+
+import java.util.List;
+
 /**
  * @Description
  * @IntefaceName ResiWarmheartedService
@@ -7,4 +13,10 @@ package com.epmet.service;
  * @date 2020.04.16 15:37
  */
 public interface ResiWarmheartedService {
+	/**
+	 * 热心居民审核历史列表
+	 * @param formDTO 参数
+	 * @return ResiWarmheartedAuditedResultDTO
+	 */
+	Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO);
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java

@@ -1,6 +1,13 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import com.epmet.service.ResiWarmheartedService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 /**
  * @Description
@@ -9,4 +16,11 @@ import com.epmet.service.ResiWarmheartedService;
  * @date 2020.04.16 15:41
  */
 public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
+	@Autowired
+	private ResiPartymemberFeignClient resiPartymemberFeignClient;
+
+	@Override
+	public Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO) {
+		return resiPartymemberFeignClient.audited(formDTO);
+	}
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditedFromDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.resi.partymember.dto.warmhearted.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 热心居民-审核历史请求参数
+ * @date 2020/4/16 13:51
+ */
+@Data
+public class ResiWarmheartedAuditedFromDTO implements Serializable {
+	private static final long serialVersionUID = -7290137219142856024L;
+	/**
+	 * 客户id
+	 */
+	private String customerId;
+	/**
+	 * 网格id
+	 */
+	private String gridId;
+	/**
+	 * 页码
+	 */
+	private Integer pageNo;
+	/**
+	 * 每页显示数量
+	 */
+	private Integer pageSize;
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedAuditedResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.resi.partymember.dto.warmhearted.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 热心居民-审核历史返回值
+ * @date 2020/4/16 13:52
+ */
+@Data
+public class ResiWarmheartedAuditedResultDTO implements Serializable {
+	private static final long serialVersionUID = 4109086860497055842L;
+	/**
+	 * 申请单id
+	 */
+	private String applyId;
+	/**
+	 * 申请用户id
+	 */
+	private String userId;
+	/**
+	 * 申请用户头像
+	 */
+	private String userHeadPhoto;
+	/**
+	 * 申请用户显示昵称
+	 */
+	private String userNickName;
+	/**
+	 * 申请时间HH:mm
+	 */
+	private Date applyTime;
+	/**
+	 * 已驳回rejected ，已通过approved
+	 */
+	private String status;
+	/**
+	 * 消息通知内容
+	 */
+	private String messageText;
+
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -5,22 +5,27 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * @author zhaoqifeng
  * @dscription
  * @date 2020/3/30 14:51
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "http" +
+		"://localhost:8087")
 public interface EpmetUserFeignClient {
 
 	/**
 	 * 查询用户注册信息
+	 *
 	 * @param userResiInfoFormDTO 参数
 	 * @return Result<UserResiInfoDTO>
 	 */
@@ -29,11 +34,12 @@ public interface EpmetUserFeignClient {
 
 	/**
 	 * 党员认证时，如果没有注册居民，则注册居民信息
+	 *
 	 * @param userResiInfoDTO
 	 * @author zhaoqifeng
 	 **/
 	@PostMapping("/epmetuser/userresiinfo/saveResiInfo")
-	Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO);
+	Result saveResiInfo(@RequestBody UserResiInfoDTO userResiInfoDTO);
 
 	/**
 	 * 添加用户角色关系
@@ -44,4 +50,14 @@ public interface EpmetUserFeignClient {
 	@PostMapping("/epmetuser/userrole/saveUserRole")
 	Result saveUserRole(@RequestBody UserRoleDTO userRoleDTO);
 
+	/**
+	 * 根据userId集合查询用户注册信息
+	 *
+	 * @param userResiInfoListFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.UserResiInfoDTO>>
+	 * @Date 2020/4/7 18:24
+	 **/
+	@PostMapping("getuserresiinfolist")
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -6,10 +6,13 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @author zhaoqifeng
  * @dscription
@@ -31,4 +34,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 	public Result saveUserRole(UserRoleDTO userRoleDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveUserRole", userRoleDTO);
 	}
+
+	@Override
+	public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
+	}
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java

@@ -29,8 +29,10 @@ import com.epmet.modules.warmhearted.excel.ResiWarmheartedApplyExcel;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -110,4 +112,15 @@ public class ResiWarmheartedApplyController {
 		return resiWarmheartedApplyService.manageAudit(formDTO);
 	}
 
+	/**
+	 * 热心居民审核历史列表
+	 *
+	 * @param formDTO 参数
+	 * @return
+	 */
+	@PostMapping("audited")
+	public Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) {
+		return resiWarmheartedApplyService.audited(formDTO);
+	}
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java

@@ -23,8 +23,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 
 import java.util.List;
@@ -124,4 +126,11 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
      * @author sun
      */
     Result manageAudit(ResiWarmheartedAuditFormDTO formDTO);
+
+    /**
+     * 热心居民审核历史列表
+     * @param formDTO 参数
+     * @return ResiWarmheartedAuditedResultDTO
+     */
+    Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -19,7 +19,6 @@ package com.epmet.modules.warmhearted.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
@@ -33,9 +32,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
-import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
@@ -44,21 +43,23 @@ import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
-
+import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 热心居民申请表
@@ -176,7 +177,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		if (null != resiWarmheartedApplyDTO) {
 			logger.error(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
 			throw new RenException(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
-        }else{
+		} else {
 			//1:将申请记录存入热心居民申请表中
 			saveResiWarmApply(formDTO);
 			//2:将最后一次操作行为更新到热心居民申请行为记录表中
@@ -239,4 +240,56 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		}
 		return result;
 	}
+
+	@Override
+	public Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO) {
+		Result<List<ResiWarmheartedAuditedResultDTO>> result = new Result<>();
+		List<ResiWarmheartedAuditedResultDTO> resultList = new ArrayList<>();
+		//查询条件
+		ResiWarmheartedApplyDTO applyDTO = ConvertUtils.sourceToTarget(formDTO, ResiWarmheartedApplyDTO.class);
+		applyDTO.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING);
+		//获取审核列表
+		List<ResiWarmheartedApplyEntity> applyList =
+                baseDao.selectList(getWrapper(applyDTO).orderByDesc("UPDATED_TIME"));
+		if (null == applyList || applyList.size() == 0) {
+			return result.ok(resultList);
+		}
+		//提取所有userID
+		List<String> userIds =
+				applyList.stream().map(ResiWarmheartedApplyEntity::getUserId).collect(Collectors.toList());
+		//获取用户昵称，头像
+		UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
+		userResiInfoListFormDTO.setUserIdList(userIds);
+		List<UserResiInfoResultDTO> userResiInfoList =
+				epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO).getData();
+        if (null == userResiInfoList || userResiInfoList.size() == 0) {
+            return result.ok(resultList);
+        }
+		resultList = applyList.stream().flatMap(apply -> userResiInfoList.stream().filter(user ->
+                apply.getUserId().equals(user.getUserId())).map(userInfo -> {
+					ResiWarmheartedAuditedResultDTO resultDTO = new ResiWarmheartedAuditedResultDTO();
+					resultDTO.setApplyId(apply.getId());
+					resultDTO.setUserId(apply.getUserId());
+					resultDTO.setStatus(apply.getAuditStatus());
+					resultDTO.setApplyTime(apply.getUpdatedTime());
+					resultDTO.setMessageText(apply.getMessageText());
+					resultDTO.setUserNickName(userInfo.getShowName());
+					resultDTO.setUserHeadPhoto(userInfo.getHeadPhoto());
+					return resultDTO;
+				})).collect(Collectors.toList());
+
+		return result.ok(resultList);
+	}
+
+	private QueryWrapper<ResiWarmheartedApplyEntity> getWrapper(ResiWarmheartedApplyDTO params) {
+		String customerId = params.getCustomerId();
+		String gridId = params.getGridId();
+		String auditStatus = params.getAuditStatus();
+		QueryWrapper<ResiWarmheartedApplyEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId)
+				.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId)
+				.ne(StringUtils.isNotBlank(auditStatus), "AUDIT_STATUS", auditStatus);
+
+		return wrapper;
+	}
 }