Commit 955bd7d5 by liyanlin

fix

parent 6b2d6a92
package com.blt.other.module.cost.dto.request; package com.blt.other.module.cost.dto.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -17,9 +19,11 @@ import java.time.LocalDateTime; ...@@ -17,9 +19,11 @@ import java.time.LocalDateTime;
public class ApprovalHistoryReq { public class ApprovalHistoryReq {
@ApiModelProperty(value = "审批时间-起始时间",required = true) @ApiModelProperty(value = "审批时间-起始时间",required = true)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty(value = "审批时间-结束时间",required = true) @ApiModelProperty(value = "审批时间-结束时间",required = true)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime; private LocalDateTime endTime;
@ApiModelProperty("审批前费用单状态") @ApiModelProperty("审批前费用单状态")
......
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
left join `user` u on u.userid = ah.approval_user_id left join `user` u on u.userid = ah.approval_user_id
where ah.approval_time between #{startTime} and #{endTime} where ah.approval_time between #{startTime} and #{endTime}
<if test="costStatus != null">and ah.cost_status = #{costStatus}</if> <if test="costStatus != null">and ah.cost_status = #{costStatus}</if>
<if test="typeNo != null">and ah.type_no = #{typeNo}</if> <if test="typeNo != null and typeNo != ''">and c.type_no = #{typeNo}</if>
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment