springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
@@ -28,7 +28,8 @@ @Select("select count(id) as houseTotal" + ",(select count(DISTINCT floor) from com_mng_population_house where village_id = #{villageId}) as floorTotal" + ",(select count(id) from com_mng_population where village_id = #{villageId}) as populationTotal" + ",(select count(id) from com_mng_population where road = (select alley from com_mng_village where village_id = #{villageId})" + " and door_no = (select house_num from com_mng_village where village_id = #{villageId})) as populationTotal" + ",(select count(id) from com_mng_car where area_id = #{villageId}) as carTotal" + " from com_mng_population_house where village_id = #{villageId}") ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -17,6 +17,7 @@ import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComElderAuthElderliesService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -84,6 +85,8 @@ private ComPensionAuthRecordDAO comPensionAuthRecordDAO; @Resource private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO; @Resource private ComElderAuthElderliesService comElderAuthElderliesService; @Override public R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { @@ -150,6 +153,9 @@ if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) { comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz); sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！"); authElderliesDO.setAddress(comElderAuthRecordVO.getAddress()); comElderAuthElderliesDAO.updateById(authElderliesDO); } else { sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason()); } @@ -212,7 +218,10 @@ List<ComElderAuthRecordsDO> saveList = new ArrayList<>(); // 需要修改的认证记录集合 List<ComElderAuthRecordsDO> updateList = new ArrayList<>(); //需要更新的老人信息 List<ComElderAuthElderliesDO> updateElderliesList = new ArrayList<>(); log.info("开始处理导入数据"); List<ComElderAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>(); try { @@ -272,15 +281,30 @@ }else if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)) { comElderAuthRecordsDO = updateElderAuthRecordsDO(vo, comElderAuthRecordsDO,userId,communityId,nowDate); updateList.add(comElderAuthRecordsDO); if(StringUtils.isNotEmpty(vo.getAddress())){ comElderAuthElderliesDO.setAddress(vo.getAddress()); updateElderliesList.add(comElderAuthElderliesDO); } }else { // 驳回状态,则新增 comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate); saveList.add(comElderAuthRecordsDO); if(StringUtils.isNotEmpty(vo.getAddress())){ comElderAuthElderliesDO.setAddress(vo.getAddress()); updateElderliesList.add(comElderAuthElderliesDO); } } }else { // 不存在记录,则新增 comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate); saveList.add(comElderAuthRecordsDO); if(StringUtils.isNotEmpty(vo.getAddress())){ comElderAuthElderliesDO.setAddress(vo.getAddress()); updateElderliesList.add(comElderAuthElderliesDO); } } } } @@ -311,6 +335,9 @@ comElderAuthRecordsDAO.updateAll(updateList); log.info("数据库更新线下认证记录完成"); } if(!updateElderliesList.isEmpty()){ comElderAuthElderliesService.updateBatchById(updateElderliesList); } log.info("执行数据库导入完成"); if (!mistakes.isEmpty()) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -16,6 +16,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.service_community.service.ComPensionAuthPensionerService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -85,6 +86,8 @@ private ComActActSignDAO comActActSignDAO; @Value("${domain.aesKey:}") private String aesKey; @Resource private ComPensionAuthPensionerService comPensionAuthPensionerService; @Override public R pagePensionAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { @@ -135,10 +138,19 @@ if (comPensionAuthRecordDO == null) { return R.fail("未查询到养老认证记录"); } ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(comPensionAuthRecordDO.getPensionerId()); if(authPensionerDO == null){ return R.fail("未查询到老人信息"); } BeanUtils.copyProperties(comPensionAuthRecordVO, comPensionAuthRecordDO); if (comPensionAuthRecordVO.getApprovalStatus().equals(PASS_THROUGH.getStatus())) { comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus()); sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", "认证成功！"); authPensionerDO.setAddress(comPensionAuthRecordVO.getAddress()); comPensionAuthPensionerDAO.updateById(authPensionerDO); } else { sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", comPensionAuthRecordVO.getRejectReason()); } @@ -194,6 +206,8 @@ List<ComPensionAuthRecordDO> saveList = new ArrayList<>(); // 需要修改的认证记录集合 List<ComPensionAuthRecordDO> updateList = new ArrayList<>(); // 需要更新的老人信息 List<ComPensionAuthPensionerDO> updatePensionerList = new ArrayList<>(); log.info("开始处理导入数据"); Date nowDate = new Date(); List<ComPensionAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>(); @@ -253,15 +267,30 @@ //存在待审核记录，进行更新认证信息 comPensionAuthRecordDO = updatePensionAuthRecordsDO(vo, comPensionAuthRecordDO, userId,communityId,nowDate); updateList.add(comPensionAuthRecordDO); }else { // 不存在记录,则新增 comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate); saveList.add(comPensionAuthRecordDO); if(StringUtils.isNotEmpty(vo.getAddress())){ comPensionAuthPensionerDO.setAddress(vo.getAddress()); updatePensionerList.add(comPensionAuthPensionerDO); } }else { // 不存在记录,则新增 comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate); saveList.add(comPensionAuthRecordDO); if(StringUtils.isNotEmpty(vo.getAddress())){ comPensionAuthPensionerDO.setAddress(vo.getAddress()); updatePensionerList.add(comPensionAuthPensionerDO); } } }else { // 不存在记录,则新增 comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate); saveList.add(comPensionAuthRecordDO); if(StringUtils.isNotEmpty(vo.getAddress())){ comPensionAuthPensionerDO.setAddress(vo.getAddress()); updatePensionerList.add(comPensionAuthPensionerDO); } } } } @@ -291,6 +320,9 @@ comPensionAuthRecordDAO.updateAll(updateList); log.info("数据库更新线下认证记录完成"); } if(!updatePensionerList.isEmpty()){ comPensionAuthPensionerService.updateBatchById(updatePensionerList); } log.info("执行数据库导入完成"); if (!mistakes.isEmpty()) {
