springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3842,6 +3842,15 @@ R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO); /** * 导出高龄认证记录 exportElderAuthRecords 导出高龄认证记录 * @param pageElderAuthRecordsDTO 查询参数 * @return R 查询结果 * @date 2021/9/02 11:03 */ @PostMapping("/elders/authRecords/export") R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO); /** * 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录 * @param pageElderAuthRecordsDTO 查询参数 * @return R 查询结果 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java
@@ -300,14 +300,14 @@ /** * 高龄认证导出 exportElderAuthRecords 高龄认证导出 * @param ids 高龄认证记录id集合 * @param pageElderAuthRecordsDTO * @return R 导出结果 * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "高龄认证-高龄认证导出---") @PostMapping("/authRecords/export") public R exportElderAuthRecords(@RequestBody List<Long> ids) { public R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { // List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class); // 生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址 String ftpUrl = "/mnt/data/web/excel/"; @@ -324,7 +324,7 @@ ExcelWriter excelWriter = null; InputStream inputStream = null; try { R r = communityService.getElderAuthRecordsByIds(ids); R r = communityService.exportElderAuthRecords(pageElderAuthRecordsDTO); List<ComElderAuthRecordExcleVO> list = new ArrayList<>(); if (R.isOk(r)) { list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComElderAuthRecordExcleVO.class); @@ -614,6 +614,7 @@ @PostMapping("/pensionAuthRecord/add") R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){ comElderAuthRecordVO.setSubmitUserId(this.getUserId()); comElderAuthRecordVO.setCommunityId(this.getCommunityId()); return communityService.addPensionAuthRecordVO(comElderAuthRecordVO); }
@@ -302,6 +302,17 @@ } /** * 导出高龄认证记录 exportElderAuthRecords 导出高龄认证记录 * @param pageElderAuthRecordsDTO 查询参数 * @return R 查询结果 * @date 2021/9/02 11:03 */ @PostMapping("/authRecords/export") public R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){ return comElderAuthRecordsService.export(pageElderAuthRecordsDTO); } /** * 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录 * @param pageElderAuthRecordsDTO 查询参数 * @return R 查询结果 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComElderAuthRecordsDAO.java
@@ -30,6 +30,8 @@ IPage<ComElderAuthRecordVO> pageElderAuthRecords(Page page, @Param("pageElderAuthRecordsDTO") PageElderAuthRecordsDTO pageElderAuthRecordsDTO); List<ComElderAuthRecordVO> export(@Param("pageElderAuthRecordsDTO") PageElderAuthRecordsDTO pageElderAuthRecordsDTO); ComElderAuthRecordVO detailElderAuthRecords(@Param("authRecordId") Long authRecordId); List<ComElderAuthRecordExcleVO> getElderAuthRecordsByIds(@Param("ids") List<Long> ids); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthRecordsService.java
@@ -34,6 +34,15 @@ R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO); /** * 导出 pageElderAuthRecords 导出 * @param pageElderAuthRecordsDTO 查询参数 * @return R 查询结果 * @author txb * @date 2021/9/02 11:03 */ R export(PageElderAuthRecordsDTO pageElderAuthRecordsDTO); /** * 根据高龄认证记录id查询详情 detailElderAuthRecords 根据高龄认证记录id查询详情 * @param authRecordId 高龄认证记录id * @return R 查询结果 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -122,6 +122,18 @@ } @Override public R export(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { try { //关键词为空时需要进行加密，通过加密去检索身份证号筛选高龄认证记录 String idCard = AESUtil.encrypt128(pageElderAuthRecordsDTO.getSearchKey(), aesKey); pageElderAuthRecordsDTO.setIdCard(idCard); }catch (Exception e){ log.error("查询高龄认证记录转换身份证号失败"); } return R.ok(comElderAuthRecordsDAO.export(pageElderAuthRecordsDTO)); } @Override public R detailElderAuthRecords(Long authRecordId) { ComElderAuthRecordVO comElderAuthRecordVO = comElderAuthRecordsDAO.detailElderAuthRecords(authRecordId); comElderAuthRecordVO.setNextIds(comElderAuthRecordsDAO.getNextIds(comElderAuthRecordVO.getCommunityId(),authRecordId)); @@ -611,9 +623,20 @@ comElderAuthRecordsDO.setApprovalDate(new Date()); comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus()); comElderAuthRecordsDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz); comElderAuthRecordsDO.setApproverId(comElderAuthRecordVO.getSubmitUserId()); comElderAuthRecordsDO.setSubmitUserId(comElderAuthRecordVO.getSubmitUserId()); if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) { return R.fail("认证失败，请重新尝试"); } comMngPopulationDO.setPhone(comElderAuthRecordVO.getPhone()); comMngPopulationDAO.updateById(comMngPopulationDO); comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress()); comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO); ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId())); if(comPensionAuthPensionerDO!=null){ comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress()); comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO); } return R.ok(); } return R.fail("当前期数已认证，请勿重复认证"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -16,6 +16,8 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComPensionAuthPensionerService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; @@ -40,19 +42,6 @@ import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import com.panzhihua.service_community.dao.ComActActSignDAO; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.dao.ComPensionAuthPensionerDAO; import com.panzhihua.service_community.dao.ComPensionAuthRecordDAO; import com.panzhihua.service_community.dao.ComPensionAuthStatisticsDAO; import com.panzhihua.service_community.dao.SysConfMapper; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.model.dos.ComMngPopulationDO; import com.panzhihua.service_community.model.dos.ComPensionAuthPensionerDO; import com.panzhihua.service_community.model.dos.ComPensionAuthRecordDO; import com.panzhihua.service_community.model.dos.ComPensionAuthStatisticsDO; import com.panzhihua.service_community.model.dos.SysConfDO; import com.panzhihua.service_community.service.ComPensionAuthRecordService; import cn.hutool.core.util.IdcardUtil; @@ -88,6 +77,8 @@ private String aesKey; @Resource private ComPensionAuthPensionerService comPensionAuthPensionerService; @Resource private ComElderAuthElderliesDAO comElderAuthElderliesDAO; @Override public R pagePensionAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { @@ -559,9 +550,19 @@ comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz); comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId()); comPensionAuthRecordDO.setSubmitUserId(comElderAuthRecordVO.getSubmitUserId()); comPensionAuthRecordDO.setApproverId(comElderAuthRecordVO.getSubmitUserId()); if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) { return R.fail("认证失败，请重新尝试"); } comMngPopulationDO.setPhone(comElderAuthRecordVO.getPhone()); comMngPopulationDAO.updateById(comMngPopulationDO); comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress()); comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO); ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId())); if(comElderAuthElderliesDO!=null){ comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress()); comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO); } return R.ok(); } return R.fail("当前期数也认证，请勿重复认证"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml
@@ -90,6 +90,67 @@ order by cear.create_at desc </select> <select id="export" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO"> SELECT cear.id, su.`name` submitUserName, ceae.phone, ceae.`name`, ceae.id_card, ceae.sex, ceae.birthday, ceae.personnel_category, cear.address, ceae.is_alive, cear.auth_method, cear.auth_period, cear.auth_video, cear.auth_date, cear.mark, cear.approval_status, cear.approver_id, su1.`name` as approverName, cear.approval_date, cear.auth_status FROM com_elder_auth_records cear LEFT JOIN com_elder_auth_elderlies ceae ON cear.elderlies_id = ceae.id LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id LEFT JOIN sys_user su1 ON cear.approver_id = su1.user_id WHERE ceae.community_id = #{pageElderAuthRecordsDTO.communityId} <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''"> and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod} </if> <if test="pageElderAuthRecordsDTO.authMethod != null and pageElderAuthRecordsDTO.authMethod != 0"> and cear.auth_method = #{pageElderAuthRecordsDTO.authMethod} </if> <if test="pageElderAuthRecordsDTO.authDateBegin != null and pageElderAuthRecordsDTO.authDateBegin != ''"> and cear.auth_date <![CDATA[ >= ]]> #{pageElderAuthRecordsDTO.authDateBegin} </if> <if test="pageElderAuthRecordsDTO.authDateEnd != null and pageElderAuthRecordsDTO.authDateEnd != ''"> and cear.auth_date <![CDATA[ <= ]]> #{pageElderAuthRecordsDTO.authDateEnd} </if> <if test="pageElderAuthRecordsDTO.approvalStatus != null and pageElderAuthRecordsDTO.approvalStatus != 0"> and cear.approval_status = #{pageElderAuthRecordsDTO.approvalStatus} </if> <if test="pageElderAuthRecordsDTO.authStatus != null and pageElderAuthRecordsDTO.authStatus != 0"> and cear.auth_status = #{pageElderAuthRecordsDTO.authStatus} </if> <if test="pageElderAuthRecordsDTO.personnelCategory != null and pageElderAuthRecordsDTO.personnelCategory != 0"> and ceae.personnel_category = #{pageElderAuthRecordsDTO.personnelCategory} </if> <if test="pageElderAuthRecordsDTO.isAlive != null and pageElderAuthRecordsDTO.isAlive != 0"> and ceae.is_alive = #{pageElderAuthRecordsDTO.isAlive} </if> <if test="pageElderAuthRecordsDTO.searchKey != null and pageElderAuthRecordsDTO.searchKey != ''"> and (ceae.`name` like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%') or cear.mark like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%') or ceae.id_card = #{pageElderAuthRecordsDTO.idCard}) </if> order by cear.create_at desc </select> <select id="detailElderAuthRecords" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO"> SELECT su.`name` submitUserName,
