Browse Source

'bug'

master
daixiantong 4 years ago
parent
commit
30db6cb1f7
2 changed files with 4 additions and 3 deletions
  1. +3
    -2
      src/main/java/com/taauav/front/dto/IndexQuestionDto.java
  2. +1
    -1
      src/main/java/com/taauav/front/mapper/UserInspectQuestionMapper.xml

+ 3
- 2
src/main/java/com/taauav/front/dto/IndexQuestionDto.java View File



import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;


import java.math.BigInteger; import java.math.BigInteger;
import java.util.Date; import java.util.Date;
* 巡检时间(开始) * 巡检时间(开始)
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startTime;
private String startTime;


/** /**
* 巡检时间(结束) * 巡检时间(结束)
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime;
private String endTime;


/** /**
* 区属id * 区属id

+ 1
- 1
src/main/java/com/taauav/front/mapper/UserInspectQuestionMapper.xml View File

<if test="param != null and param.driverId != null and param.driverId > 0"> <if test="param != null and param.driverId != null and param.driverId > 0">
and d.driver_name like concat('%', #{param.driverName}, '%') and d.driver_name like concat('%', #{param.driverName}, '%')
</if> </if>
<if test="param != null and param.startTime != null and param.entTime != null">
<if test="param != null and param.startTime != null and param.endTime != null">
and d.execution_time between #{param.startTime} and #{param.endTime} and d.execution_time between #{param.startTime} and #{param.endTime}
</if> </if>
<if test="param != null and param.driverArea != null and param.driverArea > 0"> <if test="param != null and param.driverArea != null and param.driverArea > 0">

Loading…
Cancel
Save