From eefbb8708d62ce3ca9b0f00402d586c78716af77 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 12 六月 2021 17:37:07 +0800
Subject: [PATCH] [新增]导入特殊人群信息，导入小区，导入楼栋和网格信息
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 eab1bfe..112cc5f 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
@@ -465,6 +465,26 @@
}
/**
+ * 随手拍删除
+ *
+ * @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();
+ }
+ /**
* 分页查询微心愿
*
* @param comActMicroWishVO 查询参数
@@ -1541,10 +1561,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);
}
});
@@ -1580,6 +1602,9 @@
//根据身份证查询出籍贯 出生日期
//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);
@@ -1611,10 +1636,11 @@
SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId());
sysUserNoticeVO.setType(3);
- sysUserNoticeVO.setTitle("高龄认证社区社区反馈");
+ sysUserNoticeVO.setTitle("高龄认证社区反馈");
sysUserNoticeVO.setBusinessType(13);
sysUserNoticeVO.setBusinessTitle(" ");
- sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区进行了反馈");
+ sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区反馈:"
+ + eldersAuthFeedbackAddDTO.getFeedBack());
sysUserNoticeVO.setBusinessId(eldersAuthDO.getId());
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(2);
@@ -1624,7 +1650,7 @@
}
}
- return eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
+ return addR;
}
--
Gitblit v1.7.1