From 43402549602fc4211f33119176be7740cc640420 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 22 May 2023 13:43:32 +0800 Subject: [PATCH 01/30] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1-=E7=BA=A2?= =?UTF-8?q?=E8=89=B2=E4=BB=A3=E5=8A=9E=E3=80=91=E5=AF=BC=E5=85=A5+?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AorgIdPath=E8=AE=A1=E7=AE=97=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tractLingShanSpecialCrowdExcelImportListener.java | 12 ++++++++++-- .../impl/LingShanSpecialCrowdServiceImpl.java | 12 +++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java index 23dd2802ad..6361f0da7d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java @@ -9,7 +9,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.PidUtils; @@ -244,7 +246,7 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener it = getOriginDatas().iterator(); @@ -256,9 +258,15 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener Date: Mon, 22 May 2023 13:44:33 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=A9=9A=E5=A7=BB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataSyncRecordMaritalPageFormDTO.java | 33 ++++ .../DataSyncRecordMaritalPageResultDTO.java | 72 ++++++++ .../DataSyncRecordMaritalController.java | 15 +- .../epmet/dao/DataSyncRecordMaritalDao.java | 8 +- .../service/DataSyncRecordMaritalService.java | 6 +- .../impl/DataSyncConfigServiceImpl.java | 172 +++++++++--------- .../DataSyncRecordMaritalServiceImpl.java | 22 ++- .../mapper/DataSyncRecordMaritalDao.xml | 28 +++ 8 files changed, 259 insertions(+), 97 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java create mode 100755 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java new file mode 100644 index 0000000000..2a12e788b7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.form.dataSync; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/10/13 14:16 + */ +@Data +public class DataSyncRecordMaritalPageFormDTO extends PageFormDTO { + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + private String customerId; + /** + * 当前工作人员id + */ + private String staffId; + /** + * 当前工作人员所属组织id + */ + private String agencyId; +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java new file mode 100755 index 0000000000..b07eae992b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java @@ -0,0 +1,72 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class DataSyncRecordMaritalPageResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 婚姻状况 + */ + private String maritalStatusName; + + /** + * 婚姻状况 + */ + private String maritalStatus; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + private Integer dealStatusName; + + /** + * 处理结果 + */ + private String dealResult; +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java index c06aea31d3..045f211439 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +11,9 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordMaritalPageFormDTO; +import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO; import com.epmet.service.DataSyncRecordMaritalService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,10 +36,12 @@ public class DataSyncRecordMaritalController { @Autowired private DataSyncRecordMaritalService dataSyncRecordMaritalService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = dataSyncRecordMaritalService.page(params); - return new Result>().ok(page); + @PostMapping("page") + public Result> page(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordMaritalPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCustomerId(tokenDto.getCustomerId());; + PageData page = dataSyncRecordMaritalService.page(formDTO); + return new Result>().ok(page); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java index 772a5728db..f6383bd19a 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java @@ -1,8 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO; import com.epmet.entity.DataSyncRecordMaritalEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 数据同步记录-居民婚姻信息 @@ -12,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface DataSyncRecordMaritalDao extends BaseDao { - + + List pageSelect(@Param("customerId") String customerId, @Param("idCard") String idCard, @Param("name") String name, @Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java index 078a98ca9f..4abc5f56d6 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java @@ -5,6 +5,8 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordMaritalPageFormDTO; +import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO; import com.epmet.entity.DataSyncRecordDeathEntity; import com.epmet.entity.DataSyncRecordMaritalEntity; @@ -22,12 +24,12 @@ public interface DataSyncRecordMaritalService extends BaseService * @author generator * @date 2023-05-18 */ - PageData page(Map params); + PageData page(DataSyncRecordMaritalPageFormDTO formDTO); /** * 默认查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 44afdadf4d..5032f1b8d9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1674,101 +1674,105 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList = null; +// String scope=""; + List allScope = new ArrayList<>(); for (DataSyncConfigDTO config : configData) { + allScope.addAll(config.getScopeList()); + } - String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(",")); - - // 查询上一次定时任务 居民位置记录 - LambdaQueryWrapper logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); - IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); - // userInfoResultDTOS 待处理的数据存放 - List userInfoResultDTOS = new ArrayList<>(); - - boolean isNum = false; - int start = 0; - // 如果没有log数据 说明第一次进入循环 - if (logEntity == null){ - // 从0开始 优先获取规定的几个社区 - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); - // 如果不满5000条数据 下面再从别的社区取 isNum = true - if (userInfoResultDTOS.size() < 50000){ - isNum = true; - } - }else{ - // 如果有log数据 判断一下上次停留在特殊数据还是普通数据 1是特殊数据（优先的几个社区） - if (logEntity.getDataType() == 1){ - // 从上次停止的数据开始获取 - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); - // 下面再从别的社区取 isNum = true 凑够50000 - isNum = true; - }else if (logEntity.getDataType() == 0){ - // 如果是普通数据 直接从次停留在特殊数据获取 - start = logEntity.getDataCount(); - } - +// String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(",")); + + // 查询上一次定时任务 居民位置记录 + LambdaQueryWrapper logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); + // .eq(IcResiUserTaskLogEntity::getDataScope,scope) + IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + // userInfoResultDTOS 待处理的数据存放 + List userInfoResultDTOS = new ArrayList<>(); + + boolean isNum = false; + int start = 0; + // 如果没有log数据 说明第一次进入循环 + if (logEntity == null){ + // 从0开始 优先获取规定的几个社区 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); + // 如果不满5000条数据 下面再从别的社区取 isNum = true + if (userInfoResultDTOS.size() < 50000){ + isNum = true; + } + }else{ + // 如果有log数据 判断一下上次停留在特殊数据还是普通数据 1是特殊数据（优先的几个社区） + if (logEntity.getDataType() == 1){ + // 从上次停止的数据开始获取 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); + // 下面再从别的社区取 isNum = true 凑够50000 + isNum = true; + }else if (logEntity.getDataType() == 0){ + // 如果是普通数据 直接从次停留在特殊数据获取 + start = logEntity.getDataCount(); } - // 建立一个最后插入log的标志 - IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); - newLog.setCreatedTime(new Date()); - newLog.setType("hunyin"); - newLog.setDataScope(scope); - // 设置查询数据范围 - formDTO.setOrgList(config.getScopeList()); - DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); - // 如果true 说明之前获取过特殊数据了 把50000补完普通数据 - if (isNum){ - formDTO.setStart(start); - formDTO.setEnd(50000-userInfoResultDTOS.size()); - dbResiList = getNatUserInfoFromDbLimit(formDTO); + } + // 建立一个最后插入log的标志 + IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); + newLog.setCreatedTime(new Date()); + newLog.setType("hunyin"); +// newLog.setDataScope(scope); + + // 设置查询数据范围 + formDTO.setOrgList(allScope); + DataSyncEnum anEnum = DataSyncEnum.getEnum(EpidemicConstant.DATA_CODE_MARITAL); + // 如果true 说明之前获取过特殊数据了 把50000补完普通数据 + if (isNum){ + formDTO.setStart(start); + formDTO.setEnd(50000-userInfoResultDTOS.size()); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + dbResiList.addAll(userInfoResultDTOS); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); + }else{ + // false 说明之前没有获取过特殊数据了 + formDTO.setStart(start); + formDTO.setEnd(start+50000); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + // 如果不够五万了 从头再来 + if (dbResiList.size()<50000){ + // 特殊数据 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size()); dbResiList.addAll(userInfoResultDTOS); - newLog.setDataType(0); - newLog.setDataCount(50000-dbResiList.size()); - }else{ - // false 说明之前没有获取过特殊数据了 - formDTO.setStart(start); - formDTO.setEnd(start+50000); - dbResiList = getNatUserInfoFromDbLimit(formDTO); - // 如果不够五万了 从头再来 - if (dbResiList.size()<50000){ - // 特殊数据 - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size()); - dbResiList.addAll(userInfoResultDTOS); - // 特殊数据不够 在获取普通数据 - if (dbResiList.size() < 50000){ - formDTO.setStart(0); - formDTO.setEnd(50000-dbResiList.size()); - dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO)); - newLog.setDataType(0); - newLog.setDataCount(50000-dbResiList.size()); + // 特殊数据不够 在获取普通数据 + if (dbResiList.size() < 50000){ + formDTO.setStart(0); + formDTO.setEnd(50000-dbResiList.size()); + dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO)); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); - }else{ - newLog.setDataType(1); - newLog.setDataCount(50000-dbResiList.size()); - } }else{ - newLog.setDataType(0); - newLog.setDataCount(start+50000); + newLog.setDataType(1); + newLog.setDataCount(50000-dbResiList.size()); } + }else{ + newLog.setDataType(0); + newLog.setDataCount(start+50000); } + } - if (CollectionUtils.isEmpty(dbResiList)) { - continue; - } - switch (anEnum) { - case HUN_YIN: - try { - //查询正常状态的居民 - hunYin(dbResiList); - resiUserTaskLogDao.insert(newLog); - log.info("======hunyin信息拉取结束======"); - } catch (Exception e) { - log.error("marry thread execute exception", e); - } - default: - log.warn("没有要处理的数据"); - } +/* if (CollectionUtils.isEmpty(dbResiList)) { + continue; + }*/ + switch (anEnum) { + case HUN_YIN: + try { + //查询正常状态的居民 + hunYin(dbResiList); + resiUserTaskLogDao.insert(newLog); + log.info("======hunyin信息拉取结束======"); + } catch (Exception e) { + log.error("marry thread execute exception", e); + } + default: + log.warn("没有要处理的数据"); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java index 417d6e6b18..ea7d2bfb94 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java @@ -4,15 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.DataSyncRecordMaritalDao; import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordMaritalPageFormDTO; +import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO; import com.epmet.entity.DataSyncRecordDeathEntity; import com.epmet.entity.DataSyncRecordMaritalEntity; import com.epmet.service.DataSyncRecordMaritalService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,12 +38,16 @@ import java.util.Map; public class DataSyncRecordMaritalServiceImpl extends BaseServiceImpl implements DataSyncRecordMaritalService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, DataSyncRecordMaritalDTO.class); + public PageData page(DataSyncRecordMaritalPageFormDTO formDTO) { + + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + formDTO.setAgencyId(null != staffInfoCacheResult ? staffInfoCacheResult.getAgencyId() : null); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()); + List records = baseDao.pageSelect(formDTO.getCustomerId(),formDTO.getIdCard(), formDTO.getName(), formDTO.getAgencyId()); + + PageInfo pi = new PageInfo<>(records); + + return new PageData<>(records, pi.getTotal()); } @Override diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml index 18a11ba5d5..6d9e9fec0b 100755 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml @@ -24,5 +24,33 @@ + \ No newline at end of file From 0bea06a90e8d5989e67ca0f110a1da48d8f4617b Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 22 May 2023 13:53:15 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E5=A9=9A=E5=A7=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DataSyncRecordMaritalDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml index 6d9e9fec0b..694abb548a 100755 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml @@ -27,6 +27,8 @@ @@ -635,6 +636,7 @@ FROM ic_event e LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID + LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0' e.DEL_FLAG = 0 From cc80e06b770df200f88871033d671d8e132f2240 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 10:37:30 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/src/main/resources/mapper/IcEventDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 4f237fb01f..5e135be6d9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -665,6 +665,7 @@ FROM ic_event e LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID + LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0' e.DEL_FLAG = 0 From f6699621e75e830ed4bd7d10fc06ad0d101bbc97 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 10:45:45 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/result/IcPartyActPageResultDTO.java | 3 +++ .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index f28f8a0083..3af4e5509a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -79,5 +80,7 @@ public class IcPartyActPageResultDTO implements Serializable { private List joinOrgList; //导出用 private String joinOrgNameStr; + + private List attachments; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c5d1d7244b..8d6142864d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -290,6 +291,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ l.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(l.getIcPartyActId())); + l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId())); }); } return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); From 33ee70df725fa897919832982a94cc81badfd838 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 11:19:18 +0800 Subject: [PATCH 15/30] fix --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 8d6142864d..0aabe4a1d1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -289,11 +289,16 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPageList(formDTO)); if(!formDTO.getIsPage()){ + // 不分页 pageInfo.getList().forEach(l->{ l.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(l.getIcPartyActId())); - l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId())); }); } + + pageInfo.getList().forEach(l->{ + l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId())); + }); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } From 459ad8bea0e79cd7a8b05491e556893949815998 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 12:07:23 +0800 Subject: [PATCH 16/30] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F-=E6=8C=89=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E6=B4=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1=E3=80=91?= =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=A0=E5=85=A5=E7=BD=91=E6=A0=BCid?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LingShanScreenServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 274ebff387..92498cb55f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; @@ -223,7 +224,15 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD */ @Override public List actQtyOfPartyOrgStats(String agencyId, Date holdTimeStart, Date holdTimeEnd) { - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + ArrayList rl = new ArrayList<>(); + AgencyInfoCache agencyInfo = null; + try { + agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + } catch (Exception e) { + logger.warn("【灵山大屏-按组织查询党建活动统计】" + ExceptionUtils.getErrorStackTrace(e)); + return rl; + } + if (agencyInfo == null) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); } @@ -298,7 +307,6 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD } // 将结果map转化为list，返回 - ArrayList rl = new ArrayList<>(); orgDimMap.forEach((actType, orgStatsMap) -> { LingShanScreenPartyActQtyStatsResultDTO re = new LingShanScreenPartyActQtyStatsResultDTO(); From cae9ea93962a666dda77b151fdef0482842e4558 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 12:10:44 +0800 Subject: [PATCH 17/30] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F-=E6=8C=89=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E6=B4=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1=E3=80=91?= =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=A0=E5=85=A5=E7=BD=91=E6=A0=BCid?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LingShanScreenServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 92498cb55f..2051ed9cd5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -97,7 +97,14 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD @Override public List partyActTypeAndQuantity(String agencyId) { - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + AgencyInfoCache agencyInfo = null; + try { + agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + } catch (Exception e) { + logger.warn("【灵山大屏-按活动类型查询党建活动统计】" + ExceptionUtils.getErrorStackTrace(e)); + return new ArrayList<>(); + } + if (agencyInfo == null) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); } From c0716b14ac342955c64bf7ffd05369fcaaaab8e3 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 13:01:19 +0800 Subject: [PATCH 18/30] fix --- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index d81f18e48b..8a5c4724d9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -314,7 +314,7 @@ from ic_party_org o left join ic_party_member m on (o.ID = m.SSZB and m.DEL_FLAG = 0) where o.DEL_FLAG = 0 - and o.AGENCY_PIDS like #{orgId} + and o.AGENCY_ID like #{orgId} and o.PARTY_ORG_TYPE = 5 group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE From 7058eeae7401ed69ca0ec32f3358e63011f77644 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 13:25:33 +0800 Subject: [PATCH 19/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=88=86=E6=9E=90=E7=BB=9F=E8=AE=A1=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEventDao.xml | 40 +++++-------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 5e135be6d9..1277b78618 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -571,31 +571,16 @@ @@ -636,7 +620,6 @@ FROM ic_event e LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID - LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0' e.DEL_FLAG = 0 @@ -665,7 +648,6 @@ FROM ic_event e LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID - LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0' e.DEL_FLAG = 0 From 138017afe4185e7a241c91f20a6fb1fe913d5234 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 13:57:46 +0800 Subject: [PATCH 20/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=E4=B8=A2=E5=A4=B1=E5=93=8D=E5=BA=94=E7=BA=A7=E5=88=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20eventType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcEventDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java index cb8e5a0a2e..1e4d738587 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java @@ -67,6 +67,11 @@ public class IcEventDTO implements Serializable { */ private String sourceType; + /** + * 响应级别 + */ + private String eventType; + /** * 发生时间 */ From ac8a21f5efcb1183b4e1176ad8bafec4814e78b3 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 14:02:31 +0800 Subject: [PATCH 21/30] fix --- .../java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java | 2 +- .../partyOrg/service/impl/LingShanPartyOrgServiceImpl.java | 4 ++-- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 2eba20f381..6036489899 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -146,7 +146,7 @@ public interface IcPartyOrgDao extends BaseDao { @Param("agencyId") String agencyId, @Param("orgIdpath") String orgIdpath); - List lingshanListDw(@Param("orgIdPath") String orgIdPath); + List lingshanListDw(@Param("orgIdPath") String orgIdPath, @Param("orgId") String orgId); /** * @Description: 灵山：直属支部 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java index 105ba5c1d6..18c2bc9890 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java @@ -60,7 +60,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res q = new QueryWrapper().select(" party_org_type, count(*) childrenQty").lambda() // 本组织下级的所有子级 .eq(IcPartyOrgEntity::getAgencyId, agencyId) - .eq(IcPartyOrgEntity::getPartyOrgType, PartyOrgTypeEnum.BRANCH.getCode()) // 是社区，就只能查询支部了。这里要控制，因为支部的行政组织也是对应到社区，所以这里必须限制一下 + // .eq(IcPartyOrgEntity::getPartyOrgType, PartyOrgTypeEnum.BRANCH.getCode()) // 是社区，就只能查询支部了。这里要控制，因为支部的行政组织也是对应到社区，所以这里必须限制一下 .groupBy(IcPartyOrgEntity::getPartyOrgType); } else { // 街道及以上级别，用pids，因为要从社区开始查，本级及下级 @@ -160,7 +160,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res if (OrgInfoConstant.AGENCY.equals(orgType)) { // 是行政组织，就要查询组织的下一级。查询下一级只能用AGENCY_PIDS AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); - return partyOrgDao.lingshanListDw(PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids())); + return partyOrgDao.lingshanListDw(PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()), orgId); } else { // 是网格,哪里来的党委？ return new ArrayList<>(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 8a5c4724d9..87c812a662 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -301,8 +301,8 @@ from ic_party_org o left join ic_party_member m on (o.AGENCY_ID = m.AGENCY_ID and m.DEL_FLAG = 0) where o.DEL_FLAG = 0 - and o.AGENCY_PIDS = #{orgIdPath} - and o.PARTY_ORG_TYPE <= 4 + and (o.AGENCY_PIDS = #{orgIdPath} or o.AGENCY_ID=#{orgId}) + and o.PARTY_ORG_TYPE = 4 group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE From b0be7d95a0480d66c61463491a60f41a2ed0fd0e Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 15:47:15 +0800 Subject: [PATCH 22/30] fix --- .../service/impl/LingShanPartyOrgServiceImpl.java | 10 +++++++++- .../service/impl/LingShanScreenServiceImpl.java | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java index 18c2bc9890..88e1f53606 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java @@ -49,7 +49,15 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res ArrayList tl = new ArrayList<>(); // 1.党组织 - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + AgencyInfoCache agencyInfo = null; + try { + agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + } catch ( + Exception e) { + logger.error("【灵山大屏-党对象数量查询】组织未找到:" + agencyId); + return tl; + } + String orgIdPath = PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()); String level = agencyInfo.getLevel(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 2051ed9cd5..eb7d429307 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -62,7 +62,14 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD @Override public List listPartyOrgCategoryAndQuantity(String agencyId) { - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + AgencyInfoCache agencyInfo = null; + try { + agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + } catch (Exception e) { + logger.error("【灵山大屏-党对象数量查询】组织未找到:" + agencyId); + return new ArrayList<>(); + } + if (agencyInfo == null) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); } From b51abb8feb39579ab84aa7f3e65148981d9ea581 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 16:18:00 +0800 Subject: [PATCH 23/30] =?UTF-8?q?lingshanScreen/partymemberList=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=A1=8C=E6=94=BF+=E5=85=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LingShanScreenController.java | 11 +++++++++-- .../service/LingShanScreenService.java | 2 +- .../service/impl/LingShanScreenServiceImpl.java | 17 ++++++++++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java index 4d4d4ef6c5..cad4fd458a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java @@ -14,6 +14,7 @@ import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActT import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgCategoryResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgTreeResultDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -81,8 +82,14 @@ public class LingShanScreenController { * @date: 2023/4/14 3:20 PM */ @GetMapping("partymemberList") - public Result> partymemberList(@RequestParam("partyOrgId") String partyOrgId) { - List l = lingShanScreenService.partymemberListByPartyOrgId(partyOrgId); + public Result> partymemberList(@RequestParam(value = "partyOrgId", required = false) String partyOrgId, + @RequestParam(value = "agencyId", required = false) String agencyId) { + + if (StringUtils.isAllBlank(partyOrgId, agencyId)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "党组织ID和行政组织ID必须传一个"); + } + + List l = lingShanScreenService.partymemberListByPartyOrgId(partyOrgId, agencyId); return new Result().ok(l); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java index 265467a062..3bb6c52f76 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java @@ -44,7 +44,7 @@ public interface LingShanScreenService { * @author: WangXianZhang * @date: 2023/4/14 3:22 PM */ - List partymemberListByPartyOrgId(String partyOrgId); + List partymemberListByPartyOrgId(String partyOrgId, String agencyId); /** * @description: agencyId下的党组织活动数统计 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index eb7d429307..32c44d5198 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -168,7 +168,22 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD } @Override - public List partymemberListByPartyOrgId(String partyOrgId) { + public List partymemberListByPartyOrgId(String partyOrgId, String agencyId) { + + if (StringUtils.isBlank(partyOrgId)) { + // 没有传党组织id，使用行政组织id去查询对应的党组织，然后给党组织id赋值 + LambdaQueryWrapper q = new LambdaQueryWrapper<>(); + q.eq(IcPartyOrgEntity::getAgencyId, agencyId); + q.le(IcPartyOrgEntity::getPartyOrgType, 4);// agency，那就只查询<=4的，即省委~社区党委 + IcPartyOrgEntity partyOrg = icPartyOrgDao.selectOne(q); + if (partyOrg == null) { + logger.warn("根据该行政组织为找到对应的党组织信息：" + agencyId); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "根据该行政组织为找到对应的党组织信息"); + } + + partyOrgId = partyOrg.getId(); + } + IcPartyOrgEntity partyOrg = icPartyOrgDao.selectById(partyOrgId); LambdaQueryWrapper query = null; if (partyOrg == null) { From 61d3fe7cea5bccfc5990b89dc095ad69ac07f9de Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 16:38:05 +0800 Subject: [PATCH 24/30] =?UTF-8?q?lingshanScreen/partyObjsByType=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9Eid=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java index d0f0208e1e..079c96f13d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java @@ -10,6 +10,7 @@ import lombok.Data; @Data public class LingShanScreenPartyObjectByTypeRstDTO { + private String id; private String name; private String longitude; private String latitude; From ce06ef6d4e1f1806b5cec380fdd35362995f3a99 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 16:52:33 +0800 Subject: [PATCH 25/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E6=9D=91?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9C=AA=E6=98=BE=E7=A4=BA=E6=96=B0=E6=9D=91?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcEventDTO.java | 6 ++++ .../src/main/resources/mapper/IcEventDao.xml | 33 +++++++++---------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java index 1e4d738587..ae22f9570e 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -72,6 +73,11 @@ public class IcEventDTO implements Serializable { */ private String eventType; + /** + * 二类分类Id + */ + private List categoryList; + /** * 发生时间 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 1277b78618..95dcf768a0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -666,16 +666,15 @@ From e7124fd279bd069292bf5929c5ff218290b39d95 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 24 May 2023 09:33:12 +0800 Subject: [PATCH 26/30] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E4=BA=BA=E7=BE=A4=E6=9F=B1=E7=8A=B6=E5=9B=BE=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcResiUserDao.java | 10 ++++ .../impl/LingShanScreenServiceImpl.java | 46 ++++++++++--------- .../main/resources/mapper/IcResiUserDao.xml | 14 ++++++ 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 935df32987..2f88d9df5e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -24,6 +24,7 @@ import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcVolunteerPolyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.LingShanSpecialCrowdStatsByOrgResultDTO; import com.epmet.dto.result.resi.ResiPortrayalDetailDTO; import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.IcResiUserEntity; @@ -503,4 +504,13 @@ public interface IcResiUserDao extends BaseDao { * @return */ IcResiUserEntity getById(String icResiUserId); + + /** + * @Description: 根据orgIdPath计算各个组织下的特殊人群数量 + * @param orgIdPath: + * @Return java.util.List + * @Author: wangxianzhang + * @Date: 2023/5/24 9:27 AM + */ + List countSpecialQtyByOrgIdPath(@Param("orgIdPath") List orgIdPath); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java index bb2438083e..22ac97061b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java @@ -47,6 +47,9 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; + @Autowired + private IcResiUserDao icResiUserDao; + @Override public List specialCrowdStatsCountBySubOrg(String parentAgencyId, String specialType) { List subOrgs = getResultDataOrThrowsException(govOrgOpenFeignClient.subOrgList(parentAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, null); @@ -77,30 +80,31 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD return t; }).collect(Collectors.toList()); - - List ol = new ArrayList<>(); - if (LingShanSpecialCrowdTypeEnums.AZBJ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - ol.addAll(azbjDao.statsCountsByOrgIds(orgIdPaths)); - } - if (LingShanSpecialCrowdTypeEnums.SQJZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - ol.addAll(sqjzDao.statsCountsByOrgIds(orgIdPaths)); - } - if (LingShanSpecialCrowdTypeEnums.XFRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - ol.addAll(xfryDao.statsCountsByOrgIds(orgIdPaths)); - } - if (LingShanSpecialCrowdTypeEnums.JDRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - ol.addAll(jdryDao.statsCountsByOrgIds(orgIdPaths)); - } - if (LingShanSpecialCrowdTypeEnums.JZHZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - ol.addAll(jzhzDao.statsCountsByOrgIds(orgIdPaths)); - } + List ol = icResiUserDao.countSpecialQtyByOrgIdPath(orgIdPaths); + + // List ol = new ArrayList<>(); + // if (LingShanSpecialCrowdTypeEnums.AZBJ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { + // ol.addAll(azbjDao.statsCountsByOrgIds(orgIdPaths)); + // } + // if (LingShanSpecialCrowdTypeEnums.SQJZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { + // ol.addAll(sqjzDao.statsCountsByOrgIds(orgIdPaths)); + // } + // if (LingShanSpecialCrowdTypeEnums.XFRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) { + // ol.addAll(xfryDao.statsCountsByOrgIds(orgIdPaths)); + // } + // if (LingShanSpecialCrowdTypeEnums.JDRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) { + // ol.addAll(jdryDao.statsCountsByOrgIds(orgIdPaths)); + // } + // if (LingShanSpecialCrowdTypeEnums.JZHZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { + // ol.addAll(jzhzDao.statsCountsByOrgIds(orgIdPaths)); + // } // 开始给rl++ - for (LingShanSpecialCrowdStatsByOrgResultDTO o : ol) { - for (LingShanSpecialCrowdStatsByOrgResultDTO r : rl) { - if (o.getOrgIdPath().contains(r.getOrgIdPath())) { + for (LingShanSpecialCrowdStatsByOrgResultDTO qtyData : ol) { + for (LingShanSpecialCrowdStatsByOrgResultDTO subOrg : rl) { + if (qtyData.getOrgIdPath().contains(subOrg.getOrgIdPath())) { // 如果ol中的数据，orgIdPath包含了这个组织的orgIdPath，说明这条数据就是这个组织的数据，那就++把 - r.setQuantity(r.getQuantity() + o.getQuantity()); + subOrg.setQuantity(subOrg.getQuantity() + qtyData.getQuantity()); } } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index d2df1efa5d..2d1ea4a800 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1741,4 +1741,18 @@ + + + From 1721925316bc8fc0d24719c40f2cafc589af2c3a Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 24 May 2023 09:59:17 +0800 Subject: [PATCH 27/30] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E4=BA=BA=E7=BE=A4=E6=9F=B1=E7=8A=B6=E5=9B=BE=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcResiUserDao.java | 3 +- .../impl/LingShanScreenServiceImpl.java | 29 +++++++------------ .../main/resources/mapper/IcResiUserDao.xml | 3 ++ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 2f88d9df5e..e38980a006 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -512,5 +512,6 @@ public interface IcResiUserDao extends BaseDao { * @Author: wangxianzhang * @Date: 2023/5/24 9:27 AM */ - List countSpecialQtyByOrgIdPath(@Param("orgIdPath") List orgIdPath); + List countSpecialQtyByOrgIdPath(@Param("orgIdPath") String orgIdPath, + @Param("specialType") String specialType); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java index 22ac97061b..3fc6567154 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java @@ -52,6 +52,16 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD @Override public List specialCrowdStatsCountBySubOrg(String parentAgencyId, String specialType) { + + AgencyInfoCache parentAgencyInfo; + + try { + parentAgencyInfo = CustomerOrgRedis.getAgencyInfo(parentAgencyId); + } catch (Exception e) { + logger.warn("【灵山大屏-特殊人群柱状图统计】传入的parentAgencyId参数未找到指定的组织信息:" + parentAgencyId); + return new ArrayList<>(); + } + List subOrgs = getResultDataOrThrowsException(govOrgOpenFeignClient.subOrgList(parentAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, null); List orgIdPaths = subOrgs.stream().map(sub -> PidUtils.convertPid2OrgIdPath(sub.getOrgId(), sub.getPids())).collect(Collectors.toList()); @@ -80,24 +90,7 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD return t; }).collect(Collectors.toList()); - List ol = icResiUserDao.countSpecialQtyByOrgIdPath(orgIdPaths); - - // List ol = new ArrayList<>(); - // if (LingShanSpecialCrowdTypeEnums.AZBJ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - // ol.addAll(azbjDao.statsCountsByOrgIds(orgIdPaths)); - // } - // if (LingShanSpecialCrowdTypeEnums.SQJZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - // ol.addAll(sqjzDao.statsCountsByOrgIds(orgIdPaths)); - // } - // if (LingShanSpecialCrowdTypeEnums.XFRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - // ol.addAll(xfryDao.statsCountsByOrgIds(orgIdPaths)); - // } - // if (LingShanSpecialCrowdTypeEnums.JDRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - // ol.addAll(jdryDao.statsCountsByOrgIds(orgIdPaths)); - // } - // if (LingShanSpecialCrowdTypeEnums.JZHZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { - // ol.addAll(jzhzDao.statsCountsByOrgIds(orgIdPaths)); - // } + List ol = icResiUserDao.countSpecialQtyByOrgIdPath(PidUtils.convertPid2OrgIdPath(parentAgencyInfo.getId(), parentAgencyInfo.getPids()), specialType); // 开始给rl++ for (LingShanSpecialCrowdStatsByOrgResultDTO qtyData : ol) { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 2d1ea4a800..0c50b87c38 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1753,6 +1753,9 @@ and r.PIDS like CONCAT(#{orgIdPath}, '%') and s.SPECIAL_RQLB is not null and s.SPECIAL_RQLB != '' + + and s.SPECIAL_RQLB like CONCAT('%',#{specialType},'%') + group by r.PIDS From 9c7819f469aa399e50326b197fcf942deff89cfd Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 24 May 2023 10:00:31 +0800 Subject: [PATCH 28/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=88=86=E6=9E=90=E7=BB=9F=E8=AE=A1=E8=AE=A1=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcEventDao.java | 2 +- .../service/impl/IcEventServiceImpl.java | 7 ++- .../src/main/resources/mapper/IcEventDao.xml | 46 +++++++++---------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index f79ece004f..27d7a7b8b5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -205,7 +205,7 @@ public interface IcEventDao extends BaseDao { * 处理中 只要包含一条阅收数据即为处理中 * 已结案 只要包含一条完结数据即为已结案 * 已归档 只要包含一条归档数据即为已归档 - * manageType: 0、上报 1、阅收 3、完结 4、审核 5、事件评价 6、结案归档 + * manageType: 0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档 */ Integer getEventByReplyTypeCount(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 5045a06e11..084d683e3b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1977,9 +1977,9 @@ public class IcEventServiceImpl extends BaseServiceImpl SELECT - count( ra.eventId ) + count( r.id ) FROM - ( - SELECT - r.IC_EVENT_ID AS eventId - FROM - ic_event_reply r - - r.DEL_FLAG = 0 - AND r.MANAGE_STATUS = #{manageType} - AND r.IC_EVENT_ID IN ( - SELECT e.id FROM ic_event e - - e.DEL_FLAG = 0 - - AND e.SOURCE_TYPE = #{sourceType} - - - AND e.GRID_PIDS LIKE concat(#{orgIdPath},'%') - - - ) - - GROUP BY r.IC_EVENT_ID - ) ra + ic_event_reply r + + r.DEL_FLAG = 0 AND r.MANAGE_STATUS = #{manageType} + + OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4 + + AND r.IC_EVENT_ID IN ( + SELECT e.id from ic_event e + + e.DEL_FLAG = 0 + + AND e.SOURCE_TYPE = #{sourceType} + + + AND e.GRID_PIDS LIKE concat(#{orgIdPath},'%') + + + ) + SELECT ea.total AS total, - ea.agencyId AS orgId, eb.total, - ROUND(eb.total/ea.total,2) AS rate + round( eb.total / ea.total, 2 ) AS rate FROM ( - SELECT - count( e.id ) AS total, - e.AGENCY_ID AS agencyId + SELECT count( e.id ) AS total, e.id AS id FROM ic_event e e.DEL_FLAG = 0 - - AND e.AGENCY_ID IN( - - #{orgId} - ) + + AND e.AGENCY_ID = #{orgId} - ) ea, - ( - SELECT count( e.id ) AS total FROM ic_event e - LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID - - e.DEL_FLAG = 0 AND r.MANAGE_STATUS = 2 - - AND e.AGENCY_ID IN( - - #{orgId} - ) - - - GROUP BY e.AGENCY_ID - ) eb + ) ea, + ( + SELECT count( r.id ) AS total FROM ic_event_reply r + + r.DEL_FLAG = 0 + AND r.MANAGE_STATUS = 2 OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4 OR r.MANAGE_STATUS = 5 + AND r.IC_EVENT_ID IN ( + SELECT e.id AS id FROM ic_event e + + e.DEL_FLAG = 0 + + AND e.AGENCY_ID = #{orgId} + + + ) + + ) eb From 8a854c3b59123c49d0f3b6295389a28a15b9f88c Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 24 May 2023 10:46:49 +0800 Subject: [PATCH 30/30] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E4=B8=AD?= =?UTF-8?q?=E5=A4=AE=EF=BC=8C=E5=90=84=E7=A7=8D=E4=BA=BA=E5=91=98=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E6=95=B0=E9=87=8F=E8=8F=9C=E5=8D=95=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcResiUserDao.java | 5 +++- .../impl/LingShanScreenServiceImpl.java | 25 ++++--------------- .../main/resources/mapper/IcResiUserDao.xml | 17 ++++++++++++- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index e38980a006..4fd2411767 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -512,6 +512,9 @@ public interface IcResiUserDao extends BaseDao { * @Author: wangxianzhang * @Date: 2023/5/24 9:27 AM */ - List countSpecialQtyByOrgIdPath(@Param("orgIdPath") String orgIdPath, + List countSpecialQtyOfAllSubOrg(@Param("orgIdPath") String orgIdPath, @Param("specialType") String specialType); + + int countSpecialQtyOfOrg(@Param("orgIdPath") String orgIdPath, @Param("specialType") String specialType); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java index 3fc6567154..7f81fa1f66 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java @@ -90,7 +90,7 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD return t; }).collect(Collectors.toList()); - List ol = icResiUserDao.countSpecialQtyByOrgIdPath(PidUtils.convertPid2OrgIdPath(parentAgencyInfo.getId(), parentAgencyInfo.getPids()), specialType); + List ol = icResiUserDao.countSpecialQtyOfAllSubOrg(PidUtils.convertPid2OrgIdPath(parentAgencyInfo.getId(), parentAgencyInfo.getPids()), specialType); // 开始给rl++ for (LingShanSpecialCrowdStatsByOrgResultDTO qtyData : ol) { @@ -111,25 +111,10 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD ArrayList l = new ArrayList<>(); - LambdaQueryWrapper azbjq = new LambdaQueryWrapper<>(); - azbjq.likeRight(LingshanSpecialCrowdDetailAzbjEntity::getOrgIdPath, orgIdPath); - l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.AZBJ.getType(), LingShanSpecialCrowdTypeEnums.AZBJ.getName(), azbjDao.selectCount(azbjq))); - - LambdaQueryWrapper sqjzq = new LambdaQueryWrapper<>(); - sqjzq.likeRight(LingshanSpecialCrowdDetailSqjzEntity::getOrgIdPath, orgIdPath); - l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.SQJZ.getType(), LingShanSpecialCrowdTypeEnums.SQJZ.getName(), sqjzDao.selectCount(sqjzq))); - - LambdaQueryWrapper xfryq = new LambdaQueryWrapper<>(); - xfryq.likeRight(LingshanSpecialCrowdDetailXfryEntity::getOrgIdPath, orgIdPath); - l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.XFRY.getType(), LingShanSpecialCrowdTypeEnums.XFRY.getName(), xfryDao.selectCount(xfryq))); - - LambdaQueryWrapper jdryq = new LambdaQueryWrapper<>(); - jdryq.likeRight(LingshanSpecialCrowdDetailJdryEntity::getOrgIdPath, orgIdPath); - l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.JDRY.getType(), LingShanSpecialCrowdTypeEnums.JDRY.getName(), jdryDao.selectCount(jdryq))); - - LambdaQueryWrapper jzhzq = new LambdaQueryWrapper<>(); - jzhzq.likeRight(LingshanSpecialCrowdDetailJzhzEntity::getOrgIdPath, orgIdPath); - l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.JZHZ.getType(), LingShanSpecialCrowdTypeEnums.JZHZ.getName(), jzhzDao.selectCount(jzhzq))); + for (LingShanSpecialCrowdTypeEnums e : LingShanSpecialCrowdTypeEnums.values()) { + int qty = icResiUserDao.countSpecialQtyOfOrg(orgIdPath, e.getType()); + l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(e.getType(), e.getName(), qty)); + } return l; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 0c50b87c38..731cfdaa5a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1743,7 +1743,7 @@ - + + +