Merge branch 'dev_bugfix_ljj' into develop

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;
     /**
      * 页码
      * */

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<CustomerStaffEntity> {
      * @author sun
      */
     CustomerStaffDTO selectByMobile(@Param("customerId") String customerId, @Param("mobile") String mobile);
+    /**
+     * @Description 按staffId查询基础信息
+     * @author sun
+     */
+    List<CustomerStaffDTO> selectByStaffIds(@Param("staffIds") List<String> staffIds, @Param("realName") String realName);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -25,6 +25,7 @@ import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 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;
 
@@ -277,10 +278,31 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         formDTO.setPageNo(pageIndex);
         //起始查询日期
         formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime(), "yyyyMMdd"));
+        List<CustomerStaffDTO> 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<String> 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<CustomerStaffDTO> 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 -> {

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
         <where>
             <if test="gridIds != null and gridIds.size() > 0">
-                <foreach collection="gridIds" item="gridId" separator="OR" open="(" close=")">
-                    member.GRID_ID = #{gridId}
+                member.GRID_ID in (
+                <foreach collection="gridIds" item="gridId" separator=",">
+                    #{gridId}
                 </foreach>
+                )
             </if>
             <if test="searchedStaffName != null and searchedStaffName != ''">
                 and member.STAFF_NAME like CONCAT('%',#{searchedStaffName},'%')

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -15,4 +15,20 @@
         LIMIT 1
     </select>
 
+    <select id="selectByStaffIds" resultType="com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO">
+        SELECT
+            *
+        FROM
+            customer_staff
+        WHERE 1=1
+        <if test="realName != null and realName != '' ">
+            AND real_name = #{realName}
+        </if>
+        <if test="staffIds != null and staffIds.size() > 0">
+            <foreach collection="staffIds" item="userId" open="AND user_id IN (" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

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,
+            <!-- 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
+            <!-- LEFT JOIN customer_staff cs ON ssp.staff_id = cs.user_id -->
             WHERE
             ssp.del_flag = '0'
             AND ssp.date_id >= #{patrolStartTime}
-            <if test="staffName!= null and staffName != ''">
+            <!-- <if test="staffName!= null and staffName != ''">
                 AND cs.real_name = #{staffName}
+            </if>-->
+            <if test="staffId!= null and staffId != ''">
+                AND ssp.staff_id = #{staffId}
             </if>
             <if test="gridIds != null and gridIds.size() > 0">
                 <foreach collection="gridIds" item="gridId" open="AND ssp.grid_id IN (" separator="," close=")">

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
     </select>
 
 
@@ -130,7 +130,7 @@
                 and scg.AREA_CODE like CONCAT(#{areaCode},'%')
         ORDER BY
                 m.POINT_TOTAL DESC,
-                m.user_name
+                convert(m.user_name using gbk) ASC
     </select>
 
     <select id="selectAgencyResiPointListWithoutPartyMem"
@@ -170,7 +170,7 @@
             </if>
         </if>
         ORDER BY
-        u.point_total DESC
+        u.point_total DESC,convert(u.user_name using gbk) ASC
         LIMIT #{topNum}
     </select>
 

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<DepartmentStaffListResultDTO> departmentStaffList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentStaffListFormDTO formDTO) {
         formDTO.setStaffId(tokenDTO.getUserId());
         ValidatorUtils.validateEntity(formDTO);