Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java

@@ -62,7 +62,10 @@ public interface ScreenWorkRecordOrgDailyDao extends BaseDao<ScreenWorkRecordOrg
     List<String> selectCustomerTypeCode(@Param("dataType")String dataType, @Param("customerId")String customerId);
 
 
-    WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId, @Param("dateId")String dateId,@Param("typeCodeList") List<String> typeCodeList);
+    WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId,
+                                          @Param("agencyName")String agencyName,
+                                          @Param("dateId")String dateId,
+                                          @Param("typeCodeList") List<String> typeCodeList);
 
     WorkRecordSubRank selectUpToCalGrid(@Param("gridId")String gridId, @Param("dateId")String dateId, @Param("typeCodeList")List<String> typeCodeList);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -116,8 +116,9 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         //2）、下级所有组织
         List<WorkRecordSubRank> subAgencyRankList = new ArrayList<>();
         for(ScreenCustomerAgencyCommonDTO agencyCommonDTO:agencyInfoDTO.getSubAgencies()){
-            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),dateId,typeCodeList);
+            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),agencyCommonDTO.getAgencyName(),dateId,typeCodeList);
             if(null !=agencyRes){
+                agencyRes.setIsDefault("no");
                 subAgencyRankList.add(agencyRes);
             }else{
                 WorkRecordSubRank agencyDefault=new WorkRecordSubRank();
@@ -135,6 +136,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         for(ScreenCustomerGridCommonDTO gridCommonDTO:agencyInfoDTO.getSubGrids()){
             WorkRecordSubRank gridRes=baseDao.selectUpToCalGrid(gridCommonDTO.getGridId(),dateId,typeCodeList);
             if (null != gridRes) {
+                gridRes.setIsDefault("no");
                 subGridList.add(gridRes);
             } else {
                 WorkRecordSubRank gridResDefault = new WorkRecordSubRank();

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml

@@ -109,8 +109,8 @@
 
     <select id="selectUpToCalAgency" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordSubRank">
         SELECT
-            sca.AGENCY_ID AS orgId,
+            #{agencyId} as orgId
-            sca.AGENCY_NAME AS `NAME`,
+            #{agencyName} AS `NAME`,
             sum( m.PARTICIPATE_USER_TOTAL ) AS participateUserTotal,
             sum( m.ORGANIZE_TOTAL ) AS participateTotal
         FROM

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml

@@ -29,6 +29,8 @@
         customer_id,
         month_id,
         org_id,
+        pid,
+        pids,
         org_name,
         meeting_code,
         type_code,
@@ -51,6 +53,8 @@
             #{monthId},
 
             #{item.orgId},
+            #{item.pid},
+            #{item.pids},
             #{item.orgName},
             #{item.meetingCode},
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java

@@ -74,7 +74,7 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
      * @author wangc
      * @date 2020.07.27 00:58
     **/
-    List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("userIds") List<String> userIds, @Param("realName")String realName);
+    List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("customerId") String customerId, @Param("realName")String realName);
 
     //临时用下in
     List<UserWechatDTO> selectNotInUserBaseInfoTemp();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -190,23 +191,10 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      **/
     @Override
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
-        List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
-        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
-        if(null == userIds) userIds = new LinkedList<>();
-        CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO();
-        customerParam.setCustomerId(customerUserFormDTO.getCustomerId());
-        Result<List<String>> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam);
-        if(volunteer.success() && null != volunteer.getData() && !volunteer.getData().isEmpty()){
-            userIds.addAll(volunteer.getData());
-            userIds = userIds.stream().distinct().collect(Collectors.toList());
-        }
-        if(null == userIds || userIds.isEmpty()){
-            return allData;
-        }
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
-        allData = userWechatDao.selectResiAndStrangerInfo(userIds,customerUserFormDTO.getName());
+        List<CustomerUser4PointResultDTO> allData = userWechatDao.selectResiAndStrangerInfo(customerUserFormDTO.getCustomerId(),customerUserFormDTO.getName());
-        if(null == allData || allData.isEmpty()){
+        if (!CollectionUtils.isEmpty(allData)){
-            return allData;
+            return new ArrayList<>();
         }
         allData.forEach(info -> {
             if(StringUtils.isNotBlank(info.getUserId())){

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -125,9 +125,7 @@
             wechat.DEL_FLAG = '0'
             AND (wechat.NICKNAME IS NOT NULL OR wechat.NICKNAME <![CDATA[ <> ]]> '')
             AND (base.SURNAME IS NOT NULL OR base.SURNAME <![CDATA[ <> ]]> '')
-            <foreach collection="userIds" item="item" open="AND (" separator=" OR " close=" )">
+            AND wechat.CUSTOMER_ID = #{customerId}
-                wechat.USER_ID = #{item}
-            </foreach>
             <if test='null != realName and "" != realName'>
                 AND (base.REAL_NAME LIKE concat('%',#{realName},'%') OR wechat.NICKNAME LIKE concat('%',#{realName},'%'))
             </if>