springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateExcelVO.java
@@ -34,7 +34,7 @@ private Date createAt; @ExcelProperty(value = "评价星级", index = 4) private Integer starLevel; private String starLevel; @ExcelProperty(value = "评价详情", index = 5) private String evaluateContent; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java
@@ -80,7 +80,7 @@ private String authVideo; @ApiModelProperty(value = "审核人员id") private String approverId; private Long approverId; @ApiModelProperty(value = "审核人员名称") private String approverName; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
@@ -138,4 +138,9 @@ @ApiModelProperty("房屋信息") private List<ComMngStructHouseVO> comMngStructHouseVOS; @ApiModelProperty("街路巷") private String alley; @ApiModelProperty("地区号") private String houseNum; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
@@ -87,6 +87,11 @@ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ","); continue; }else{ if(isOldDuo){ String answer = sb.toString(); userData.add(answer.substring(0, answer.length() - 1)); sb = new StringBuffer(); } isOldDuo = false; } sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ","); @@ -110,6 +115,11 @@ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ","); continue; }else{ if(isOldDuo){ String answer = sb.toString(); userData.add(answer.substring(0, answer.length() - 1)); sb = new StringBuffer(); } isOldDuo = false; } sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ","); springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java
@@ -575,6 +575,7 @@ @ApiOperation(value = "养老认证-养老认证审核---") @PostMapping("/pensionAuthRecords/examine") public R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO) { comPensionAuthRecordVO.setApproverId(this.getUserId()); return communityService.examinePensionAuthRecords(comPensionAuthRecordVO); } @@ -707,7 +708,7 @@ try { inputStream = file.getInputStream(); ComPensionAuthRecordImportExcelListen comPensionAuthRecordImportExcelListen = new ComPensionAuthRecordImportExcelListen( communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate); communityService, this.getCommunityId(), this.getUserId(), stringRedisTemplate); EasyExcel.read(inputStream, null, comPensionAuthRecordImportExcelListen).sheet().doRead(); } catch (IOException e) { log.error("导入模板失败【{}】", e.getMessage()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComElderAuthElderliesDAO.java
@@ -17,4 +17,11 @@ public interface ComElderAuthElderliesDAO extends BaseMapper<ComElderAuthElderliesDO> { int haveElderAuthElderliesAmount(@Param("communityId") Long communityId, @Param("authPeriod") String authPeriod); /** * 维护高龄老人健在状态 * @param populationId 人口id * @param isAlive 健在状态（1.健在 0.未健在） */ void editEditIsAlive(@Param("populationId") Long populationId,@Param("isAlive") Integer isAlive); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -143,18 +143,12 @@ IPage<ComMngPopulationVO> pagePopulation(Page page, @Param("comMngPopulationVO") ComMngPopulationDTO comMngPopulationVO); @Select("<script> " + "select cmp.id,cmv.`alley` as areaName,cmp.`name`,cmp.phone,cmp.label as tags,cmp.create_at from com_mng_population as cmp " + "left join com_mng_village as cmv on cmv.village_id = cmp.village_id " + "left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id " + "where cmpct.community_id = #{pageInputUserDTO.communityId} and cmpct.label is not null " + "<if test='pageInputUserDTO.name != null and pageInputUserDTO.name != ""'>" + " AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%') " + " </if> " + "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName != ""'>" + " AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " + " </if> " + "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != ""'>" + " AND cmpct.label like concat('%',#{pageInputUserDTO.tags},'%') " + " </if> " + " order by cmp.create_at desc " + "</script>") /** * 分页查询特殊群体列表 * @param page 分页参数 * @param pageInputUserDTO 请求参数 * @return 特殊群体列表 */ IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO); @Select("<script> " @@ -184,7 +178,7 @@ @Select("select count(cmpct.id) as populationTotal " + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 1) as localTotal " + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 2) as outTotal " + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and IFNULL(cmpct.label,'') != '') as specialTotal " + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmpct.label is not null) as specialTotal " + ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal " + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal " springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPensionAuthPensionerDAO.java
@@ -21,4 +21,10 @@ int havePensionAuthPensionerAmount(@Param("communityId") Long communityId, @Param("authPeriod") String authPeriod); /** * 根据人口id维护养老金人员健在状态 * @param populationId 人口id * @param isAlive 健在状态（1.健在 0.未健在） */ void editPensionIsAlive(@Param("populationId") Long populationId,@Param("isAlive") Integer isAlive); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -729,7 +729,7 @@ // 查询所有即将开始的活动 List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>() .lambda().le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(), 1)) .ge(ComActActivityDO::getBeginAt, new Date())); .ge(ComActActivityDO::getBeginAt, new Date()).notIn(ComActActivityDO::getStatus,5,6)); if (!actActivityList.isEmpty()) { WxXCXTempSend util = new WxXCXTempSend(); try { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
@@ -81,9 +81,9 @@ BeanUtils.copyProperties(addClusterMemberAdminDto,organizationMemberDO); organizationMemberDO.setCreateAt(new Date()); if(this.baseMapper.insert(organizationMemberDO) > 0){ return R.ok(); return R.ok("添加成功"); } return R.fail(); return R.fail("添加失败"); } /** @@ -109,9 +109,9 @@ BeanUtils.copyProperties(editClusterMemberAdminDto,organizationMemberDO); organizationMemberDO.setUpdateAt(new Date()); if(this.baseMapper.updateById(organizationMemberDO) > 0){ return R.ok(); return R.ok("编辑成功"); } return R.fail(); return R.fail("编辑失败"); } /** @@ -126,9 +126,9 @@ organizationMemberDO.setIsDel(ComClusterOrganizationMemberDO.isOk.yes); organizationMemberDO.setUpdateAt(new Date()); if(this.baseMapper.updateById(organizationMemberDO) > 0){ return R.ok(); return R.ok("删除成功"); } return R.fail(); return R.fail("删除失败"); } /** @@ -211,7 +211,7 @@ } //判断组织是否存在 if(!isOnly(memberExcel.getClusterName(),clusterMap)){ if(isOnly(memberExcel.getClusterName(),clusterMap)){ ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO(); BeanUtils.copyProperties(memberExcel,memberExcelErrorVO); memberExcelErrorVO.setError("该组织在本社区不存在"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -155,7 +155,7 @@ } else { sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason()); } comElderAuthRecordsDO.setApprovalDate(new Date()); // comElderAuthRecordsDO.setApprovalDate(new Date()); int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO); if (nub < 1) { return R.fail("审核失败"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -4,6 +4,7 @@ import javax.annotation.Resource; import com.panzhihua.common.utlis.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -125,7 +126,20 @@ } ComMngCarDO comMngCarDO = new ComMngCarDO(); BeanUtils.copyProperties(comMngCarSaveDTO, comMngCarDO); comMngCarDO.setAreaName(comMngVillageDO.getGroupAt()); //如果小区没有名字，则将街路巷和地区号拼接起来 if(comMngVillageDO.getName() != null && StringUtils.isNotEmpty(comMngVillageDO.getName())){ comMngCarDO.setAreaName(comMngVillageDO.getName()); }else{ StringBuilder sb = new StringBuilder(); sb.append(comMngVillageDO.getAlley()); if(!comMngVillageDO.getHouseNum().contains("号")){ sb.append(comMngVillageDO.getHouseNum() + "号"); } comMngCarDO.setAreaName(sb.toString()); } // if(comMngVillageDO.getGroupAt() == null){ // comMngCarDO.setAreaName(comMngVillageDO.getGroupAt()); // } comMngCarDO.setCommunityId(comMngVillageDO.getCommunityId()); try { comMngCarDO.setCardNo(AESUtil.encrypt128(comMngCarSaveDTO.getCardNo(), aesKey)); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -4885,15 +4885,6 @@ ComElderAuthElderliesDO comElderAuthElderliesDO = comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda() .eq(ComElderAuthElderliesDO::getPopulationId, populationDO.getId()).eq(ComElderAuthElderliesDO::getCommunityId, communityId)); // List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> // userTagStr.split("\\(")[0]).collect(Collectors.toList()); // //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除 // Iterator<String> iterator = userTag.iterator(); // while (iterator.hasNext()) { // String s = iterator.next(); // if (!labelList.contains(s)) // iterator.remove(); // } String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); @@ -4918,19 +4909,6 @@ comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.above100); } } // if (!comElderAuthElderliesDO.getIsAlive().equals(1) || !comElderAuthElderliesDO.getIsRegister().equals(1)) { // if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) { // Date nowDate = new Date(); // // 获取当前年 // int year = DateUtils.getYear(nowDate); // // 获取当前月 // int month = DateUtils.getMonth(nowDate) + 1; // ComEldersAuthStatisticsDO comEldersAuthStatisticsDO = comEldersAuthStatisticsMapper.selectOne(new QueryWrapper<ComEldersAuthStatisticsDO>() // .lambda().eq(ComEldersAuthStatisticsDO::getCommunityId, communityId).eq(ComEldersAuthStatisticsDO::getYear, year).eq(ComEldersAuthStatisticsDO::getMonth, month)); // comEldersAuthStatisticsDO.setSum(comEldersAuthStatisticsDO.getSum() + 1); // comEldersAuthStatisticsMapper.updateById(comEldersAuthStatisticsDO); // } // } comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO); } else { comElderAuthElderliesDO = new ComElderAuthElderliesDO(); @@ -4951,19 +4929,11 @@ comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.above100); } } // if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) { // Date nowDate = new Date(); // // 获取当前年 // int year = DateUtils.getYear(nowDate); // // 获取当前月 // int month = DateUtils.getMonth(nowDate) + 1; // ComEldersAuthStatisticsDO comEldersAuthStatisticsDO = comEldersAuthStatisticsMapper.selectOne(new QueryWrapper<ComEldersAuthStatisticsDO>() // .lambda().eq(ComEldersAuthStatisticsDO::getCommunityId, communityId).eq(ComEldersAuthStatisticsDO::getYear, year).eq(ComEldersAuthStatisticsDO::getMonth, month)); // comEldersAuthStatisticsDO.setSum(comEldersAuthStatisticsDO.getSum() + 1); // comEldersAuthStatisticsMapper.updateById(comEldersAuthStatisticsDO); // } comElderAuthElderliesDAO.insert(comElderAuthElderliesDO); } //维护养老认证健在状态 comPensionAuthPensionerDAO.editPensionIsAlive(populationDO.getId(),vo.getIsAlive()); return populationDO; } @@ -4974,15 +4944,6 @@ comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda() .eq(ComPensionAuthPensionerDO::getPopulationId, populationDO.getId()) .eq(ComPensionAuthPensionerDO::getCommunityId, communityId)); // List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> // userTagStr.split("\\(")[0]).collect(Collectors.toList()); // //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除 // Iterator<String> iterator = userTag.iterator(); // while (iterator.hasNext()) { // String s = iterator.next(); // if (!labelList.contains(s)) // iterator.remove(); // } String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); @@ -4997,23 +4958,6 @@ BeanUtils.copyProperties(vo, comPensionAuthPensionerDO); comPensionAuthPensionerDO.setIdCard(cardNoAES); comPensionAuthPensionerDO.setAddress(vo.getNowAddress()); // if (!comPensionAuthPensionerDO.getIsAlive().equals(1) || !comPensionAuthPensionerDO.getIsRegister().equals(1)) { // if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) { // Date nowDate = new Date(); // // 获取当前年 // int year = (DateUtils.getYear(nowDate)); // ComPensionAuthStatisticsDO comPensionAuthStatisticsDO = comPensionAuthStatisticsDAO.selectOne(new QueryWrapper<ComPensionAuthStatisticsDO>() // .lambda().eq(ComPensionAuthStatisticsDO::getCommunityId, communityId) // .eq(ComPensionAuthStatisticsDO::getYear, year)); // if(null == comPensionAuthStatisticsDO){ // comPensionAuthStatisticsDO = comPensionAuthStatisticsDAO.selectOne(new QueryWrapper<ComPensionAuthStatisticsDO>() // .lambda().eq(ComPensionAuthStatisticsDO::getCommunityId, communityId) // .eq(ComPensionAuthStatisticsDO::getYear, year - 1)); // } // comPensionAuthStatisticsDO.setSum(comPensionAuthStatisticsDO.getSum() + 1); // comPensionAuthStatisticsDAO.updateById(comPensionAuthStatisticsDO); // } // } comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO); } else { comPensionAuthPensionerDO = new ComPensionAuthPensionerDO(); @@ -5025,17 +4969,9 @@ comPensionAuthPensionerDO.setIdCard(vo.getCardNo()); comPensionAuthPensionerDO.setAddress(vo.getNowAddress()); comPensionAuthPensionerDAO.insert(comPensionAuthPensionerDO); // if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) { // Date nowDate = new Date(); // // 获取当前年 // int year = (DateUtils.getYear(nowDate)); // ComPensionAuthStatisticsDO comPensionAuthStatisticsDO = comPensionAuthStatisticsDAO.selectOne(new QueryWrapper<ComPensionAuthStatisticsDO>() // .lambda().eq(ComPensionAuthStatisticsDO::getCommunityId, communityId) // .eq(ComPensionAuthStatisticsDO::getYear, year)); // comPensionAuthStatisticsDO.setSum(comPensionAuthStatisticsDO.getSum() + 1); // comPensionAuthStatisticsDAO.updateById(comPensionAuthStatisticsDO); // } } //维护高龄老人健在状态 comElderAuthElderliesDAO.editEditIsAlive(populationDO.getId(),vo.getIsAlive()); return populationDO; } @@ -5601,16 +5537,6 @@ Long populationId = Snowflake.getId(); populationDO.setId(populationId); comElderAuthElderliesDO.setPopulationId(populationId); // List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> // userTagStr.split("\\(")[0]).collect(Collectors.toList()); // // //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除 // Iterator<String> iterator = userTag.iterator(); // while (iterator.hasNext()) { // String s = iterator.next(); // if (!labelList.contains(s)) // iterator.remove(); // } populationDO.setVillageId(comMngVillageDO.getVillageId()); populationDO.setActId(comActDO.getCommunityId()); populationDO.setStreetId(comActDO.getStreetId()); @@ -5651,17 +5577,6 @@ comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.above100); } } // if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) { // Calendar calendar = Calendar.getInstance(); // // 获取当前年 // int year = calendar.get(Calendar.YEAR); // // 获取当前月 // int month = calendar.get(Calendar.MONTH) + 1; // ComEldersAuthStatisticsDO comEldersAuthStatisticsDO = comEldersAuthStatisticsMapper.selectOne(new QueryWrapper<ComEldersAuthStatisticsDO>() // .lambda().eq(ComEldersAuthStatisticsDO::getCommunityId, communityId).eq(ComEldersAuthStatisticsDO::getYear, year).eq(ComEldersAuthStatisticsDO::getMonth, month)); // comEldersAuthStatisticsDO.setSum(comEldersAuthStatisticsDO.getSum() + 1); // comEldersAuthStatisticsMapper.updateById(comEldersAuthStatisticsDO); // } comElderAuthElderliesDAO.insert(comElderAuthElderliesDO); return populationDO; } @@ -6495,6 +6410,16 @@ populationDO.setStreetId(comActDO.getStreetId()); } //修改人员标签 List<ComMngPopulationCommunityTagsDO> communityTagsDOList = comMngPopulationCommunityTagsDAO .selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda() .eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId) .eq(ComMngPopulationCommunityTagsDO::getPopulationId,vo.getId())); communityTagsDOList.forEach(communityTags -> { communityTags.setLabel(vo.getLabel()); comMngPopulationCommunityTagsDAO.updateById(communityTags); }); // 查询当前用户所有房屋id List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId()); // 清除用户房屋居住信息 @@ -6657,6 +6582,17 @@ public R specialInputUser(PageInputUserDTO pageInputUserDTO) { IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser( new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO); iPage.getRecords().forEach(page -> { if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){ StringBuilder sb = new StringBuilder(); sb.append(page.getAlley()); if(!page.getHouseNum().contains("号")){ sb.append(page.getHouseNum() + "号"); } page.setAreaName(sb.toString()); } }); return R.ok(iPage); }
@@ -140,8 +140,20 @@ villageVO.setHouseTotal(villageTotal.getHouseTotal()); villageVO.setPopulationTotal(villageTotal.getPopulationTotal()); } villageVOList.add(villageVO); //如果小区没有名字，则将街路巷和地区号拼接起来 if(village.getName() != null && StringUtils.isNotEmpty(village.getName())){ villageVO.setGroupAt(village.getName()); }else{ StringBuilder sb = new StringBuilder(); sb.append(village.getAlley()); if(!village.getHouseNum().contains("号")){ sb.append(village.getHouseNum() + "号"); } villageVO.setGroupAt(sb.toString()); villageVO.setName(sb.toString()); } villageVOList.add(villageVO); }); villageVOIPage.setRecords(villageVOList); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -501,7 +501,7 @@ public R setCommunityAuthType(Long communityId, Integer type) { List<SysConfDO> authConf = sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCommunityId, communityId) .eq(SysConfDO::getCode, "ELDER_AUTH_TYPE").orderByDesc(SysConfDO::getCreateAt)); .eq(SysConfDO::getCode, "ELDER_AUTH_TYPE_" + communityId).orderByDesc(SysConfDO::getCreateAt)); if (authConf != null && authConf.size() > 0) { SysConfDO first = authConf.get(0); first.setValue(type + ""); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml
@@ -64,17 +64,27 @@ <select id="getEvaluateLists" resultType="com.panzhihua.common.model.vos.community.ComActActEvaluateExcelVO"> SELECT caae.create_at, caae.star_level, CASE WHEN caae.star_level = 1 THEN '一星' WHEN caae.star_level = 2 THEN '二星' WHEN caae.star_level = 3 THEN '三星' WHEN caae.star_level = 4 THEN '四星' WHEN caae.star_level = 5 THEN '五星' ELSE '未评价' END `star_level`, caae.evaluate_content, su.`name`, su.`nick_name`, su.phone, CASE WHEN su.is_partymember = 1 THEN '党员' WHEN caae.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity END `identity` FROM com_act_act_evaluate caae springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml
@@ -107,7 +107,7 @@ d.id, d.`discuss_subject`, d.type, d.comment_num, (select count(id) from com_act_discuss_comment where discuss_id = d.id and is_del = 2 and parent_id = 0) as comment_num, d.fabulous_num as signNum, d.views_num, d.status, springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireAnswerContentDOMapper.xml
@@ -35,7 +35,7 @@ caqua.create_at AS `time` FROM com_act_questnaire_answer_content caqac LEFT JOIN com_act_questnaire_sub caqs ON caqac.selection_id = caqs.id LEFT JOIN com_act_questnaire_sub caqs ON caqac.sub_id = caqs.id LEFT JOIN com_act_questnaire caq ON caqs.que_Id = caq.id LEFT JOIN sys_user su ON caqac.user_id = su.user_id LEFT JOIN com_act_questnaire_user_answer caqua ON caqua.id = caqac.answer_id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComClusterOrganizationMemberDOMapper.xml
@@ -113,7 +113,7 @@ case ccom.`status` when '1' then '启用' when '2' then '禁用' end end `status` FROM com_cluster_organization_member AS ccom LEFT JOIN com_cluster_organization AS cco ON cco.id = ccom.cluster_id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthElderliesMapper.xml
@@ -48,4 +48,8 @@ AND cear.auth_status = 1 AND cear.auth_period = #{authPeriod}) </select> <update id="editEditIsAlive"> update com_elder_auth_elderlies set is_alive = #{isAlive} where population_id = #{populationId} </update> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -284,8 +284,8 @@ cmp.special_situation, cmp.phone, cmp.remark, cmp.native_place, cmp.nation, cmpct.label, cmp.marriage, cmp.culture_level, cmp.profession, cmp.out_or_local, cmp.census_register, cmp.healthy, cmp.birthday, cmp.update_at, cmp.address, cmp.is_rent FROM com_mng_population AS cmp LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id cmp.is_rent FROM com_mng_population_community_tags as cmpct LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id <where> <if test='comMngPopulationVO.name != null and comMngPopulationVO.name != ""'> AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') </if> @@ -337,4 +337,34 @@ order by cmp.create_at desc </select> <select id="specialInputUser" resultType="com.panzhihua.common.model.vos.user.InputUserInfoVO"> SELECT cmp.id, cmv.`name` AS areaName, cmv.alley AS alley, cmv.house_num AS houseNum, cmp.`name`, cmp.phone, cmpct.label AS tags, cmp.create_at FROM com_mng_population_community_tags as cmpct LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id WHERE cmpct.community_id = #{pageInputUserDTO.communityId} AND cmpct.label IS NOT NULL <if test='pageInputUserDTO.name != null and pageInputUserDTO.name != ""'> AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%') </if> <if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName != ""'> AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') </if> <if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != ""'> AND cmpct.label like concat('%',#{pageInputUserDTO.tags},'%') </if> ORDER BY cmp.create_at DESC </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthPensionerMapper.xml
@@ -48,4 +48,8 @@ AND cpar.auth_status = 1 AND cpar.auth_period = #{authPeriod}) </select> <update id="editPensionIsAlive"> update com_pension_auth_pensioners set is_alive = #{isAlive} where population_id = #{populationId} </update> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
@@ -261,6 +261,7 @@ e.event_category = 1 AND e.event_type = 6 AND event_status = 2 AND process_type = 1 AND ( event_process_status = 1 OR event_process_status = 3 ) AND grid_id = #{eventGridTodoDataDTO.gridId} UNION ALL SELECT springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -575,7 +575,8 @@ @Override public R listTag() { List<String> list = new ArrayList<>(); List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<>()); List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<ComMngUserTagDO>() .eq(ComMngUserTagDO::getSysFlag,1)); if (!ObjectUtils.isEmpty(comMngUserTagDOS)) { list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()) .collect(Collectors.toList());
