信息采集审核

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java

@@ -21,4 +21,6 @@ public class VisitListFormDTO extends PageFormDTO {
 
     private String customerId;
 
+    private String orgId;
+
 }

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

@@ -78,6 +78,13 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
     @Override
     public PageData<IcResiCollectVisitorDTO> getVisitorList(VisitListFormDTO formDTO) {
         PageData<IcResiCollectVisitorDTO> result = new PageData<>(new ArrayList<>(), 0);
+        if (StringUtils.isBlank(formDTO.getStartTime()) && StringUtils.isBlank(formDTO.getEndTime()) ){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+            if (null == staffInfo){
+                throw new EpmetException("查询人员信息失败"+formDTO.getUserId());
+            }
+            formDTO.setOrgId(staffInfo.getAgencyId());
+        }
         PageInfo<IcResiCollectVisitorDTO> pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO));
         result.setList(pageList.getList());
         result.setTotal(Integer.parseInt(String.valueOf(pageList.getTotal())));

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

@@ -99,6 +99,9 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
+        <if test='orgId != null and orgId != "" '>
+            AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
+        </if>
         order by CREATED_TIME desc
     </select>