详情

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

@@ -21,4 +21,9 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable
     private String customerId;
 
     private String agencyId;
+
+    /**
+     * ic_trip_report_record.id
+     */
+    private String id;
 }

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

@@ -51,4 +51,21 @@ public class EmphasisTripListResultDTO implements Serializable {
      */
     private String arriveDate;
 
+    /**
+     * 离开时间
+     */
+    private String leaveDate;
+
+    /**
+     * 现居地
+     */
+    private String presentAddress;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    private String remark;
+
 }

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

@@ -694,11 +694,13 @@ 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());
+        if (StringUtils.isBlank(formDTO.getId())){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            if (null == staffInfo){
+                throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId());
+            }
+            formDTO.setAgencyId(staffInfo.getAgencyId());
         }
-        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));
@@ -733,7 +735,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
      */
     @Override
     public EmphasisTripListResultDTO emphasisTripDetail(EmphasisTripDetailFormDTO formDTO) {
-        return null;
+        EmphasisTripListFormDTO emphasisTripListFormDTO = new EmphasisTripListFormDTO();
+        emphasisTripListFormDTO.setId(formDTO.getId());
+        PageData<EmphasisTripListResultDTO> pageData = emphasisTripList(emphasisTripListFormDTO);
+        if (CollectionUtils.isEmpty(pageData.getList())){
+            throw new EpmetException("未查询到行程信息："+formDTO.getId());
+        }
+        return pageData.getList().get(NumConstant.ZERO);
     }
 
     /**

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

@@ -78,15 +78,21 @@
             ID,
             AGENCY_ID,
             SOURCE_ADDRESS,
-            `describe`,
+            IFNULL(`describe`,'') as `describe`,
             ifnull(sojourn_history,'3') as sojournHistory,
             IFNULL(isolate_type,'4') as isolateType,
             ARRIVE_DATE,
+            LEAVE_DATE,
+            PRESENT_ADDRESS,
+            DETAIL_ADDRESS,
+            REMARK,
             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 != agencyId and agencyId != "" '>
+              AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
+          </if>
           <if test='null != code and code != "" '>
               AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%')
           </if>