springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -235,7 +235,6 @@ loginReturnVO.setToken(token); loginReturnVO.setRefreshToken(refeshToken); loginReturnVO.setUserId(loginUser.getUserId()); loginReturnVO.setCommunityId(loginUser.getCommunityId()); return loginReturnVO; }
@@ -3,6 +3,7 @@ import java.math.BigDecimal; import java.util.List; import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -38,4 +39,7 @@ @ApiModelProperty("应用预约/登记列表") private List<ComActReserveIndexVo> comActReserveIndexApplicationVos; @ApiModelProperty("动态banner") private List<BannerVO> bannerVOS; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
Diff too large springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java
@@ -69,6 +69,7 @@ public R insert(@RequestBody ComActAnnouncementVO comActAnnouncementVO) { comActAnnouncementVO.setCreateTime(new Date()); comActAnnouncementVO.setCommunityId(this.getCommunityId()); comActAnnouncementVO.setUserId(this.getUserId()); return this.communityService.comActAnnouncementInsert(comActAnnouncementVO); }
@@ -67,8 +67,10 @@ @ApiOperation(value = "分页查询预约登记列表", response = ComActReserveListAdminVO.class) @PostMapping("/page") public R page(@RequestBody PageReserveAdminDTO pageReserveDTO) { Long communityId = this.getCommunityId(); pageReserveDTO.setCommunityId(communityId); if(pageReserveDTO.getCommunityId()==null){ Long communityId = this.getCommunityId(); pageReserveDTO.setCommunityId(communityId); } return communityService.pageReserveAdmin(pageReserveDTO); }
@@ -592,6 +592,28 @@ return communityService.signPensionAuthRecords(comPensionAuthRecordVO); } /** * 高龄认证添加 * @param comElderAuthRecordVO * @return */ @ApiOperation(value = "高龄认证添加") @PostMapping("/authRecord/add") R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){ return communityService.addAuthRecord(comElderAuthRecordVO); } /** * 养老认证添加 * @param comElderAuthRecordVO * @return */ @ApiOperation(value = "养老认证添加") @PostMapping("/pensionAuthRecord/add") R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){ return communityService.addPensionAuthRecordVO(comElderAuthRecordVO); } /** * 养老认证导出 exportPensionAuthRecords 养老认证导出 * @param ids 养老认证记录id集合 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
@@ -378,6 +378,25 @@ } /** * 高龄认证添加 * @param comElderAuthRecordVO * @return */ @PostMapping("/authRecord/add") R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){ return comElderAuthRecordsService.add(comElderAuthRecordVO); } /** * 养老认证添加 * @param comElderAuthRecordVO * @return */ @PostMapping("/pensionAuthRecord/add") R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){ return comPensionAuthRecordService.add(comElderAuthRecordVO); } /** * 导出养老认证记录 exportPensionAuthRecordsStatistic 导出养老认证记录 * @param pageElderAuthRecordsDTO 查询参数 * @return R 查询结果 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthRecordsService.java
@@ -114,4 +114,11 @@ * @return 认证记录详情 */ R retrieveElderAuthDetail(Long identityAuthId); /** * 高龄认证添加 * @param comElderAuthRecordVO * @return */ R add(ComElderAuthRecordVO comElderAuthRecordVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPensionAuthRecordService.java
@@ -8,6 +8,7 @@ import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO; import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO; import com.panzhihua.service_community.model.dos.ComPensionAuthRecordDO; @@ -130,4 +131,11 @@ * @return 认证记录详情 */ R retrievePensionAuthDetail(Long identityAuthId); /** * 新增认证 * @param comElderAuthRecordVO * @return */ R add(ComElderAuthRecordVO comElderAuthRecordVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -7,6 +7,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -619,82 +620,87 @@ */ @Override public R getUserReward(Long userId, Long communityId) { // // 结果返回参数 // ComActEasyPhotoRewardVO easyPhotoRewardVO = new ComActEasyPhotoRewardVO(); // // 查询随手拍活动 // ComActEasyPhotoActivityVO photoActivityVO = new ComActEasyPhotoActivityVO(); // Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format); // List<ComActEasyPhotoActivityDO> photoActivityDOS = // comActEasyPhotoActivityMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>().lambda() // .eq(ComActEasyPhotoActivityDO::getCommunityId, communityId) // .eq(ComActEasyPhotoActivityDO::getStatus, ComActEasyPhotoActivityDO.status.jxz) // .le(ComActEasyPhotoActivityDO::getActivityStartAt, nowDate) // .ge(ComActEasyPhotoActivityDO::getActivityEndAt, nowDate)); // if (!photoActivityDOS.isEmpty()) { // ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0); // BeanUtils.copyProperties(photoActivityDO, photoActivityVO); // easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO); // } // // if (userId != null && userId != 0L) { // // 查询用户未读奖励金额 // BigDecimal amount = comActEasyPhotoRewardMapper.getUserReward(userId, communityId); // if (amount != null) { // easyPhotoRewardVO.setAmount(amount); // } // } // // // 查询当前社区正在进行中的弹窗调查问卷 // ComActQuestnaireDO popupQuestnaireDO = comActQuestnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>() // .lambda().le(ComActQuestnaireDO::getStartTime, nowDate).ge(ComActQuestnaireDO::getEndTime, nowDate) // .eq(ComActQuestnaireDO::getCommunityId, communityId).eq(ComActQuestnaireDO::getState, 2) // .eq(ComActQuestnaireDO::getAdverPositionPopup, ComActQuestnaireDO.isOk.yes)); // if (popupQuestnaireDO != null) { // ComActQuestnaireAppVO popupQuestnaireVO = new ComActQuestnaireAppVO(); // BeanUtils.copyProperties(popupQuestnaireDO, popupQuestnaireVO); // if (userId != null) { // if (popupQuestnaireDO.getIsForce().equals(ComActQuestnaireDO.isOk.no)) { // // 查询用户是否已点击不再提醒 // Integer count = comActQuestnaireDAO.getNoRemindCount(userId, popupQuestnaireVO.getId()); // if (count <= 0) { // popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes); // } // } else { // popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes); // } // } // easyPhotoRewardVO.setPopupQuestnaireVO(popupQuestnaireVO); // } // // // 查询社区正在进行中的banner位置调查问卷列表 // List<ComActQuestnaireAppVO> bannerQuestnaireList = comActQuestnaireDAO.getIndexTopQuestnaireList(communityId); // if (!bannerQuestnaireList.isEmpty()) { // easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList); // } // // //查询社区正在进行中的banner位置的社区活动 // List<ComActActivityVO> comActActivityVOList = comActActivityDAO.getIndexTopActivityList(communityId); // if (!comActActivityVOList.isEmpty()) { // easyPhotoRewardVO.setBannerActivityList(comActActivityVOList); // } // // // 查询社区正在进行中的应用位置调查问卷列表 // List<ComActQuestnaireAppVO> applicationQuestnaireList = // comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId); // if (!applicationQuestnaireList.isEmpty()) { // easyPhotoRewardVO.setApplicationQuestnaireList(applicationQuestnaireList); // } // //查询社区正在进行中的banner预约/登记列表 // List<ComActReserveIndexVo> comActReserveIndexVos=comActReserveMapper.indexBanner(communityId); // if(!comActReserveIndexVos.isEmpty()){ // easyPhotoRewardVO.setComActReserveIndexBannerVos(comActReserveIndexVos); // } // //查询社区正在进行中的应用预约/登记列表 // List<ComActReserveIndexVo> comActReserveIndexApplicationVos=comActReserveMapper.indexApplication(communityId); // if(!comActReserveIndexApplicationVos.isEmpty()){ // easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos); // } return R.ok(this.comActEasyPhotoDAO.banner(communityId)); // 结果返回参数 ComActEasyPhotoRewardVO easyPhotoRewardVO = new ComActEasyPhotoRewardVO(); // 查询随手拍活动 ComActEasyPhotoActivityVO photoActivityVO = new ComActEasyPhotoActivityVO(); Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format); List<ComActEasyPhotoActivityDO> photoActivityDOS = comActEasyPhotoActivityMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>().lambda() .eq(ComActEasyPhotoActivityDO::getCommunityId, communityId) .eq(ComActEasyPhotoActivityDO::getStatus, ComActEasyPhotoActivityDO.status.jxz) .le(ComActEasyPhotoActivityDO::getActivityStartAt, nowDate) .ge(ComActEasyPhotoActivityDO::getActivityEndAt, nowDate)); if (!photoActivityDOS.isEmpty()) { ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0); BeanUtils.copyProperties(photoActivityDO, photoActivityVO); easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO); } if (userId != null && userId != 0L) { // 查询用户未读奖励金额 BigDecimal amount = comActEasyPhotoRewardMapper.getUserReward(userId, communityId); if (amount != null) { easyPhotoRewardVO.setAmount(amount); } } // 查询当前社区正在进行中的弹窗调查问卷 ComActQuestnaireDO popupQuestnaireDO = comActQuestnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>() .lambda().le(ComActQuestnaireDO::getStartTime, nowDate).ge(ComActQuestnaireDO::getEndTime, nowDate) .eq(ComActQuestnaireDO::getCommunityId, communityId).eq(ComActQuestnaireDO::getState, 2) .eq(ComActQuestnaireDO::getAdverPositionPopup, ComActQuestnaireDO.isOk.yes)); if (popupQuestnaireDO != null) { ComActQuestnaireAppVO popupQuestnaireVO = new ComActQuestnaireAppVO(); BeanUtils.copyProperties(popupQuestnaireDO, popupQuestnaireVO); if (userId != null) { if (popupQuestnaireDO.getIsForce().equals(ComActQuestnaireDO.isOk.no)) { // 查询用户是否已点击不再提醒 Integer count = comActQuestnaireDAO.getNoRemindCount(userId, popupQuestnaireVO.getId()); if (count <= 0) { popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes); } } else { popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes); } } easyPhotoRewardVO.setPopupQuestnaireVO(popupQuestnaireVO); } // 查询社区正在进行中的banner位置调查问卷列表 List<ComActQuestnaireAppVO> bannerQuestnaireList = comActQuestnaireDAO.getIndexTopQuestnaireList(communityId); if (!bannerQuestnaireList.isEmpty()) { easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList); } //查询社区正在进行中的banner位置的社区活动 List<ComActActivityVO> comActActivityVOList = comActActivityDAO.getIndexTopActivityList(communityId); if (!comActActivityVOList.isEmpty()) { easyPhotoRewardVO.setBannerActivityList(comActActivityVOList); } // 查询社区正在进行中的应用位置调查问卷列表 List<ComActQuestnaireAppVO> applicationQuestnaireList = comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId); if (!applicationQuestnaireList.isEmpty()) { easyPhotoRewardVO.setApplicationQuestnaireList(applicationQuestnaireList); } //查询社区正在进行中的banner预约/登记列表 List<ComActReserveIndexVo> comActReserveIndexVos=comActReserveMapper.indexBanner(communityId); if(!comActReserveIndexVos.isEmpty()){ easyPhotoRewardVO.setComActReserveIndexBannerVos(comActReserveIndexVos); } //查询社区正在进行中的应用预约/登记列表 List<ComActReserveIndexVo> comActReserveIndexApplicationVos=comActReserveMapper.indexApplication(communityId); if(!comActReserveIndexApplicationVos.isEmpty()){ easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos); } //查询banner List<BannerVO> bannerVOS=this.comActEasyPhotoDAO.banner(communityId); if(!bannerVOS.isEmpty()){ easyPhotoRewardVO.setBannerVOS(bannerVOS); } return R.ok(easyPhotoRewardVO); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -593,4 +593,34 @@ public R retrieveElderAuthDetail(Long identityAuthId) { return R.ok(comElderAuthRecordsDAO.findById(identityAuthId)); } @Override public R add(ComElderAuthRecordVO comElderAuthRecordVO) { if(!comElderAuthRecordVO.getIdCard().isEmpty()){ List<ComMngPopulationDO> comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt)); if(!comMngPopulationDOS.isEmpty()){ ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0); ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId())); if(comElderAuthElderliesDO!=null){ Integer count=comElderAuthRecordsDAO.selectCount(new QueryWrapper<ComElderAuthRecordsDO>().lambda().eq(ComElderAuthRecordsDO::getElderliesId,comElderAuthElderliesDO.getId()).eq(ComElderAuthRecordsDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod())); if(count==0){ ComElderAuthRecordsDO comElderAuthRecordsDO=new ComElderAuthRecordsDO(); BeanUtils.copyProperties(comElderAuthRecordVO,comElderAuthRecordsDO); comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus()); comElderAuthRecordsDO.setApprovalDate(new Date()); comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus()); comElderAuthRecordsDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz); if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) { return R.fail("认证失败，请重新尝试"); } return R.ok(); } return R.fail("当前期数已认证，请勿重复认证"); } return R.fail("无养老认证数据"); } return R.fail("该身份证无实有人口信息"); } return R.fail("身份证不能为空"); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -541,4 +541,34 @@ public R retrievePensionAuthDetail(Long identityAuthId) { return R.ok(comPensionAuthRecordDAO.findById(identityAuthId)); } @Override public R add(ComElderAuthRecordVO comElderAuthRecordVO) { if(!comElderAuthRecordVO.getIdCard().isEmpty()){ List<ComMngPopulationDO> comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt)); if(!comMngPopulationDOS.isEmpty()){ ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0); ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId())); if(comPensionAuthPensionerDO!=null){ Integer count=comPensionAuthRecordDAO.selectCount(new QueryWrapper<ComPensionAuthRecordDO>().lambda().eq(ComPensionAuthRecordDO::getPensionerId,comPensionAuthPensionerDO.getId()).eq(ComPensionAuthRecordDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod())); if(count==0){ ComPensionAuthRecordDO comPensionAuthRecordDO=new ComPensionAuthRecordDO(); BeanUtils.copyProperties(comElderAuthRecordVO,comPensionAuthRecordDO); comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus()); comPensionAuthRecordDO.setApprovalDate(new Date()); comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus()); comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz); if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) { return R.fail("认证失败，请重新尝试"); } return R.ok(); } return R.fail("当前期数也认证，请勿重复认证"); } return R.fail("无养老认证数据"); } return R.fail("该身份证无实有人口信息"); } return R.fail("身份证不能为空"); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAnnouncementMapper.xml
@@ -22,6 +22,7 @@ and t.column_id =#{commonPage.paramId} </if> </where> order by t.create_time desc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml
@@ -13,5 +13,21 @@ <result property="type" column="type"/> <result property="description" column="description"/> </resultMap> <select id="pageList" resultMap="ComActColumnBaseResultMap"> select * from com_act_column <where> 1=1 <if test="commonPage.type!=null"> and type = #{commonPage.type} </if> <if test="commonPage.status!=null"> and status =#{commonPage.status} </if> <if test="commonPage.keyword!=null and commonPage.keyword!=''"> and name like concat('%',#{commonPage.status},'%') </if> </where> order by create_time desc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml
@@ -75,7 +75,7 @@ com_act_reserve <where> and is_del = 2 <if test="pageReserveDTO.communityId != null"> <if test="pageReserveDTO.communityId != null and pageReserveDTO.communityId !=0"> and community_id = #{pageReserveDTO.communityId} </if> <if test="pageReserveDTO.type != null and pageReserveDTO.type.size > 0">
