From 5b05cf01108a2161f1bc1de371a7f80aaef72531 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 12 Aug 2021 12:23:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datastats/FactGridMemberStatisticsDailyDao.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml index fdbb6fdc04..ffec0be996 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml @@ -85,9 +85,11 @@ from fact_grid_member_statistics_daily member - - member.GRID_ID = #{gridId} + member.GRID_ID in ( + + #{gridId} + ) and member.STAFF_NAME like CONCAT('%',#{searchedStaffName},'%') From 20820b5eb0c7997218f2ebcff357725f9f2699bf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 12 Aug 2021 14:09:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E3=80=81=E5=A4=A7=E5=B1=8F=E7=83=AD=E5=BF=83=E5=B8=82=E6=B0=91?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=EF=BC=9A?= =?UTF-8?q?=E5=85=88=E6=8C=89=E7=85=A7=E6=80=BB=E7=A7=AF=E5=88=86=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E5=86=8D=E6=8C=89=E7=85=A7=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E6=8B=BC=E9=9F=B3=E5=8D=87=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/ScreenPartyUserRankDataDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml index 102b78296e..c336aa362d 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml @@ -15,7 +15,7 @@ AND all_parent_ids LIKE CONCAT('%',#{agencyId},'%') ORDER BY point_total DESC, - user_name + convert(user_name using gbk) ASC @@ -129,7 +129,7 @@ and scg.AREA_CODE like CONCAT(#{areaCode},'%') ORDER BY m.POINT_TOTAL DESC, - m.user_name + convert(m.user_name using gbk) ASC From 0466477944c91f7eeca191c75c55d7e60e87a218 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 12 Aug 2021 15:12:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=88=97=E8=A1=A8?= =?UTF-8?q?=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 --- .../dto/epmetuser/form/StaffListFormDTO.java | 4 +++ .../dao/epmetuser/CustomerStaffDao.java | 7 ++++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 25 +++++++++++++++++-- .../mapper/epmetuser/CustomerStaffDao.xml | 16 ++++++++++++ .../mapper/epmetuser/StaffPatrolRecordDao.xml | 11 +++++--- 5 files changed, 57 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java index 4de304f917..6be616d569 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java @@ -36,6 +36,10 @@ public class StaffListFormDTO implements Serializable { * 工作人员姓名；可空 */ private String staffName; + /** + * 工作人员Id + */ + private String staffId; /** * 页码 * */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java index b3ca304972..3e96cbcc26 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java @@ -23,6 +23,8 @@ import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 政府工作人员表 * @@ -37,4 +39,9 @@ public interface CustomerStaffDao extends BaseDao { * @author sun */ CustomerStaffDTO selectByMobile(@Param("customerId") String customerId, @Param("mobile") String mobile); + /** + * @Description 按staffId查询基础信息 + * @author sun + */ + List selectByStaffIds(@Param("staffIds") List staffIds, @Param("realName") String realName); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 281f24cc6d..cf7aef270e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -25,11 +25,11 @@ import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService; import com.epmet.dataaggre.service.govorg.GovOrgService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.math.BigDecimal; import java.text.NumberFormat; import java.util.*; import java.util.stream.Collectors; @@ -274,10 +274,31 @@ public class EpmetUserServiceImpl implements EpmetUserService { formDTO.setPageNo(pageIndex); //起始查询日期 formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime(), "yyyyMMdd")); + List staffList = new ArrayList<>(); + //2-1.按名字检索时先查询人员基础信息 + if (StringUtils.isEmpty(formDTO.getStaffName())) { + staffList = customerStaffDao.selectByStaffIds(null, formDTO.getStaffName()); + if (!CollectionUtils.isEmpty(staffList)) { + formDTO.setStaffId(staffList.get(0).getUserId()); + } + } + //2-2.查询业务数据 resultList = staffPatrolRecordDao.selectStaffPatrolList(formDTO); + //2-3.查询人员基本信息【之前sql关联人员表查性别、姓名效率低 所以分开查） + if (!CollectionUtils.isEmpty(staffList)) { + List staffIdList = resultList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList()); + staffList = customerStaffDao.selectByStaffIds(staffIdList, null); + } //3.封装数据并返回 - resultList.forEach(re -> list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()))); + List finalStaffList = staffList; + resultList.forEach(re -> { + list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName())); + finalStaffList.stream().filter(l -> re.getStaffId().equals(l.getUserId())).forEach(s -> { + re.setGender(s.getGender().toString()); + re.setStaffName(s.getRealName()); + }); + }); //NumberFormat numberFormat = NumberFormat.getInstance(); //numberFormat.setMaximumFractionDigits(NumConstant.ZERO); resultList.forEach(re -> { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index 3b1b0c9db3..0e06223aa7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -15,4 +15,20 @@ LIMIT 1 + + \ No newline at end of file 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 57fb814737..9f0fd1fe74 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 @@ -59,8 +59,8 @@ SELECT ssp.grid_id AS gridId, ssp.staff_id AS staffId, - cs.real_name AS staffName, - cs.gender AS gender, + IFNULL(MAX(ssp.latest_patrol_time), '') AS patrolStartTime, IFNULL(SUM(ssp.patrol_total), 0) AS patrolTotal, MAX(DATE_ID) dateId, @@ -68,12 +68,15 @@ IFNULL(SUM(ssp.total_time), 0) AS timeNum FROM stats_staff_patrol_record_daily ssp - LEFT JOIN customer_staff cs ON ssp.staff_id = cs.user_id + WHERE ssp.del_flag = '0' AND ssp.date_id >= #{patrolStartTime} - + + + AND ssp.staff_id = #{staffId} From 0403fb40cc527b6778c47c13f6cf8befaef1230c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 12 Aug 2021 15:18:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E3=80=81?= =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E9=80=89=E4=BA=BA=E6=8E=A5=E5=8F=A3=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IssueManageController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java index 673ff0a3fc..5bbe9e25b0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java @@ -56,7 +56,7 @@ public class IssueManageController { * @Description 议题管理-部门人员选择 **/ @PostMapping("departmentstafflist") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT) + // @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT) public Result departmentStaffList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentStaffListFormDTO formDTO) { formDTO.setStaffId(tokenDTO.getUserId()); ValidatorUtils.validateEntity(formDTO);