diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java index 265a88b5f1..82dd913b31 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java @@ -43,13 +43,13 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable { * 上报时间开始 */ @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date reportStartDate; + private Date reportStartTime; /** * 上报时间截止 */ @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date reportEndDate; + private Date reportEndTime; /** * 待处理:pending;已取消canceled;已派单:assigned;已接单:have_order;已完成:finished @@ -73,11 +73,11 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable { * 希望服务时间开始 */ @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date wantServiceStartDate; + private Date wantServiceStartTime; /** * 希望截止 */ @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date wantServiceEndDate; + private Date wantServiceEndTime; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 33d471906e..72ac018284 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -93,11 +93,11 @@ and r.DEMAND_USER_NAME like concat('%',#{demandUserName},'%') - - AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') = ]]> #{reportStartDate} + + AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') = ]]> #{reportStartTime} - - AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') #{reportEndDate} + + AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') #{reportEndTime} and r.STATUS=#{status} @@ -108,11 +108,11 @@ and s.SERVER_ID=#{serverId} - - AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') = ]]> #{wantServiceStartDate} + + AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') = ]]> #{wantServiceStartTime} - - AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') #{wantServiceEndDate} + + AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') #{wantServiceEndTime} order by r.WANT_SERVICE_TIME desc,r.CREATED_TIME asc