From 7c110f5cf5f0049e77c3cb982b0d9bafa5acd493 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 10 六月 2021 14:17:07 +0800
Subject: [PATCH] Merge branch 'test_elder_cedoo' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 94 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 2bfd474..aaaa9d1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1,6 +1,9 @@
package com.panzhihua.service_community.api;
+import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,7 +16,9 @@
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.IdCardUtil;
@@ -29,6 +34,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
@@ -71,11 +77,14 @@
private ComActMessageService comActMessageService;
@Resource
private ComActQuestnaireService comActQuestnaireService;
-
+ @Resource
+ private UserService userService;
@Resource
private EldersAuthService eldersAuthService;
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
+ public ComEldersAuthUserService comEldersAuthUserService;
/**
* 新增社区活动
@@ -458,6 +467,26 @@
return comActEasyPhotoService.detailEasyPhoto(id, userId);
}
+ /**
+ * 随手拍删除
+ *
+ * @param id 随手拍主键
+ * @param userId 登录用户
+ * @return 详情内容
+ */
+ @PostMapping("deleteEasyPhoto")
+ public R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoService.getBaseMapper().selectById(id);
+ if(comActEasyPhotoDO==null){
+ return R.fail("随手拍不存在");
+ }
+ comActEasyPhotoDO.setDelTag(1);
+ int updateById = comActEasyPhotoService.getBaseMapper().updateById(comActEasyPhotoDO);
+ if(updateById==1){
+ return R.ok();
+ }
+ return R.fail();
+ }
/**
* 分页查询微心愿
*
@@ -1535,10 +1564,12 @@
@PostMapping("/eldersauth/getMyfamilyElders/{userId}")
R<List<ComMngFamilyInfoVO>> getMyfamilyElders(@PathVariable("userId") Long userId){
List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(userId);
+
List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
list.forEach(rt -> {
- boolean isElders = rt.getAge()>=80;
- if(isElders){
+ int age = IdCard.IdNOToAge(rt.getIdCard());
+ boolean isElders = age >= 80;
+ if (isElders) {
listRt.add(rt);
}
});
@@ -1548,30 +1579,30 @@
@PostMapping("/eldersauth/addByFamilyUser")
R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
- List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(eldersAuthAddByFamilyDTO.getUserId());
- ComMngFamilyInfoVO theFamily = null;
- Long familyUserId = eldersAuthAddByFamilyDTO.getFamilyUserId();
- for (ComMngFamilyInfoVO family : list) {
- if (familyUserId == family.getId()) {
- theFamily = family;
- }
+ ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ if(authUserDO == null){
+ return R.fail("未查询到老人信息");
}
- if(theFamily==null){
- return R.fail("家庭成员信息错误");
- }
- if(theFamily.getAge()>=80){
+ Integer age = IdcardUtil.getAgeByIdCard(authUserDO.getIdCard());
+ if(age>=80){
Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
EldersAuthDO eldersAuthDO = new EldersAuthDO();
- eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
+ eldersAuthDO.setSumitUserId(loginUserId);
eldersAuthDO.setCreateBy(loginUserId);
eldersAuthDO.setCreateAt(new Date());
- eldersAuthDO.setIdCard(theFamily.getIdCard());
- eldersAuthDO.setAuthUserName(theFamily.getName());
+ eldersAuthDO.setIdCard(authUserDO.getIdCard());
+ eldersAuthDO.setAuthUserName(authUserDO.getName());
eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
- eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ eldersAuthDO.setFamilyUserId(authUserDO.getId());
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
//根据身份证查询出籍贯 出生日期
- String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
+ //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
+ String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
+ if(StringUtils.isEmpty(domicile)){
+ domicile = "暂无";
+ }
+
Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
eldersAuthDO.setDomicile(domicile);
eldersAuthDO.setBirthDay(birthDay);
@@ -1593,7 +1624,30 @@
@PostMapping("/eldersauth/addFeedback")
R add(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO);
- return eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
+ EldersAuthDO eldersAuthDO = eldersAuthService.getBaseMapper().selectById(eldersAuthFeedbackAddDTO.getAuthId());
+ if(eldersAuthDO==null){
+ return R.fail("认证记录不存在");
+ }
+ R addR = eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
+ if(R.isOk(addR)){
+ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId());
+ sysUserNoticeVO.setType(3);
+ sysUserNoticeVO.setTitle("高龄认证社区反馈");
+ sysUserNoticeVO.setBusinessType(13);
+ sysUserNoticeVO.setBusinessTitle(" ");
+ sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区反馈:"
+ + eldersAuthFeedbackAddDTO.getFeedBack());
+ sysUserNoticeVO.setBusinessId(eldersAuthDO.getId());
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+
+ return addR;
}
--
Gitblit v1.7.1