From 61266c83a200d14f181281289c076dfce83bf46c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 11 Aug 2021 11:18:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=9F=90=E7=A7=8D=E6=83=85=E5=86=B5=E4=B8=8B=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B8=A4=E6=AC=A1bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/PartymemberInfoService.java | 8 ++++++++ .../service/impl/PartyMemberConfirmServiceImpl.java | 5 ++++- .../service/impl/PartymemberInfoServiceImpl.java | 13 +++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java index 3290cb084f..4a25939dad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java @@ -162,4 +162,12 @@ public interface PartymemberInfoService extends BaseService listPartymemberInfoByGridId(List gridIdList); + + /** + * 获取党员信息 + * @param customerId + * @param userId + * @return + */ + PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 951d13bb86..80cc4cc91e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -191,7 +191,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //党员信息存入党员认证信息表 PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO, PartymemberInfoEntity.class); - + PartymemberInfoDTO info = partymemberInfoService.getPartyMemberInfoByUser(partyMemberInfoDTO.getCustomerId(), partyMemberInfoDTO.getUserId()); + if (null != info) { + partyMemberInfoDTO.setId(info.getId()); + } if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) { log.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO)); //将访问记录更新到热心居民申请行为记录表 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index c6ce32113b..57e6a2922c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.modules.partymember.service.impl; +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; @@ -25,6 +26,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.PartyMemberConstant; import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; @@ -41,6 +43,7 @@ import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO; import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO; import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO; +import kotlin.jvm.internal.Lambda; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -235,4 +238,14 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl list = baseDao.selectListPartymemberInfoByGridId(gridIdList); return list; } + + @Override + public PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PartymemberInfoEntity :: getCustomerId, customerId); + wrapper.eq(PartymemberInfoEntity :: getUserId, userId); + wrapper.ne(PartymemberInfoEntity :: getConfirmResult, PartyMemberConstant.REJECTED); + PartymemberInfoEntity entity = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(entity, PartymemberInfoDTO.class); + } } From e8dc33ccdf0762615e52ecfd5ce61894bedf3636 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 12 Aug 2021 10:19:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E5=A4=9A-=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95-=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/controller/EpmetUserController.java | 9 +++++---- .../resources/mapper/epmetuser/StaffPatrolRecordDao.xml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 39a634fb76..359ec365d9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -100,13 +100,14 @@ public class EpmetUserController { @RequirePermission(requirePermission = RequirePermissionEnum.MORE_PATROL_RECORD_LIST) public Result> staffPatrolList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class); - if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode()) + //程序稳定 部分安全校验可省略 + /*if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode()) && !"reportProjectCount".equals(formDTO.getSortCode()) && !"totalTime".equals(formDTO.getSortCode())) { throw new RenException("参数错误，排序条件值错误"); - } - if (formDTO.getTime() != 1 && formDTO.getTime() != 3) { + }*/ + /*if (formDTO.getTime() != 1 && formDTO.getTime() != 3) { throw new RenException("参数错误，最近时间值不正确"); - } + }*/ formDTO.setUserId(tokenDto.getUserId()); return new Result>().ok(epmetUserService.staffPatrolList(formDTO)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml index ce078c21f3..57fb814737 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml @@ -76,8 +76,8 @@ AND cs.real_name = #{staffName} - - ssp.grid_id = #{gridId} + + #{gridId} GROUP BY ssp.grid_id, ssp.staff_id From c44b7cbb0a3b7a7e6a68c86b453a926002839fd5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 12 Aug 2021 11:06:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E7=BB=84=E7=BB=87=E6=8C=87=E6=95=B0=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E4=B8=8E=E5=B9=B3=E9=98=B4=E5=A4=A7=E5=B1=8F=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=8C=87=E6=95=B0=E6=8E=92=E8=A1=8C=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8F=96=E6=9C=88=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/IndexController.java | 4 +- .../screen/ScreenIndexDataMonthlyDao.java | 8 +-- .../evaluationindex/screen/IndexService.java | 2 +- .../screen/impl/IndexServiceImpl.java | 12 +++-- .../screen/ScreenIndexDataMonthlyDao.xml | 51 +++++++++---------- 5 files changed, 39 insertions(+), 38 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java index 55543e1e70..b0f7fcf03f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java @@ -84,7 +84,7 @@ public class IndexController { /** * 5、下级部门指数排行（安宁数据段用） - * + * 工作端小程序：下级组织指数排行也调用的此接口。 * @param formDTO * @return com.epmet.commons.tools.utils.Result> * @Author zhangyong @@ -154,7 +154,7 @@ public class IndexController { /** * @param formDTO * @author yinzuomei - * @description 8、平阴大屏-下级街道or网格指数排行 + * @description 8、平阴大屏-下级街道or网格指数排行 默认查询上个月 * @Date 2021/2/28 14:33 **/ @PostMapping("subagencyindexrank-py") diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java index 18a3795b05..f5307d1fc2 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java @@ -107,24 +107,24 @@ public interface ScreenIndexDataMonthlyDao{ List getSingleIndexRank(SubSingleIndexRankFormDTO formDTO); /** - * @param yearId + * @param monthId * @param areaCode * @Description 根据areaCode查询下级指数 * @author yinzuomei */ List selectSubStreetByAreaCode(@Param("customerId") String customerId, - @Param("yearId") String yearId, + @Param("monthId") String monthId, @Param("areaCode") String areaCode, @Param("topNum") int topNum); /** - * @param yearId + * @param monthId * @param areaCode * @Description 根据areaCode查询网格指数 * @author yinzuomei */ List selectSubGridByAreaCode(@Param("customerId") String customerId, - @Param("yearId") String yearId, + @Param("monthId") String monthId, @Param("areaCode") String areaCode, @Param("topNum") int topNum); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java index bfbf7a9d41..97ad39b278 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java @@ -90,7 +90,7 @@ public interface IndexService { /** * @param formDTO * @author yinzuomei - * @description 8、平阴大屏-下级街道or网格指数排行 + * @description 8、平阴大屏-下级街道or网格指数排行 默认查询上个月 * @Date 2021/2/28 14:33 **/ List subAgencyIndexRankPy(SubAgencyIndexRankPyFormDTO formDTO); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index d945b93460..8ccc906405 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -426,7 +426,8 @@ public class IndexServiceImpl implements IndexService { /** * @param formDTO * @author yinzuomei - * @description 8、平阴大屏-下级街道or网格指数排行 + * @description 8、平阴大屏-下级街道or网格指数排行 默认查询上个月 + * 改为默认查询上个月， * @Date 2021/2/28 14:33 **/ @Override @@ -435,10 +436,10 @@ public class IndexServiceImpl implements IndexService { if (!"street".equals(formDTO.getType()) && !"grid".equals(formDTO.getType())) { throw new RenException("type传参错误,街道：street;网格：grid"); } - LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE); - String yearId = String.valueOf(now.getYear()); + String monthId=DateUtils.getBeforeNMonth(1); if("street".equals(formDTO.getType())){ - List streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum()); + // 默认查询8个街道，平阴大屏，不会跟随中央区变化 + List streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),monthId,formDTO.getAreaCode(),formDTO.getTopNum()); // 小数四舍五入 streetList.forEach(indexRank -> { indexRank.setOrgType("street"); @@ -449,7 +450,8 @@ public class IndexServiceImpl implements IndexService { }); return streetList; } - List gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum()); + // 网格会根据中央区选择具体某个街道，变化 + List gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),monthId,formDTO.getAreaCode(),formDTO.getTopNum()); // 小数四舍五入 gridList.forEach(indexRank -> { indexRank.setOrgType("grid"); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index ce83c8e058..8ef92f4afd 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -352,47 +352,46 @@