springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -98,7 +98,8 @@ @ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class) @GetMapping("/app/detailSafetyWorkRecord") public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) { return communityService.detailSafetyWorkRecord(safetyWorkRecordId); Long communityId = this.getLoginUserInfo().getCommunityId(); return communityService.detailSafetyWorkRecord(safetyWorkRecordId, communityId); } /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -115,6 +115,7 @@ private void saveData() { R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY); log.info("开始导入人口数据"); log.info("表格总数据：" + list.size()); ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); String key = Constants.POPULATION_ERROR_LIST + communityId;
@@ -56,6 +56,12 @@ private String leaderSuggestion; /** * 风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警） */ @ApiModelProperty("风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）") private String dangerLevel; /** * 指派人员 */ @ApiModelProperty("指派人员") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -122,7 +122,7 @@ * 隐患名称 */ @ApiModelProperty("隐患名称") private String dagerName; private String dangerName; /** * 排查时间 @@ -140,7 +140,7 @@ * 隐患简述 */ @ApiModelProperty("隐患简述") private String dagerDescription; private String dangerDescription; /** * 是否立即整改（1是 、0否） springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
@@ -215,6 +215,7 @@ private Integer displayButton; @ApiModelProperty("隐患/安全记录id") @JsonSerialize(using = ToStringSerializer.class) private Long serviceId; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
@@ -38,6 +38,13 @@ private Long communityId; /** * 社区名称 */ @ApiModelProperty("社区名称") @JsonSerialize(using = ToStringSerializer.class) private String communityName; /** * 巡查时间 */ @ApiModelProperty("巡查时间") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3823,7 +3823,7 @@ * @return 安全工作记录详情查询结果 */ @GetMapping("/patrolRecord/safetyWorkRecord/detail") R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId); R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId); /** * 根据巡查记录id查询安全工作记录详情 @@ -3832,7 +3832,7 @@ * @return 安全工作记录详情查询结果 */ @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId") R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId); R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId); /** * 分页查询隐患报告 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
@@ -88,6 +88,7 @@ public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){ Long communityId = this.getCommunityId(); comSwPatrolRecordAddDTO.setCommunityId(communityId); comSwPatrolRecordAddDTO.setCreateBy(this.getLoginUserInfo().getUserId()); return communityService.addPatrolRecord(comSwPatrolRecordAddDTO); } @@ -125,7 +126,8 @@ @ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class) @GetMapping("/detailSafetyWorkRecord") public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) { return communityService.detailSafetyWorkRecord(safetyWorkRecordId); Long communityId = this.getLoginUserInfo().getCommunityId(); return communityService.detailSafetyWorkRecord(safetyWorkRecordId, communityId); } /** @@ -137,7 +139,8 @@ @ApiOperation(value = "根据巡查记录id查询安全工作记录详情", response = ComSwSafetyWorkRecordVO.class) @GetMapping("/detailSafetyWorkRecordByPrId") public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) { return communityService.detailSafetyWorkRecordByPrId(patrolRecordId); Long communityId = this.getLoginUserInfo().getCommunityId(); return communityService.detailSafetyWorkRecordByPrId(patrolRecordId, communityId); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
@@ -99,8 +99,8 @@ * @return 安全工作记录详情查询结果 */ @GetMapping("/safetyWorkRecord/detail") public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) { return comSwSafetyWorkRecordService.detailSafetyWorkRecord(safetyWorkRecordId); public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId) { return comSwSafetyWorkRecordService.detailSafetyWorkRecord(safetyWorkRecordId, communityId); } /** @@ -110,8 +110,8 @@ * @return 安全工作记录详情查询结果 */ @GetMapping("/safetyWorkRecord/detailByPrId") public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) { return comSwSafetyWorkRecordService.detailSafetyWorkRecordByPrId(patrolRecordId); public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId) { return comSwSafetyWorkRecordService.detailSafetyWorkRecordByPrId(patrolRecordId, communityId); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwSafetyWorkRecordService.java
@@ -28,7 +28,7 @@ * @param safetyWorkRecordId 安全工作记录 * @return 安全工作记录详情查询结果 */ R detailSafetyWorkRecord(Long safetyWorkRecordId); R detailSafetyWorkRecord(Long safetyWorkRecordId, Long communityId); /** * 根据巡查记录id查询安全工作记录详情 @@ -36,5 +36,5 @@ * @param patrolRecordId 巡查记录id * @return 安全工作记录详情查询结果 */ R detailSafetyWorkRecordByPrId(Long patrolRecordId); R detailSafetyWorkRecordByPrId(Long patrolRecordId, Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -405,13 +405,14 @@ // 修改报名状态 变为报名中 int num1=comActActivityDAO.updateStatusToBeginSign(); log.info("定时任务--修改社区活动报名状态活动数量【{}】",num1); //查询已经结束的活动，需要计算积分 List<Long> activityEndIds = comActActivityDAO.getActivityEndIds(); // 修改进行状态 变为进行中或者已结束 int num2=comActActivityDAO.updateStatusToBeginActiveOrEnd(); log.info("定时任务--修改社区活动进行状态活动数量【{}】",num2); int num3=comActActivityDAO.updateStatusToBeginAfterSingEnd(); log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】",num3); //查询已经结束的活动，需要计算积分 return R.ok(comActActivityDAO.getActivityEndIds()); return R.ok(activityEndIds); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -51,10 +51,7 @@ import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComMngPopulationHouseUserService; import com.panzhihua.service_community.service.ComMngPopulationService; import com.panzhihua.service_community.service.ComMngVillageService; import com.panzhihua.service_community.service.EventResourceService; import com.panzhihua.service_community.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; @@ -93,6 +90,8 @@ private ComMngPopulationDAO comMngPopulationDAO; @Resource private ComMngPopulationHouseUserService comMngPopulationHouseUserService; @Resource private ComMngPopulationHouseService comMngPopulationHouseService; @Resource private EventResourceService eventResourceService; @Resource @@ -363,31 +362,38 @@ @Override @Transactional(rollbackFor = Exception.class) public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId){ //需要新增的房屋集合 List<ComMngPopulationHouseDO> houseList = new ArrayList<>(); //需要新增的人口集合 List<ComMngPopulationDO> saveList = new ArrayList<>(); //需要修改的人口集合 List<ComMngPopulationDO> updateList = new ArrayList<>(); //需要新增的人口与房屋关系集合 List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>(); log.info("开始处理导入数据"); List<ComMngPopulationMistakeExcelVO> mistakes = new ArrayList<>(); try { // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>(); //查询社区信息 log.info("开始查询社区信息数据"); ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId); if(populationActVO == null){ log.error("未查询到社区信息"); return R.fail("未查询到社区信息"); } //查询该社区 // ComActDO comActDO = comActDAO.selectById(communityId); //查询该社区的省市区地址 // AreaAddressVO areaAddressVO = populationDAO.getAreaAddress(comActDO.getProvinceCode(), comActDO.getCityCode(), comActDO.getAreaCode()); //查询社区上街道信息 String streetName = populationActVO.getStreetName(); // if (comActDO.getStreetId() != null) { // ComStreetDO streetDO = comStreetDAO.selectById(comActDO.getStreetId()); // if (streetDO != null) { // streetName = streetDO.getName(); // } // } log.info("开始查询社区信息数据完成"); //查询当前社区标签列表 List<String> labelList = new ArrayList<>(); List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId)); if (!ObjectUtils.isEmpty(comMngUserTagDOS)) { labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList()); } StringBuilder areaPath = new StringBuilder(); areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">"); //处理实有人口信息 Integer nub = 1; for (ComMngPopulationServeExcelVO vo : list) { if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); @@ -401,40 +407,56 @@ if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId)); log.info("开始导入数据，行数:" + nub + "对象数据：" + vo.toString()); nub++; log.info("街路巷对象：" + comMngVillageDO); log.info("街路巷对象是否为空：" + ObjectUtils.isEmpty(comMngVillageDO)); log.info("街路巷对象是否为空2：" + (comMngVillageDO == null)); if (comMngVillageDO == null) { // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); // importErrorVO.setErrorMsg("街路巷或小区号不存在，请先在“小区管理”中添加该小区"); // importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo()); // populationImportErrorVOList.add(importErrorVO); // index++; ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); BeanUtils.copyProperties(vo,mistake); setMistake(mistake, vo); mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo()); mistakes.add(mistake); log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo()); continue; } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(streetName).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); //todo 后期优化改为批量 log.info("开始查询房屋是否存在"); //先判断房屋是否存在 ComMngPopulationHouseDO populationHouseDO = comMngPopulationHouseDAO.selectOne(new QueryWrapper<ComMngPopulationHouseDO>().lambda() .eq(ComMngPopulationHouseDO::getCommunityId, communityId).eq(ComMngPopulationHouseDO::getVillageId, comMngVillageDO.getVillageId()) .eq(ComMngPopulationHouseDO::getFloor, vo.getFloor()).eq(ComMngPopulationHouseDO::getUnitNo, vo.getUnitNo()) .eq(ComMngPopulationHouseDO::getHouseNo, vo.getHouseNo())); if (populationHouseDO == null) { //房屋信息不存在建立房屋信息 populationHouseDO = savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName()); if(!houseList.isEmpty()){ for (ComMngPopulationHouseDO house:houseList) { if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo()) && house.getHouseNo().equals(vo.getHouseNo())){ populationHouseDO = house; break; } } } if(populationHouseDO == null){ //房屋信息不存在建立房屋信息 populationHouseDO = savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName()); houseList.add(populationHouseDO); } vo.setHouseId(populationHouseDO.getId()); } log.info("开始查询房屋是否存在完成"); if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) { //空户处理完房屋信息，直接返回 @@ -442,22 +464,35 @@ } String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); //判断实有人口是否已存在 log.info("开始查询实有人口是否已存在"); ComMngPopulationDO populationDO = null; List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda() .eq(ComMngPopulationDO::getCardNo, cardNoAES)); if (populationDOList.isEmpty()) { //不存在实有人口,则新增 populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO); // ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO); populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO,labelList); saveList.add(populationDO); } else { //如果存在人口信息，且是自用房，则更新人口默认的房屋信息 // if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) { // populationDO = updatePopulationDO(vo, populationDO); // } populationDO = updatePopulationDO(vo, populationActVO, populationDOList.get(0)); //存在则更新 if(populationDOList.size() > 1){ for (ComMngPopulationDO population:populationDOList) { if(population.getActId().equals(communityId)){ populationDO = population; break; } } if(populationDO == null){ populationDO = populationDOList.get(0); } }else{ populationDO = populationDOList.get(0); } ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,labelList); updateList.add(updatePopulationDO); } log.info("开始查询实有人口是否已存在完成"); log.info("开始查询实有人口房屋居住信息"); //处理实有人口房屋居住信息 if (populationDO != null) { ComMngPopulationHouseUserDO populationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>() @@ -471,73 +506,78 @@ populationHouseUserDO.setRelation(vo.getRelation()); populationHouseUserDO.setRelationId(vo.getIsRent()); populationHouseUserDO.setResidence(vo.getResidence()); comMngPopulationHouseUserDAO.insert(populationHouseUserDO); houseUserList.add(populationHouseUserDO); } } log.info("开始查询实有人口房屋居住信息完成"); } }catch (Exception e){ log.info("出现错误，错误原因：" + e.getMessage()); } log.info("处理完成导入数据"); log.info("开始执行数据库导入"); if(!houseList.isEmpty()){ log.info("执行数据库导入房屋"); comMngPopulationHouseService.saveBatch(houseList); log.info("执行数据库导入房屋完成"); } if(!saveList.isEmpty()){ log.info("执行数据库导入人口"); this.saveBatch(saveList); log.info("执行数据库导入人口完成"); } if(!updateList.isEmpty()){ log.info("执行数据库更新人口"); this.updateBatchById(updateList); log.info("执行数据库更新人口完成"); } if(!houseUserList.isEmpty()){ log.info("执行数据库导入人口房屋关系"); comMngPopulationHouseUserService.saveBatch(houseUserList); log.info("执行数据库导入人口房屋关系完成"); } log.info("执行数据库导入完成"); if (!mistakes.isEmpty()) { log.info("返回错误数据"); return R.fail(mistakes); } return R.ok(); return R.ok(mistakes); } private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO, ComMngPopulationDO populationDO) throws Exception { UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",populationDO.getId()); ComMngPopulationDO update = new ComMngPopulationDO(); // update.setRoad(vo.getRoad()); // update.setDoorNo(vo.getDoorNo()); // update.setFloor(vo.getFloor()); // update.setUnitNo(vo.getUnitNo()); // update.setHouseNo(vo.getHouseNo()); // update.setHouseId(vo.getHouseId()); // if (StringUtils.isNotEmpty(populationDO.getPhone())) { // update.setPhone(populationDO.getPhone()); // } String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); BeanUtils.copyProperties(vo, update); private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){ BeanUtils.copyProperties(vo, populationDO); List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList()); //查询当前社区标签列表 List<String> list = new ArrayList<>(); List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId())); if (!ObjectUtils.isEmpty(comMngUserTagDOS)) { list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList()); } //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除 Iterator<String> iterator = userTag.iterator(); while (iterator.hasNext()) { String s = iterator.next(); if (!list.contains(s)) if (!labelList.contains(s)) iterator.remove(); } update.setLabel(Joiner.on(",").join(userTag)); update.setCardNo(cardNoAES); this.baseMapper.update(update,updateWrapper); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setLabel(Joiner.on(",").join(userTag)); populationDO.setCardNo(cardNoAES); return populationDO; } private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO) { private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) { ComMngPopulationDO populationDO = new ComMngPopulationDO(); BeanUtils.copyProperties(vo, populationDO); populationDO.setId(Snowflake.getId()); List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList()); //查询当前社区标签列表 List<String> list = new ArrayList<>(); List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId())); if (!ObjectUtils.isEmpty(comMngUserTagDOS)) { list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList()); } //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除 Iterator<String> iterator = userTag.iterator(); while (iterator.hasNext()) { String s = iterator.next(); if (!list.contains(s)) if (!labelList.contains(s)) iterator.remove(); } populationDO.setVillageId(comMngVillageDO.getVillageId()); @@ -555,7 +595,7 @@ // populationDO.setHouseId(null); // } this.baseMapper.insert(populationDO); // this.baseMapper.insert(populationDO); return populationDO; } @@ -596,7 +636,7 @@ if (vo.getControlStatus() != null) { populationHouseDO.setControlStatus(vo.getControlStatus()); } comMngPopulationHouseDAO.insert(populationHouseDO); // comMngPopulationHouseDAO.insert(populationHouseDO); return populationHouseDO; }
@@ -78,6 +78,44 @@ }else { comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.yes); } StringBuilder patrolNameString = new StringBuilder(); StringBuilder patrolPhoneString = new StringBuilder(); //巡查人员id查询巡查人员的名字和电话 if(StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolPerson())){ String[] patrolIds = comSwDangerReportVO.getPatrolPerson().split(","); for (int i = 0; i < patrolIds.length ; i++) { Map<String,String> leader = comSwPatrolRecordDAO.getPbServiceTeamById(patrolIds[i]); if(leader != null){ if(i != 0){ patrolNameString.append(","); patrolPhoneString.append(","); } patrolNameString.append(leader.get("name")); patrolPhoneString.append(leader.get("phone")); } } comSwDangerReportVO.setPPersonName(patrolNameString.toString()); comSwDangerReportVO.setPPersonPhone(patrolPhoneString.toString()); } //整改人员id查询整改人员的名字和电话 StringBuilder dangerNameString = new StringBuilder(); StringBuilder dangerPhoneString = new StringBuilder(); if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){ String[] dangerIds = comSwDangerReportVO.getRectifyPerson().split(","); for (int i = 0; i < dangerIds.length ; i++) { Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(dangerIds[i]); if(person != null){ if(i != 0){ dangerNameString.append(","); dangerPhoneString.append(","); } dangerNameString.append(person.get("name")); dangerPhoneString.append(person.get("phone")); } } comSwDangerReportVO.setDPersonName(dangerNameString.toString()); comSwDangerReportVO.setDPersonPhone(dangerPhoneString.toString()); } }); } return R.ok(iPage); @@ -116,7 +154,7 @@ comSwDangerReportVO.setPatrolType(sb.toString()); } //查询人员信息 //查询整改人员信息 if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){ StringBuilder sb = new StringBuilder(); String personIds[] = comSwDangerReportVO.getRectifyPerson().split(","); @@ -153,10 +191,43 @@ comSwDangerReportVO.setAssignPersonName(sb.toString()); } //查询巡查人员 Map<String,String> map = comSwPatrolRecordDAO.getPatrolPersonName(comSwDangerReportVO.getId()); if(map != null){ comSwDangerReportVO.setPatrolName(map.get("person_name")); StringBuilder patrolNameString = new StringBuilder(); StringBuilder patrolPhoneString = new StringBuilder(); //巡查人员id查询巡查人员的名字和电话 if(StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolPerson())){ String[] patrolIds = comSwDangerReportVO.getPatrolPerson().split(","); for (int i = 0; i < patrolIds.length ; i++) { Map<String,String> leader = comSwPatrolRecordDAO.getPbServiceTeamById(patrolIds[i]); if(leader != null){ if(i != 0){ patrolNameString.append(","); patrolPhoneString.append(","); } patrolNameString.append(leader.get("name")); patrolPhoneString.append(leader.get("phone")); } } comSwDangerReportVO.setPPersonName(patrolNameString.toString()); comSwDangerReportVO.setPPersonPhone(patrolPhoneString.toString()); } //整改人员id查询整改人员的名字和电话 StringBuilder dangerNameString = new StringBuilder(); StringBuilder dangerPhoneString = new StringBuilder(); if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){ String[] dangerIds = comSwDangerReportVO.getRectifyPerson().split(","); for (int i = 0; i < dangerIds.length ; i++) { Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(dangerIds[i]); if(person != null){ if(i != 0){ dangerNameString.append(","); dangerPhoneString.append(","); } dangerNameString.append(person.get("name")); dangerPhoneString.append(person.get("phone")); } } comSwDangerReportVO.setDPersonName(dangerNameString.toString()); comSwDangerReportVO.setDPersonPhone(dangerPhoneString.toString()); } return R.ok(comSwDangerReportVO); @@ -178,6 +249,44 @@ BeanUtils.copyProperties(comSwDangerReportDO, comSwDangerReportVO); } BeanUtils.copyProperties(comSwPatrolRecordDO, comSwDangerReportVO); StringBuilder patrolNameString = new StringBuilder(); StringBuilder patrolPhoneString = new StringBuilder(); //巡查人员id查询巡查人员的名字和电话 if(StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolPerson())){ String[] patrolIds = comSwDangerReportVO.getPatrolPerson().split(","); for (int i = 0; i < patrolIds.length ; i++) { Map<String,String> leader = comSwPatrolRecordDAO.getPbServiceTeamById(patrolIds[i]); if(leader != null){ if(i != 0){ patrolNameString.append(","); patrolPhoneString.append(","); } patrolNameString.append(leader.get("name")); patrolPhoneString.append(leader.get("phone")); } } comSwDangerReportVO.setPPersonName(patrolNameString.toString()); comSwDangerReportVO.setPPersonPhone(patrolPhoneString.toString()); } //整改人员id查询整改人员的名字和电话 StringBuilder dangerNameString = new StringBuilder(); StringBuilder dangerPhoneString = new StringBuilder(); if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){ String[] dangerIds = comSwDangerReportVO.getRectifyPerson().split(","); for (int i = 0; i < dangerIds.length ; i++) { Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(dangerIds[i]); if(person != null){ if(i != 0){ dangerNameString.append(","); dangerPhoneString.append(","); } dangerNameString.append(person.get("name")); dangerPhoneString.append(person.get("phone")); } } comSwDangerReportVO.setDPersonName(dangerNameString.toString()); comSwDangerReportVO.setDPersonPhone(dangerPhoneString.toString()); } return R.ok(comSwDangerReportVO); }
@@ -189,6 +189,12 @@ if(comSwPatrolRecordVO.getCreateBy() != null){ comSwPatrolRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwPatrolRecordVO.getCreateBy())); } ComSwPatrolRecordReportDO recordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>() .lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId,comSwPatrolRecordVO.getId())); if(recordReportDO != null){ comSwPatrolRecordVO.setServiceId(recordReportDO.getReportId()); } return R.ok(comSwPatrolRecordVO); }
@@ -9,6 +9,7 @@ import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO; import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComSwPatrolRecordDAO; import com.panzhihua.service_community.dao.ComSwPatrolRecordReportDAO; import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO; @@ -41,6 +42,9 @@ @Resource private ComSwPatrolRecordReportDAO comSwPatrolRecordReportDAO; @Resource private ComActDAO comActDAO; @Override public R pageSafetyWorkRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) { @@ -80,7 +84,7 @@ } @Override public R detailSafetyWorkRecord(Long safetyWorkRecordId) { public R detailSafetyWorkRecord(Long safetyWorkRecordId, Long communityId) { ComSwSafetyWorkRecordDO swSafetyWorkRecordDO = comSwSafetyWorkRecordDAO.selectById(safetyWorkRecordId); if (null == swSafetyWorkRecordDO) { return R.fail("该安全工作记录不存在"); @@ -132,11 +136,13 @@ comSwSafetyWorkRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwSafetyWorkRecordVO.getCreateBy())); } //所属社区名称 comSwSafetyWorkRecordVO.setCommunityName(comActDAO.selectById(communityId).getName()); return R.ok(comSwSafetyWorkRecordVO); } @Override public R detailSafetyWorkRecordByPrId(Long patrolRecordId) { public R detailSafetyWorkRecordByPrId(Long patrolRecordId, Long communityId) { ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId); ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId)); if (null != comSwPatrolRecordReportDO) { @@ -147,6 +153,8 @@ } ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO(); BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO); //所属社区名称 comSwSafetyWorkRecordVO.setCommunityName(comActDAO.selectById(communityId).getName()); return R.ok(comSwSafetyWorkRecordVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml
@@ -82,10 +82,10 @@ AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%') </if> <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'> AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType} AND cspr.patrol_type LIKE concat('%',#{comSwPatrolRecordDTO.patrolType},'%') </if> <if test='comSwPatrolRecordDTO.status != null and comSwPatrolRecordDTO.status != ""'> AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType} AND csdr.status = #{comSwPatrolRecordDTO.status} </if> <if test='comSwPatrolRecordDTO.patrolAtBegin != null and comSwPatrolRecordDTO.patrolAtBegin != ""'> AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolAtBegin} springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -489,10 +489,12 @@ // 修改报名状态为报名中 int num1=comBpActivityDAO.updateStatusToSign(); log.info("定时任务修改党建活动--修改报名状态为报名中始数量【{}】",num1); //查询已结束的活动id,便于计算用户积分 List<Long> pbActivityEndIds = comBpActivityDAO.getTaskPbActivityEndIds(); // 修改进行状态为进行中 或者已结束 int num2=comBpActivityDAO.updateStatusToActiveOrEnd(); log.info("定时任务修改党建活动--修改进行状态为进行中 或者已结束数量【{}】",num2); return R.ok(comBpActivityDAO.getTaskPbActivityEndIds()); return R.ok(pbActivityEndIds); } /**
