springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackAddDTO.java
@@ -32,5 +32,7 @@ @ApiModelProperty(value = "反馈结果", hidden = false, example = "") private String feedBack; @ApiModelProperty(value = "用户ID", hidden = true, example = "") private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
@@ -56,6 +56,16 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date birthDay; @ApiModelProperty(value = "申请人") private String submitUserName; @ApiModelProperty(value = "申请账号") private String submitUserAccount; @ApiModelProperty(value = "年龄") private Integer age; @ApiModelProperty(value = "社区反馈") private List<EldersAuthFeedbackVO> eldersAuthFeedbackVOList;
@@ -65,4 +65,7 @@ @ApiModelProperty(value = "年龄") private Integer age; @ApiModelProperty(value = "家庭成员ID") private Long familyUserId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2531,9 +2531,9 @@ /** * 添加高龄认证反馈 * @param eldersAuthFeedbackEditDTO * @param eldersAuthFeedbackAddDTO * @return */ @PostMapping("/eldersauth/addFeedback") R addFeedback(@RequestBody EldersAuthFeedbackEditDTO eldersAuthFeedbackEditDTO); R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java
@@ -7,10 +7,7 @@ import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.fastjson.JSONArray; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO; import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackEditDTO; import com.panzhihua.common.model.dtos.community.ExcelElderAuthDTO; import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.user.EexcelUserDTO; import com.panzhihua.common.model.vos.IPageVO; import com.panzhihua.common.model.vos.R; @@ -84,7 +81,7 @@ * @return 查找结果 */ @PostMapping("page") @ApiOperation(value = "查询高龄认证") @ApiOperation(value = "查询高龄认证", response = EldersAuthVO.class) R query(@Validated @ModelAttribute PageEldersAuthDTO pageEldersAuthDTO){ ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO); return communityService.query(pageEldersAuthDTO); @@ -96,7 +93,7 @@ * @return 查找结果 */ @GetMapping("/{id}") @ApiOperation(value = "查询高龄认证详细信息") @ApiOperation(value = "查询高龄认证详细信息", response = EldersAuthDetailsVO.class) R<EldersAuthDetailsVO> details(@PathVariable("id") Long id){ return communityService.eldersAuthDetails(id); } @@ -106,8 +103,8 @@ * @param pageEldersAuthDTO 搜索条件 * @return 查找结果 */ @GetMapping("export") @ApiOperation(value = "查询高龄认证详细信息") @PostMapping("export") @ApiOperation(value = "导出高龄认证信息") R<String> export(@Validated @ModelAttribute PageEldersAuthDTO pageEldersAuthDTO){ String name = "高龄补贴-" + new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + ".xlsx"; String ftpUrl = "/mnt/data/web/excel/"; @@ -155,7 +152,7 @@ return R.fail(); } } return R.fail("未查询到用户"); return R.fail("未查询到高龄认证用户"); } /** * 新增高龄认证 @@ -164,9 +161,10 @@ */ @PostMapping("/addFeedback") @ApiOperation(value = "新增高龄认证反馈", response = R.class) R addFeedback(@Validated @RequestBody EldersAuthFeedbackEditDTO eldersAuthFeedbackEditDTO){ ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackEditDTO); return communityService.addFeedback(eldersAuthFeedbackEditDTO); R addFeedback(@Validated @RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){ ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO); eldersAuthFeedbackAddDTO.setUserId(getUserId()); return communityService.addFeedback(eldersAuthFeedbackAddDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1568,6 +1568,7 @@ eldersAuthDO.setIdCard(theFamily.getIdCard()); eldersAuthDO.setAuthUserName(theFamily.getName()); eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl()); eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId()); //根据身份证查询出籍贯 出生日期 String domicile = ""; Date birthDay = new Date(); @@ -1593,4 +1594,15 @@ ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO); return eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO); } /** * 查询导出高龄老人 * @param pageEldersAuthDTO * @return */ @PostMapping("/eldersauth/eldersAuthQuery") R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){ return eldersAuthService.query(pageEldersAuthDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO; import com.panzhihua.common.model.vos.community.EldersAuthVO; import com.panzhihua.service_community.model.dos.EldersAuthDO; import org.apache.ibatis.annotations.Mapper; @@ -24,7 +25,7 @@ @Select("<script> " + "SELECT ea.id, ea.create_at, ea.create_by, ea.update_by, ea.update_at," + " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, " + " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID ," + " ea.DOMICILE, ea.SUMIT_USER_ID, u.phone as submitUserAccount ," + " u.name as submitUserName, ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) as age \n" + "FROM com_elders_auth ea LEFT JOIN sys_user u ON ea.SUMIT_USER_ID = u.user_id\n" + @@ -42,4 +43,15 @@ " ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order} " + "</script>") IPage<EldersAuthVO> selectByPage(Page page, @Param("pageEldersAuthDTO") PageEldersAuthDTO pageEldersAuthDTO); @Select("<script> " + "SELECT ea.id, ea.create_at, ea.create_by, ea.update_by, ea.update_at," + " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID, " + " ea.DOMICILE, ea.SUMIT_USER_ID, u.phone as submitUserAccount ," + " u.name as submitUserName, ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) as age \n" + "FROM com_elders_auth ea LEFT JOIN sys_user u ON ea.SUMIT_USER_ID = u.user_id\n" + " where ea.id = #{id}" + "</script>") EldersAuthDetailsVO selectDetails(@Param("id") Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthDO.java
@@ -72,4 +72,8 @@ * 出生日期 列: BIRTH_DAY */ private Date birthDay; /** * 家庭成员ID 列: FAMILY_USER_ID */ private Long familyUserId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -12,6 +12,7 @@ import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.EldersAuthService; import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; @@ -78,7 +79,6 @@ Page page = new Page<>(); page.setSize(pageEldersAuthDTO.getPageSize()); page.setCurrent(pageEldersAuthDTO.getPageNum()); return R.ok(eldersAuthDAO.selectByPage(page, pageEldersAuthDTO)); } @@ -97,15 +97,12 @@ * @return 查找结果 */ public R<EldersAuthDetailsVO> eldersAuthDetails(Long id){ EldersAuthDO eldersAuthDO = eldersAuthDAO.selectById(id); if(eldersAuthDO!=null) { EldersAuthDetailsVO eldersAuthDetailsVO = new EldersAuthDetailsVO(); BeanUtils.copyProperties(eldersAuthDO, eldersAuthDetailsVO); EldersAuthDetailsVO eldersAuthDetailsVO = eldersAuthDAO.selectDetails(id); if(eldersAuthDetailsVO!=null) { //社区反馈 List<EldersAuthFeedbackDO> list = eldersAuthFeedbackDAO.selectList(new LambdaQueryWrapper<EldersAuthFeedbackDO>() .eq(EldersAuthFeedbackDO::getAuthId, eldersAuthDO.getId())); .eq(EldersAuthFeedbackDO::getAuthId, eldersAuthDetailsVO.getId())); List<EldersAuthFeedbackVO> listVO = new ArrayList<>(); list.forEach(feedDo ->{ EldersAuthFeedbackVO eldersAuthFeedbackVO = new EldersAuthFeedbackVO(); @@ -124,6 +121,8 @@ */ public R addFeedback(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){ EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO(); eldersAuthFeedbackDO.setCreateBy(eldersAuthFeedbackAddDTO.getUserId()); eldersAuthFeedbackDO.setCreateAt(new Date()); BeanUtils.copyProperties(eldersAuthFeedbackAddDTO, eldersAuthFeedbackDO); if(eldersAuthFeedbackDAO.insert(eldersAuthFeedbackDO)>0){ return R.ok();
