Browse Source

Merge branch 'dev'

dev_shibei_match
sunyuchao 5 years ago
parent
commit
9c9ed18368
  1. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
  2. 14
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java
  3. 7
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/UserAnalysisService.java
  4. 53
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
  5. 8
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
  6. 4
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
  7. 5
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
  8. 77
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@ -81,4 +81,6 @@ public interface StrConstant {
String MIN="MIN";
String MAX="MAX";
String SPECIAL_CUSTOMER = "150282ed25c14ff0785e7e06283b6283";
}

14
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java

@ -1,5 +1,7 @@
package com.epmet.datareport.controller.user;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.user.UserIncrTrendFormDTO;
@ -50,9 +52,9 @@ public class UserAnalysisController {
* @Date 2020/6/22 13:30
**/
@PostMapping("subagency")
public Result<List<UserSubAgencyResultDTO>> subAgency(@RequestBody UserSubAgencyFormDTO formDTO) {
public Result<List<UserSubAgencyResultDTO>> subAgency(@LoginUser TokenDto tokenDto, @RequestBody UserSubAgencyFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO,UserSubAgencyFormDTO.AddUserInternalGroup.class);
List<UserSubAgencyResultDTO> userSubAgencyResultDTO = userService.subAgency(formDTO);
List<UserSubAgencyResultDTO> userSubAgencyResultDTO = userService.subAgency(tokenDto, formDTO);
return new Result<List<UserSubAgencyResultDTO>>().ok(userSubAgencyResultDTO);
}
@ -64,9 +66,9 @@ public class UserAnalysisController {
* @Date 2020/6/22 13:33
**/
@PostMapping("subgrid")
public Result<List<UserSubGridResultDTO>> subGrid(@RequestBody UserSubGridFormDTO formDTO) {
public Result<List<UserSubGridResultDTO>> subGrid(@LoginUser TokenDto tokenDto, @RequestBody UserSubGridFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, UserSubGridFormDTO.AddUserInternalGroup.class);
List<UserSubGridResultDTO> userSubGridResultDTO = userService.subGrid(formDTO);
List<UserSubGridResultDTO> userSubGridResultDTO = userService.subGrid(tokenDto, formDTO);
return new Result<List<UserSubGridResultDTO>>().ok(userSubGridResultDTO);
}
@ -78,9 +80,9 @@ public class UserAnalysisController {
* @Date 2020/6/22 13:36
**/
@PostMapping("incrtrend")
public Result<List<UserIncrTrendResultDTO>> incrTrend(@RequestBody UserIncrTrendFormDTO formDTO) {
public Result<List<UserIncrTrendResultDTO>> incrTrend(@LoginUser TokenDto tokenDto, @RequestBody UserIncrTrendFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, UserIncrTrendFormDTO.AddUserInternalGroup.class);
List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrendV2(formDTO);
List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrendV2(tokenDto, formDTO);
return new Result<List<UserIncrTrendResultDTO>>().ok(userIncrTrendResultDTO);
}

7
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/UserAnalysisService.java

@ -1,6 +1,7 @@
package com.epmet.datareport.service.user;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dto.form.user.UserIncrTrendFormDTO;
import com.epmet.dto.form.user.UserSubAgencyFormDTO;
import com.epmet.dto.form.user.UserSubGridFormDTO;
@ -32,7 +33,7 @@ public interface UserAnalysisService {
* @description 直属机关柱状图查询
* @Date 2020/6/22 13:42
**/
List<UserSubAgencyResultDTO> subAgency(UserSubAgencyFormDTO formDTO);
List<UserSubAgencyResultDTO> subAgency(TokenDto tokenDto, UserSubAgencyFormDTO formDTO);
/**
* @param formDTO
@ -41,7 +42,7 @@ public interface UserAnalysisService {
* @description 直属网格柱状图查询
* @Date 2020/6/22 13:42
**/
List<UserSubGridResultDTO> subGrid(UserSubGridFormDTO formDTO);
List<UserSubGridResultDTO> subGrid(TokenDto tokenDto, UserSubGridFormDTO formDTO);
/**
* @param formDTO
@ -60,7 +61,7 @@ public interface UserAnalysisService {
* @description 按日按月查询注册用户数参与用户数增量折线图
* @Date 2020/6/22 13:42
**/
List<UserIncrTrendResultDTO> incrTrendV2(UserIncrTrendFormDTO formDTO);
List<UserIncrTrendResultDTO> incrTrendV2(TokenDto tokenDto, UserIncrTrendFormDTO formDTO);
/**
* @return com.epmet.dto.result.user.UserAgencyInfoResultDTO

53
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java

@ -2,7 +2,9 @@ package com.epmet.datareport.service.user.impl;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
@ -74,6 +76,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
logger.info(String.format("用户%s的所属机关id为%s",loginUserDetailsFormDTO.getUserId(),result.getData().getAgencyId()));
return result.getData().getAgencyId();
}
/**
* @param formDTO
* @return com.epmet.user.result.UserSummaryInfoResultDTO
@ -120,11 +123,11 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
* @Date 2020/6/22 13:42
**/
@Override
public List<UserSubAgencyResultDTO> subAgency(UserSubAgencyFormDTO formDTO) {
public List<UserSubAgencyResultDTO> subAgency(TokenDto tokenDto, UserSubAgencyFormDTO formDTO) {
//获取用户所属机关id
String myAgencyId = this.getMyAgency();
//初始化横坐标(用户所机关的下级机关列表)
List<UserSubAgencyResultDTO> dimList = this.initUserSubAgencyResultDTO(myAgencyId);
List<UserSubAgencyResultDTO> dimList = this.initUserSubAgencyResultDTO(tokenDto.getCustomerId(), myAgencyId);
if(CollectionUtils.isEmpty(dimList)){
logger.info(String.format("当前机关(agencyId=%s)下没有下级机关",myAgencyId));
return new ArrayList<>();
@ -199,7 +202,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
return dimList;
}
private List<UserSubAgencyResultDTO> initUserSubAgencyResultDTO(String myAgencyId) {
private List<UserSubAgencyResultDTO> initUserSubAgencyResultDTO(String customerId, String myAgencyId) {
List<UserSubAgencyResultDTO> list=new ArrayList<>();
List<DimAgencyDTO> dimAgencyDTOS=userAnalysisDao.selectSubAgencyList(myAgencyId);
for(DimAgencyDTO agencyDTO:dimAgencyDTOS){
@ -208,7 +211,11 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
resi.setAgencyId(agencyDTO.getId());
resi.setName(agencyDTO.getAgencyName());
resi.setValue(NumConstant.ZERO);
resi.setType(UserAnalysisConstant.REGISTERED_RESI);
if (StrConstant.SPECIAL_CUSTOMER.equals(customerId)) {
resi.setType("学员");
} else {
resi.setType(UserAnalysisConstant.REGISTERED_RESI);
}
resi.setTotal(NumConstant.ZERO);
list.add(resi);
//热心居民
@ -216,7 +223,11 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
warm.setAgencyId(agencyDTO.getId());
warm.setName(agencyDTO.getAgencyName());
warm.setValue(NumConstant.ZERO);
warm.setType(UserAnalysisConstant.WARMHEARTED);
if (StrConstant.SPECIAL_CUSTOMER.equals(customerId)) {
warm.setType("组长");
} else {
warm.setType(UserAnalysisConstant.WARMHEARTED);
}
warm.setTotal(NumConstant.ZERO);
list.add(warm);
//党员
@ -239,11 +250,11 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
* @Date 2020/6/22 13:42
**/
@Override
public List<UserSubGridResultDTO> subGrid(UserSubGridFormDTO formDTO) {
public List<UserSubGridResultDTO> subGrid(TokenDto tokenDto, UserSubGridFormDTO formDTO) {
//获取用户所属机关id
String myAgencyId = this.getMyAgency();
//初始化横坐标(用户所机关的直属网格)
List<UserSubGridResultDTO> dimList = this.initUserSubGridResultDTO(myAgencyId);
List<UserSubGridResultDTO> dimList = this.initUserSubGridResultDTO(tokenDto.getCustomerId(), myAgencyId);
if(CollectionUtils.isEmpty(dimList)){
logger.info(String.format("当前机关(agencyId=%s)下没有网格",myAgencyId));
return new ArrayList<>();
@ -315,7 +326,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
return dimList;
}
private List<UserSubGridResultDTO> initUserSubGridResultDTO(String myAgencyId) {
private List<UserSubGridResultDTO> initUserSubGridResultDTO(String customerId, String myAgencyId) {
List<UserSubGridResultDTO> list=new ArrayList<>();
List<DimGridDTO> gridList=userAnalysisDao.selectSubGridList(myAgencyId);
for(DimGridDTO grid:gridList){
@ -324,7 +335,11 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
resi.setGridId(grid.getId());
resi.setName(grid.getGridName());
resi.setValue(NumConstant.ZERO);
resi.setType(UserAnalysisConstant.REGISTERED_RESI);
if (StrConstant.SPECIAL_CUSTOMER.equals(customerId)) {
resi.setType("学员");
} else {
resi.setType(UserAnalysisConstant.REGISTERED_RESI);
}
resi.setTotal(NumConstant.ZERO);
list.add(resi);
//热心居民
@ -332,7 +347,11 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
warm.setGridId(grid.getId());
warm.setName(grid.getGridName());
warm.setValue(NumConstant.ZERO);
warm.setType(UserAnalysisConstant.WARMHEARTED);
if (StrConstant.SPECIAL_CUSTOMER.equals(customerId)) {
warm.setType("组长");
} else {
warm.setType(UserAnalysisConstant.WARMHEARTED);
}
warm.setTotal(NumConstant.ZERO);
list.add(warm);
//党员
@ -411,7 +430,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
}
@Override
public List<UserIncrTrendResultDTO> incrTrendV2(UserIncrTrendFormDTO formDTO) {
public List<UserIncrTrendResultDTO> incrTrendV2(TokenDto tokenDto, UserIncrTrendFormDTO formDTO) {
//获取用户所属机关id
String myAgencyId = this.getMyAgency();
List<UserIncrTrendResultDTO> resultList=new ArrayList<>();
@ -443,14 +462,22 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
UserIncrTrendResultDTO reg=new UserIncrTrendResultDTO();
reg.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
reg.setDate(date);
reg.setType(UserAnalysisConstant.REGISTERED_RESI);
if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDto.getCustomerId())) {
reg.setType("学员");
} else {
reg.setType(UserAnalysisConstant.REGISTERED_RESI);
}
reg.setValue(userIncrTrendResDTO.getRegIncr());
resultList.add(reg);
UserIncrTrendResultDTO warm=new UserIncrTrendResultDTO();
warm.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
warm.setDate(date);
warm.setType(UserAnalysisConstant.WARMHEARTED);
if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDto.getCustomerId())) {
warm.setType("组长");
} else {
warm.setType(UserAnalysisConstant.WARMHEARTED);
}
warm.setValue(userIncrTrendResDTO.getWarmIncr());
resultList.add(warm);

8
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@ -279,7 +279,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
} else {
currentUserName = resultUserInfo.getData().getShowName();
}
String messageContent = String.format(UserMessageConstant.APPLY_JOIN_GROUP, currentUserName, resiGroupDTO.getGroupName());
String messageContent = "";
if (StrConstant.SPECIAL_CUSTOMER.equals(resiGroupDTO.getCustomerId())) {
messageContent = String.format("学员%s申请加入小组【%s】,请审核", currentUserName, resiGroupDTO.getGroupName());
} else {
messageContent = String.format(UserMessageConstant.APPLY_JOIN_GROUP, currentUserName, resiGroupDTO.getGroupName());
}
userMessage.setMessageContent(messageContent);
userMessage.setReadFlag(ReadFlagConstant.UN_READ);
userMessage.setTitle(UserMessageConstant.GROUP_TITLE);

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

@ -138,7 +138,7 @@ public class ResiWarmheartedApplyController {
@PostMapping("approve")
public Result approve(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditApproveFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return resiWarmheartedApplyService.approve(formDTO);
return resiWarmheartedApplyService.approve(tokenDTO, formDTO);
}
/**
@ -160,7 +160,7 @@ public class ResiWarmheartedApplyController {
@PostMapping("getdetail")
public Result<ResiWarmAuditResultDTO> getDetail(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmGetDetailFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return resiWarmheartedApplyService.getDetail(formDTO);
return resiWarmheartedApplyService.getDetail(tokenDTO, formDTO);
}
/**

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

@ -19,6 +19,7 @@ package com.epmet.modules.warmhearted.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
@ -140,7 +141,7 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
* @return void
* @author sun
*/
Result approve(ResiWarmAuditApproveFormDTO formDTO);
Result approve(TokenDto tokenDTO, ResiWarmAuditApproveFormDTO formDTO);
/**
* 政府端-热心居民申请-审核驳回
@ -158,7 +159,7 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
* @return void
* @author sun
*/
Result<ResiWarmAuditResultDTO> getDetail(ResiWarmGetDetailFormDTO formDTO);
Result<ResiWarmAuditResultDTO> getDetail(TokenDto tokenDTO, ResiWarmGetDetailFormDTO formDTO);
/**
* @param gridIdList

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

@ -20,13 +20,11 @@ package com.epmet.modules.warmhearted.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.*;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.PartyMemberConstant;
@ -200,7 +198,12 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
throw new RenException(ResiWarmheartedVisitConstant.SELECT_USERINFO_EXCEPTION);
}
String showName = resultUserInfo.getData().getShowName();
String messageContent = String.format(ResiWarmUserMessageConstant.RESIWARM_APPLY_MSG, showName);
String messageContent = "";
if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
messageContent = String.format("%s申请成为组长,请审核。", showName);
} else {
messageContent = String.format(ResiWarmUserMessageConstant.RESIWARM_APPLY_MSG, showName);
}
formDTO.setMessageText(messageContent);
//1:将申请记录存入热心居民申请表中
saveResiWarmApply(formDTO);
@ -212,7 +215,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
throw new RenException(ResiWarmheartedVisitConstant.SAVE_MSG_EXCEPTION);
}
result.setCode(NumConstant.ZERO);
result.setMsg(ResiWarmheartedVisitConstant.RESI_WARM_SUBMIT);
if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
result.setMsg("组长信息已提交成功,请等待后台审核。");
} else {
result.setMsg(ResiWarmheartedVisitConstant.RESI_WARM_SUBMIT);
}
}
return result;
}
@ -270,7 +277,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
msgDTO.setGridId(formDTO.getGridId());
msgDTO.setUserId(staff.getUserId());
msgDTO.setApp(AppClientConstant.APP_GOV);
msgDTO.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE);
if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
msgDTO.setTitle("您有一条组长申请消息");
} else {
msgDTO.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE);
}
msgDTO.setMessageContent(formDTO.getMessageText());
msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
msgList.add(msgDTO);
@ -280,7 +291,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
subscribeDTO.setGridId(formDTO.getGridId());
subscribeDTO.setUserId(staff.getUserId());
subscribeDTO.setCustomerId(formDTO.getCustomerId());
subscribeDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
subscribeDTO.setBehaviorType("组长申请消息");
} else {
subscribeDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
}
subscribeDTO.setMessageContent(formDTO.getMessageText());
subscribeDTO.setMessageTime(new Date());
subscribeList.add(subscribeDTO);
@ -384,7 +399,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result approve(ResiWarmAuditApproveFormDTO formDTO) {
public Result approve(TokenDto tokenDTO, ResiWarmAuditApproveFormDTO formDTO) {
Result result = new Result();
//0:先校验数据是否是未审核状态,防止接口测试调用多次
ResiWarmheartedApplyEntity entity = baseDao.selectById(formDTO.getApplyId());
@ -399,7 +414,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
//2:审核通过的添加热心居民的角色
if (num < NumConstant.ONE) {
logger.error(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",ResiWarmheartedVisitConstant.UPDATE_EXCEPTION));
throw new RenException(ResiWarmheartedVisitConstant.UPDATE_EXCEPTION);
if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDTO.getCustomerId())) {
throw new RenException("组长申请数据更新失败,组长角色添加失败");
} else {
throw new RenException(ResiWarmheartedVisitConstant.UPDATE_EXCEPTION);
}
}
//查询需要添加热心居民角色的userId
UserRoleDTO dto = new UserRoleDTO();
@ -413,7 +432,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
dto.setGridId(entity.getGridId());
result = epmetUserFeignClient.saveUserRole(dto);
//3:为申请人发送审核通过消息提示
result = auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_APPROVE_MSG);
if (StrConstant.SPECIAL_CUSTOMER.equals(entity.getCustomerId())) {
result = auditMessage(entity, "您申请的%s组长已审核通过,请查看。");
} else {
result = auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_APPROVE_MSG);
}
//5:更新这个人注册热心居民的网格下的所在的组的热心居民数信息
ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO();
identityParam.setUserId(entity.getUserId());
@ -434,7 +457,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
userMessageFormDTO.setGridId(formDTO.getGridId());
userMessageFormDTO.setUserId(formDTO.getUserId());
userMessageFormDTO.setApp(AppClientConstant.APP_RESI);
userMessageFormDTO.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE);
if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
userMessageFormDTO.setTitle("您有一条组长申请消息");
} else {
userMessageFormDTO.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE);
}
//调用gov-org服务查询网格信息
CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
customerGridFormDTO.setGridId(formDTO.getGridId());
@ -453,7 +480,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
wxSubscribeMessageFormDTO.setUserId(formDTO.getUserId());
wxSubscribeMessageFormDTO.setGridId(formDTO.getGridId());
wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
wxSubscribeMessageFormDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
wxSubscribeMessageFormDTO.setBehaviorType("组长申请消息");
} else {
wxSubscribeMessageFormDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
}
wxSubscribeMessageFormDTO.setMessageContent(messageContent);
wxSubscribeMessageFormDTO.setMessageTime(new Date());
List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
@ -487,7 +518,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
baseDao.updateById(entity);
//2:为申请人发送审核驳回消息提示
//查询申请信息
auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_REJECT_MSG);
if (StrConstant.SPECIAL_CUSTOMER.equals(entity.getCustomerId())) {
auditMessage(entity, "您申请的%s组长,已被驳回,原因:%s");
} else {
auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_REJECT_MSG);
}
return result;
}
@ -499,12 +534,16 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
* @author sun
*/
@Override
public Result<ResiWarmAuditResultDTO> getDetail(ResiWarmGetDetailFormDTO formDTO) {
public Result<ResiWarmAuditResultDTO> getDetail(TokenDto tokenDTO, ResiWarmGetDetailFormDTO formDTO) {
Result<ResiWarmAuditResultDTO> result = new Result<>();
//1:根据申请Id查询热心居民申请审核详情
ResiWarmheartedApplyEntity entity = baseDao.selectById(formDTO.getApplyId());
if (null == entity) {
result.error(ResiWarmheartedVisitConstant.SELECT_EXCEPTION);
if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDTO.getCustomerId())) {
result.error("根据申请Id未查询到组长申请详情信息");
} else {
result.error(ResiWarmheartedVisitConstant.SELECT_EXCEPTION);
}
return result;
}
//2:修改申请数据状态为已读
@ -518,7 +557,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
userResiInfoFormDTO.setUserId(entity.getUserId());
Result<UserResiInfoResultDTO> resultUserInfo = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
if (!resultUserInfo.success() || null == resultUserInfo.getData()) {
result.error(ResiWarmheartedVisitConstant.SELECT_EXCEPTION);
if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDTO.getCustomerId())) {
result.error("根据申请Id未查询到组长申请详情信息");
} else {
result.error(ResiWarmheartedVisitConstant.SELECT_EXCEPTION);
}
return result;
}
UserResiInfoResultDTO userInfo = resultUserInfo.getData();

Loading…
Cancel
Save