Parcourir la source

代办工单及已完成工单接口时间过滤条件修改

tags/v1.0.0^2
chengwang il y a 1 an
Parent
révision
6b99579432
2 fichiers modifiés avec 8 ajouts et 8 suppressions
  1. +2
    -2
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/query/WorkOrderQuery.java
  2. +6
    -6
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

+ 2
- 2
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/query/WorkOrderQuery.java Voir le fichier

@@ -27,12 +27,12 @@ public class WorkOrderQuery extends BaseQuery {
/**
* 起始日期(传入)
*/
private String StartTime;
private String time;

/**
* 结束时间(传入)
*/
private String endTime;
// private String endTime;

/**
*起始日期

+ 6
- 6
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java Voir le fichier

@@ -176,9 +176,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
//时间处理
Date startTime = null;
Date endTime = null;
if(StringUtils.isNotEmpty(query.getStartTime()) && StringUtils.isNotEmpty(query.getEndTime())){
startTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getStartTime()+" 00:00:00");
endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getEndTime()+" 23:59:59");
if(StringUtils.isNotEmpty(query.getTime())){
startTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getTime()+" 00:00:00");
endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getTime()+" 23:59:59");
}
query.setOrderStartTime(startTime);
query.setOrderEndTime(endTime);
@@ -375,9 +375,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
//时间处理
Date startTime = null;
Date endTime = null;
if(StringUtils.isNotEmpty(query.getStartTime()) && StringUtils.isNotEmpty(query.getEndTime())){
startTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getStartTime()+" 00:00:00");
endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getEndTime()+" 23:59:59");
if(StringUtils.isNotEmpty(query.getTime())){
startTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getTime()+" 00:00:00");
endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getTime()+" 23:59:59");
}
query.setOrderStartTime(startTime);
query.setOrderEndTime(endTime);

Chargement…
Annuler
Enregistrer