From eb3ddabea3d5a11c57fc793ba56b4da31e5546af Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 01 九月 2023 16:43:08 +0800
Subject: [PATCH] 修改杨家坪社区问题
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
index 1532720..7c7ea6a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -15,6 +15,8 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComElderAuthElderliesService;
@@ -87,6 +89,8 @@
private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
@Resource
private ComElderAuthElderliesService comElderAuthElderliesService;
+ @Resource
+ private UserService userService;
@Override
public R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -164,12 +168,12 @@
comElderAuthRecordsDO.setApprovalDate(nowDate);
if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) {
comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
- sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！");
+ sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！",comElderAuthRecordVO.getAreaCode());
authElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
comElderAuthElderliesDAO.updateById(authElderliesDO);
} else {
- sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason());
+ sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason(),comElderAuthRecordVO.getAreaCode());
}
// comElderAuthRecordsDO.setApprovalDate(new Date());
int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO);
@@ -179,17 +183,18 @@
return R.ok();
}
- private void sendAuthSubscribe(Long userId, String name, String result) {
+ private void sendAuthSubscribe(Long userId, String name, String result,String areaCode) {
//发送订阅通知
Map<String, String> map = comActActSignDAO.getUserOpenId(userId);
if (map != null) {
String openid = map.get("openid");
try {
WxXCXTempSend util = new WxXCXTempSend();
- String accessToken = util.getAppAccessToken();
+ String accessToken = util.getAccessToken();
+ R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(areaCode,5);
WxUtil.sendSubscribeRZSH(openid, accessToken, name,
DateUtils.format(new Date(), DateUtils.ymdhms_format),
- result);
+ result,sysTemplateConfigVO.getData().getTemplateId());
} catch (Exception e) {
log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
}
@@ -238,7 +243,8 @@
List<ComElderAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>();
try {
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = comMngPopulationDAO.selectList(null);
+// List<ComMngPopulationDO> populationList = comMngPopulationDAO.selectList(null);
+ List<ComMngPopulationDO> populationList = comMngPopulationDAO.selectListIds();
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
@@ -580,7 +586,7 @@
return R.fail("认证失败，请重新尝试");
}
if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
- sendAuthSubscribe(addIdentityAuthDTO.getSubmitUserId(), "高龄认证", "认证成功！");
+ sendAuthSubscribe(addIdentityAuthDTO.getSubmitUserId(), "高龄认证", "认证成功！",addIdentityAuthDTO.getAreaCode());
}
return R.ok();
}
@@ -631,10 +637,14 @@
comMngPopulationDO.setPhone(comElderAuthRecordVO.getPhone());
comMngPopulationDAO.updateById(comMngPopulationDO);
comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
+ comElderAuthElderliesDO.setPhone(comElderAuthRecordVO.getPhone());
+ comElderAuthElderliesDO.setIdCard(null);
comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId()));
if(comPensionAuthPensionerDO!=null){
comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress());
+ comPensionAuthPensionerDO.setPhone(comElderAuthRecordVO.getPhone());
+ comPensionAuthPensionerDO.setIdCard(null);
comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
}
return R.ok();
--
Gitblit v1.7.1