springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -747,7 +747,7 @@ comActMicroWishVO.setCommunityId(communityId); // comActMicroWishVO.setBackUserId(userId); comActMicroWishVO.setIsPageMyWish(null); return communityService.pageMicroWish(comActMicroWishVO); return communityService.pageMicroWishAdmin(comActMicroWishVO); } @ApiOperation(value = "心愿详情") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
@@ -37,7 +37,7 @@ List<Long> getPopulationHouseIdByhHosueId(@Param("houseId") Long houseId); @Select("select cmp.id,cmp.name,cmp.card_no,cmp.phone from com_mng_population_house_user as cmphu " + "left join com_mng_population as cmp on cmp.id = cmphu.popul_id where cmphu.house_id = #{houseId}") + "inner join com_mng_population as cmp on cmp.id = cmphu.popul_id where cmphu.house_id = #{houseId}") List<ComMngPopulationHouseUserAdminVO> getHouseUserByHouseId(@Param("houseId") Long houseId); @Select("update com_mng_population_house_user set relation = null where id = #{id}") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
@@ -62,7 +62,6 @@ } circleTopicDO = new ComActNeighborCircleTopicDO(); BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO); circleTopicDO.setStatus(1); circleTopicDO.setCreateAt(new Date()); circleTopicDO.setCreateBy(addCircleTopicAdminDTO.getUserId());
@@ -239,6 +239,7 @@ clusterMember.setNationCode(nationCode); clusterMember.setImageUrl(Constants.CLUSTER_MEMBER_DEFAULT_IMAGE_URL); clusterMember.setCreateAt(nowDate); clusterMember.setCommunityId(communityId); saveList.add(clusterMember); memberMap.put(clusterMember.getIdCard(),clusterMember); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -585,7 +585,7 @@ String pensionAuthPeriod = DateUtils.getCurrentDateString_YYYY(); //查询所有老人信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作 List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>()); List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(null); authElderliesList.forEach(authElderlies -> { //查询高龄认证记录 ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda() @@ -603,7 +603,7 @@ }); //查询所有养老人员信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作 List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.selectList(new QueryWrapper<>()); List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.selectList(null); pensionAuthPensionerList.forEach(authPension -> { //查询养老认证记录 ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda() @@ -638,6 +638,12 @@ authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod()); authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult()); authHistoryRecordDO.setAuthId(authRecords.getId()); //查询老人信息 ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId()); if(authElderliesDO != null){ BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO); } comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO); } }else{ @@ -672,6 +678,11 @@ pensionAuthDO.setAuthMethod(authRecords.getAuthMethod()); pensionAuthDO.setVerificationResult(authRecords.getVerificationResult()); pensionAuthDO.setAuthId(authRecords.getId()); //查询老人信息 ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId()); if(authPensionerDO != null){ BeanUtils.copyProperties(authPensionerDO,pensionAuthDO); } comPensionAuthHistoryRecordMapper.updateById(pensionAuthDO); } }else{ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComClusterOrganizationMemberDOMapper.xml
@@ -112,7 +112,7 @@ ccom.phone, case ccom.`status` when '1' then '启用' when '2' then '禁用' when '2' then '停用' end `status` FROM com_cluster_organization_member AS ccom springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -399,11 +399,11 @@ if (commonEventEditDTO.getId() == null) { // 检查特殊人群上报时参数 if (commonEventEditDTO.getEventType().equals(6)) { if (commonEventEditDTO.getPopulationIds().isEmpty()) { return R.fail("上报人员为空"); } } // if (commonEventEditDTO.getEventType().equals(6)) { // if (commonEventEditDTO.getPopulationIds().isEmpty()) { // return R.fail("上报人员为空"); // } // } EventDO eventDO = new EventDO(); BeanUtils.copyProperties(commonEventEditDTO, eventDO); @@ -420,7 +420,8 @@ if (eventMapper.insert(eventDO) > 0) { // 如果是特殊人群，则新增特殊人群与事件关系 if (commonEventEditDTO.getEventType().equals(6)) { if (commonEventEditDTO.getEventType().equals(6) && commonEventEditDTO.getPopulationIds() != null && commonEventEditDTO.getPopulationIds().size() > 0) { List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>(); commonEventEditDTO.getPopulationIds().forEach(populationId -> { EventSpecialCrowdRecordDO specialCrowdRecordDO = new EventSpecialCrowdRecordDO(); @@ -1818,11 +1819,7 @@ if (eventDO == null) { throw new ServiceException("id为" + id + "的事件不存在"); } if (eventDO.getEventStatus() != null && (eventDO.getEventStatus().intValue() == 1 || eventDO.getEventStatus().intValue() == 4)) {// 草稿 // 或者 // 已撤销 // 的事件可以删除 if (eventDO.getEventStatus() != null) { eventDO.setEventStatus(3);// 逻辑删除 eventDO.setUpdateBy(userId); int updated = this.getBaseMapper().updateById(eventDO);
