diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 3539affe85..5f338be962 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -14,6 +14,7 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private static final long serialVersionUID = 5850717233738956442L; private String code; + private String name; private String dangerLevel; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index 96a5ed7399..a6bc94b2ed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -17,6 +17,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { // @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; + private String name; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 490810a020..b9f942b776 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -98,8 +98,8 @@ AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') @@ -120,8 +120,8 @@ FROM ic_trip_report_record WHERE DEL_FLAG = '0' AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') AND sojourn_history != '3' group by dangerLevel