重点行程列表

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

@@ -19,4 +19,6 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable
 
     private String staffId;
     private String customerId;
+
+    private String agencyId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java

@@ -12,5 +12,43 @@ import java.io.Serializable;
 public class EmphasisTripListResultDTO implements Serializable {
     private static final long serialVersionUID = -1646171374911115465L;
 
+    private String id;
+    private String agencyId;
+    private String name;
+    private String mobile;
+    private String idCard;
+
+    /**
+     * 来源地
+     */
+    private String sourceAddress;
+
+    /**
+     * 来曹事由
+     */
+    private String describe;
+
+    /**
+     * 核酸检测结果
+     */
+    private String natOutcome;
+    private String natOutComeName;
+
+    /**
+     * 7天旅居史
+     */
+    private String sojournHistory;
+    private String sojournHistoryName;
+
+    /**
+     * 隔离状态
+     */
+    private String isolateType;
+    private String isolateTypeName;
+
+    /**
+     * 来曹时间
+     */
+    private String arriveDate;
 
 }

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

@@ -2,7 +2,9 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcTripReportRecordDTO;
+import com.epmet.dto.form.EmphasisTripListFormDTO;
 import com.epmet.dto.form.PageTripReportFormDTO;
+import com.epmet.dto.result.EmphasisTripListResultDTO;
 import com.epmet.entity.IcTripReportRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -42,4 +44,13 @@ public interface IcTripReportRecordDao extends BaseDao<IcTripReportRecordEntity>
      * @return
      */
     int batchDel(@Param("userId")String userId,@Param("agencyId")String agencyId, @Param("ids")String[] ids);
+
+    /**
+     * @Description 【重点行程名单】列表
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/11/1 16:18
+     */
+    List<EmphasisTripListResultDTO> emphasisTripList(EmphasisTripListFormDTO formDTO);
+
 }

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

@@ -32,6 +32,7 @@ import com.epmet.dao.IcTripReportRecordDao;
 import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
 import com.epmet.dto.IcTripReportRecordDTO;
+import com.epmet.dto.SysDictDataDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.EmphasisTripListResultDTO;
 import com.epmet.dto.result.EmphasisTripPieDetailResultDTO;
@@ -693,8 +694,34 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
      */
     @Override
     public PageData<EmphasisTripListResultDTO> emphasisTripList(EmphasisTripListFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo){
+            throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId());
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
         PageData<EmphasisTripListResultDTO> result = new PageData<>();
-
+        if (formDTO.getIsPage()){
+            PageInfo<EmphasisTripListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.emphasisTripList(formDTO));
+            result.setList(CollectionUtils.isEmpty(pageInfo.getList()) ? new ArrayList<>() : pageInfo.getList());
+            result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
+        }else {
+            List<EmphasisTripListResultDTO> list = baseDao.emphasisTripList(formDTO);
+            result.setList(list);
+            result.setTotal(list.size());
+        }
+        // 7天旅居史字典
+        Result<List<SysDictDataDTO>> sojournMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SOJOURN_HISTORY.getCode());
+        Map<String, String> sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>();
+
+        // 隔离状态字典
+        Result<List<SysDictDataDTO>> isolateMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.ISOLATE_TYPE.getCode());
+        Map<String, String> isolateMap = isolateMapRes.success() && CollectionUtils.isNotEmpty(isolateMapRes.getData()) ? isolateMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>();
+        if (CollectionUtils.isNotEmpty(result.getList())){
+            result.getList().forEach(l -> {
+                l.setIsolateTypeName(isolateMap.get(l.getIsolateType()));
+                l.setSojournHistoryName(sojournMap.get(l.getSojournHistory()));
+            });
+        }
         return result;
     }
 

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

@@ -69,6 +69,38 @@
             r.ARRIVE_DATE DESC
     </select>
 
+    <!-- 【重点行程名单】列表 -->
+    <select id="emphasisTripList" resultType="com.epmet.dto.result.EmphasisTripListResultDTO">
+        SELECT
+            `NAME`,
+            MOBILE,
+            ID_CARD,
+            ID,
+            AGENCY_ID,
+            SOURCE_ADDRESS,
+            `describe`,
+            ifnull(sojourn_history,'3') as sojournHistory,
+            IFNULL(isolate_type,'4') as isolateType,
+            ARRIVE_DATE,
+            IFNULL(nat_outcome,'0') as natOutcome,
+            (case when nat_outcome = '1' then '阳性' when nat_outcome = '0' then '阴性' else '阴性' end) as natOutComeName
+        FROM ic_trip_report_record
+        WHERE DEL_FLAG = '0'
+          AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
+          <if test='null != code and code != "" '>
+              AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%')
+          </if>
+          <choose>
+              <when test='null != dangerLevel and dangerLevel != "" '>
+                  AND sojourn_history != #{dangerLevel}
+              </when>
+              <otherwise>
+                  AND sojourn_history != '3'
+              </otherwise>
+          </choose>
+        ORDER BY ARRIVE_DATE DESC,CREATED_TIME DESC
+    </select>
+
     <update id="batchDel" parameterType="map">
         update ic_trip_report_record set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=NOW()
         WHERE  AGENCY_ID=#{agencyId}