Browse Source

添加 小组审核历史列表查询

dev_shibei_match
zhaoqifeng 5 years ago
parent
commit
6f110ffab6
  1. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
  2. 6
      epmet-module/gov-grid/gov-grid-server/pom.xml
  3. 22
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
  4. 28
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
  5. 24
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
  6. 4
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
  7. 12
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java
  8. 2
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiWarmheartedService.java
  9. 13
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java
  10. 2
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java
  11. 36
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java
  12. 45
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupAuditedResultDTO.java
  13. 18
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  14. 7
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
  15. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
  16. 20
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  17. 24
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
  18. 2
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  19. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java
  20. 19
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
  21. 14
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

@ -73,4 +73,9 @@ public interface ServiceConstant {
* 消息服务 * 消息服务
*/ */
String EPMET_MESSAGE_SERVER = "epmet-message-server"; String EPMET_MESSAGE_SERVER = "epmet-message-server";
/**
* 楼院小组
*/
String RESI_GROUP_SERVER ="resi-group-server";
} }

6
epmet-module/gov-grid/gov-grid-server/pom.xml

@ -57,6 +57,12 @@
<version>2.0.0</version> <version>2.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>resi-group-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

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

@ -1,8 +1,17 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO;
import com.epmet.service.ResiGroupService;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* @Description 政府端管理楼院小组业务 * @Description 政府端管理楼院小组业务
* @ClassName ResiGroupController * @ClassName ResiGroupController
@ -12,5 +21,16 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("resi/group") @RequestMapping("resi/group")
public class ResiGroupController { public class ResiGroupController {
@Autowired
ResiGroupService resiGroupService;
/**
* 小组审核历史列表
*
* @param formDTO 参数
* @return
*/
@PostMapping("audited")
public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) {
return resiGroupService.audited(formDTO);
}
} }

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

@ -0,0 +1,28 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/4/17 15:24
*/
@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
public interface ResiGroupFeignClient {
/**
* 小组审核历史列表
*
* @param formDTO 参数
* @return Result<List < GroupAuditedResultDTO>>
*/
@PostMapping("/resi/group/group/audited")
Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO);
}

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

@ -0,0 +1,24 @@
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/4/17 15:27
*/
@Component
public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
@Override
public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "audited", formDTO);
}
}

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

@ -1,5 +1,7 @@
package com.epmet.feign.fallback; package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.ResiPartymemberFeignClient; import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
@ -17,6 +19,6 @@ import java.util.List;
public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient { public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient {
@Override @Override
public Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO) { public Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO) {
return null; return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "audited", formDTO);
} }
} }

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

@ -1,5 +1,11 @@
package com.epmet.service; package com.epmet.service;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO;
import java.util.List;
/** /**
* @Description * @Description
* @IntefaceName ResiGroupService * @IntefaceName ResiGroupService
@ -7,4 +13,10 @@ package com.epmet.service;
* @date 2020.04.16 15:40 * @date 2020.04.16 15:40
*/ */
public interface ResiGroupService { public interface ResiGroupService {
/**
* 小组审核历史列表
* @param formDTO 参数
* @return Result<List<GroupAuditedResultDTO>>
*/
Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO);
} }

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

@ -3,6 +3,7 @@ package com.epmet.service;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -12,6 +13,7 @@ import java.util.List;
* @Author wangc * @Author wangc
* @date 2020.04.16 15:37 * @date 2020.04.16 15:37
*/ */
@Service
public interface ResiWarmheartedService { public interface ResiWarmheartedService {
/** /**
* 热心居民审核历史列表 * 热心居民审核历史列表

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

@ -1,8 +1,15 @@
package com.epmet.service.impl; package com.epmet.service.impl;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO;
import com.epmet.service.ResiGroupService; import com.epmet.service.ResiGroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @Description * @Description
* @ClassName ResiGroupServiceImpl * @ClassName ResiGroupServiceImpl
@ -11,4 +18,10 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class ResiGroupServiceImpl implements ResiGroupService{ public class ResiGroupServiceImpl implements ResiGroupService{
@Autowired
private ResiGroupFeignClient resiGroupFeignClient;
@Override
public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) {
return resiGroupFeignClient.audited(formDTO);
}
} }

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

@ -6,6 +6,7 @@ import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFro
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
import com.epmet.service.ResiWarmheartedService; import com.epmet.service.ResiWarmheartedService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -15,6 +16,7 @@ import java.util.List;
* @Author wangc * @Author wangc
* @date 2020.04.16 15:41 * @date 2020.04.16 15:41
*/ */
@Service
public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
@Autowired @Autowired
private ResiPartymemberFeignClient resiPartymemberFeignClient; private ResiPartymemberFeignClient resiPartymemberFeignClient;

36
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java

@ -0,0 +1,36 @@
package com.epmet.resi.group.dto.group.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/4/17 13:39
*/
@Data
public class GroupAuditedFromDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
@NotBlank(message = "客户id不能为空")
private String customerId;
/**
* 网格id
*/
@NotBlank(message = "网格id不能为空")
private String gridId;
/**
* 页码
*/
@NotBlank(message = "页码不能为空")
private Integer pageNo;
/**
* 每页显示数量
*/
@NotBlank(message = "每页显示数量不能为空")
private Integer pageSize;
}

45
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupAuditedResultDTO.java

@ -0,0 +1,45 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/4/17 13:40
*/
@Data
public class GroupAuditedResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 小组ID
*/
private String groupId;
/**
* 小组名称
*/
private String groupName;
/**
* 小组头像
*/
private String groupHeadPhoto;
/**
* 小组介绍
*/
private String groupIntroduction;
/**
* 小组状态已驳回rejected 已通过approved
*/
private String status;
/**
* 审核时间HH:mm
*/
private Date auditedTime;
/**
* 消息通知内容
*/
private String messageText;
}

18
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@ -26,10 +26,7 @@ import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.modules.group.service.ResiGroupService; import com.epmet.modules.group.service.ResiGroupService;
import com.epmet.modules.utils.ModuleConstant; import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.CreatedResultDTO; import com.epmet.resi.group.dto.group.result.*;
import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO;
import com.epmet.resi.group.dto.group.result.MyGroupResultDTO;
import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -56,6 +53,7 @@ public class ResiGroupController {
int result = 1 / 0; int result = 1 / 0;
return new Result().ok("请求成功啦❤"); return new Result().ok("请求成功啦❤");
} }
/** /**
* @param tokenDto * @param tokenDto
* @param myGroupFormDTO * @param myGroupFormDTO
@ -220,4 +218,16 @@ public class ResiGroupController {
ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO); ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO);
return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO); return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO);
} }
/**
* 小组审核历史列表
*
* @param formDTO 参数
* @return Result<List < GroupAuditedResultDTO>>
*/
@PostMapping("audited")
public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return resiGroupService.audited(formDTO);
}
} }

7
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@ -106,4 +106,11 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
* @Date 2020/3/30 16:03 * @Date 2020/3/30 16:03
**/ **/
List<ResiGroupEntity> checkResiGroupName(ApplyCreateGroupFormDTO applyCreateGroupFormDTO); List<ResiGroupEntity> checkResiGroupName(ApplyCreateGroupFormDTO applyCreateGroupFormDTO);
/**
* 查询小组审核历史列表
* @param formDTO
* @return
*/
List<GroupAuditedResultDTO> selectAuditedGroupList(GroupAuditedFromDTO formDTO);
} }

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@ -27,10 +27,7 @@ import com.epmet.modules.group.entity.ResiGroupEntity;
import com.epmet.resi.group.dto.UserRoleDTO; import com.epmet.resi.group.dto.UserRoleDTO;
import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.ResiGroupDTO;
import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.CreatedResultDTO; import com.epmet.resi.group.dto.group.result.*;
import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO;
import com.epmet.resi.group.dto.group.result.MyGroupResultDTO;
import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -204,4 +201,11 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
* @Date 2020/4/1 0:00 * @Date 2020/4/1 0:00
**/ **/
UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId, String gridId); UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId, String gridId);
/**
* 小组审核历史列表
* @param formDTO 参数
* @return Result<List<GroupAuditedResultDTO>>
*/
Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO);
} }

20
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -33,7 +33,6 @@ import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.form.UserRoleFormDTO;
import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.dto.result.UserRoleResultDTO;
import com.epmet.modules.exception.ModuleErrorCode;
import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.dao.ResiGroupDao;
import com.epmet.modules.group.dao.ResiGroupOperationDao; import com.epmet.modules.group.dao.ResiGroupOperationDao;
@ -54,10 +53,7 @@ import com.epmet.resi.group.constant.MemberStateConstant;
import com.epmet.resi.group.dto.UserRoleDTO; import com.epmet.resi.group.dto.UserRoleDTO;
import com.epmet.resi.group.dto.group.*; import com.epmet.resi.group.dto.group.*;
import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.CreatedResultDTO; import com.epmet.resi.group.dto.group.result.*;
import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO;
import com.epmet.resi.group.dto.group.result.MyGroupResultDTO;
import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO;
import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -555,11 +551,23 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
return userRoleDTO; return userRoleDTO;
} }
@Override
public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) {
Result<List<GroupAuditedResultDTO>> result = new Result<>();
//查询条件
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
//获取审核列表
List<GroupAuditedResultDTO> resultList = baseDao.selectAuditedGroupList(formDTO);
return result.ok(resultList);
}
/** /**
* @return ResiGroupInfoRedisDTO
* @Description 将ResiGroupDTO与ResiGroupStatisticalDTO转换成ResiGroupInfoRedisDTO * @Description 将ResiGroupDTO与ResiGroupStatisticalDTO转换成ResiGroupInfoRedisDTO
* @Param ResiGroupDTO * @Param ResiGroupDTO
* @Param ResiGroupStatisticalDTO * @Param ResiGroupStatisticalDTO
* @return ResiGroupInfoRedisDTO
* @Author wangc * @Author wangc
* @Date 2020.04.13 16:36 * @Date 2020.04.13 16:36
**/ **/

24
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@ -191,4 +191,28 @@
AND rg.GRID_ID = #{gridId} AND rg.GRID_ID = #{gridId}
AND rg.STATE in('approved','under_auditting') AND rg.STATE in('approved','under_auditting')
</select> </select>
<!-- 小组审核历史 -->
<select id="selectAuditedGroupList" parameterType="com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO"
resultType="com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO">
SELECT
rg.ID AS "groupId",
rg.GROUP_HEAD_PHOTO AS "groupHeadPhoto",
rg.GROUP_NAME AS "groupName",
rg.GROUP_INTRODUCTION AS "groupIntroduction",
rgo.STATE AS "status",
rgo.MESSAGE_TEXT AS "messageText",
rgo.UPDATED_TIME AS "auditedTime"
FROM
resi_group rg
INNER JOIN resi_group_operation rgo ON rg.ID = rgo.RESI_GROUP_ID
WHERE rg.CUSTOMER_ID = #{customerId}
AND rg.GRID_ID = #{gridId}
AND (rgo.STATE = 'approved' OR rgo.STATE = 'rejected')
AND rg.DEL_FLAG = '0'
AND rgo.DEL_FLAG = '0'
ORDER BY
rgo.UPDATED_TIME DESC
LIMIT #{pageNo}, #{pageSize}
</select>
</mapper> </mapper>

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

@ -56,7 +56,7 @@ public interface EpmetUserFeignClient {
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.UserResiInfoDTO>> * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.UserResiInfoDTO>>
* @Date 2020/4/7 18:24 * @Date 2020/4/7 18:24
**/ **/
@PostMapping("getuserresiinfolist") @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO); Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
} }

6
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java

@ -18,12 +18,14 @@
package com.epmet.modules.warmhearted.dao; package com.epmet.modules.warmhearted.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO; import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
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.ResiWarmheartedFormDTO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* 热心居民申请表 * 热心居民申请表
* *
@ -40,4 +42,6 @@ public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEnt
*/ */
ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO); ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
List<ResiWarmheartedApplyEntity> selectAuditedApplyList(ResiWarmheartedAuditedFromDTO params);
} }

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

@ -246,11 +246,10 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
Result<List<ResiWarmheartedAuditedResultDTO>> result = new Result<>(); Result<List<ResiWarmheartedAuditedResultDTO>> result = new Result<>();
List<ResiWarmheartedAuditedResultDTO> resultList = new ArrayList<>(); List<ResiWarmheartedAuditedResultDTO> resultList = new ArrayList<>();
//查询条件 //查询条件
ResiWarmheartedApplyDTO applyDTO = ConvertUtils.sourceToTarget(formDTO, ResiWarmheartedApplyDTO.class); int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
applyDTO.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); formDTO.setPageNo(pageIndex);
//获取审核列表 //获取审核列表
List<ResiWarmheartedApplyEntity> applyList = List<ResiWarmheartedApplyEntity> applyList = baseDao.selectAuditedApplyList(formDTO);
baseDao.selectList(getWrapper(applyDTO).orderByDesc("UPDATED_TIME"));
if (null == applyList || applyList.size() == 0) { if (null == applyList || applyList.size() == 0) {
return result.ok(resultList); return result.ok(resultList);
} }
@ -280,16 +279,4 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
return result.ok(resultList); 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;
}
} }

14
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml

@ -56,6 +56,20 @@
AND rw.audit_status != #{auditStatus} AND rw.audit_status != #{auditStatus}
</if> </if>
</select> </select>
<select id="selectAuditedApplyList"
parameterType="com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO"
resultType="com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity">
SELECT
*
FROM
resi_warmhearted_apply
WHERE customer_id = #{customerId}
AND grid_id = #{gridId}
AND audit_status != 'under_auditting'
AND DEL_FLAG = 0
ORDER BY UPDATED_TIME DESC
LIMIT #{pageNo}, #{pageSize}
</select>
</mapper> </mapper>
Loading…
Cancel
Save