# fee 搜索

cost-service/src/main/java/com/blt/other/module/cost/dto/request/AppCostListReq.java

@@ -26,6 +26,7 @@ public class AppCostListReq {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 

cost-service/src/main/java/com/blt/other/module/cost/dto/request/CheckCostListReq.java

 package com.blt.other.module.cost.dto.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  *
@@ -42,4 +45,15 @@ public class CheckCostListReq {
 
     @ApiModelProperty("创建人（模糊搜索） ")
     private Integer createUserId;
+
+    @ApiModelProperty("费用单创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate beginTime;
+
+    @ApiModelProperty("费用单创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate endTime;
+
+    @ApiModelProperty("费用单-收款/付款人（创建人）")
+    private String bankCardUser;
 }

cost-service/src/main/java/com/blt/other/module/cost/dto/request/CostQueryPageReq.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -47,19 +48,19 @@ public class CostQueryPageReq extends BaseRequest {
 
     @ApiModelProperty("费用单创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date beginTime;
+    private LocalDate beginTime;
 
     @ApiModelProperty("费用单创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date endTime;
+    private LocalDate endTime;
 
     @ApiModelProperty("费用单支付时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date beginPayTime;
+    private LocalDate beginPayTime;
 
     @ApiModelProperty("费用单支付时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date endPayTime;
+    private LocalDate endPayTime;
 
     @ApiModelProperty("关联费用单")
     private String linkCost;

cost-service/src/main/resources/mapper/Cost.xml

@@ -185,27 +185,16 @@
     </select>
 
     <sql id="checkCostListSearch">
-        <if test="req.companyNo!=null and req.companyNo!='' ">
-            and t1.company_no = #{req.companyNo}
-        </if>
-        <if test="req.costForm!=null">
-            and t1.cost_form = #{req.costForm}
-        </if>
-        <if test="req.isLend!=null">
-            and t1.is_lend = #{req.isLend}
-        </if>
-        <if test="req.accountingSubjectNo!=null and req.accountingSubjectNo!='' ">
-            and t1.accounting_subject_no = #{req.accountingSubjectNo}
-        </if>
-        <if test="req.typeNo!=null and req.typeNo!='' ">
-            and t1.type_no = #{req.typeNo}
-        </if>
-        <if test="req.costStatus!=null ">
-            and t1.cost_status = #{req.costStatus}
-        </if>
-        <if test="req.createUserId!=null ">
-            and t1.create_userid = #{req.createUserId}
-        </if>
+        <if test="req.companyNo!=null and req.companyNo!='' ">and t1.company_no = #{req.companyNo}</if>
+        <if test="req.costForm!=null">and t1.cost_form = #{req.costForm}</if>
+        <if test="req.isLend!=null">and t1.is_lend = #{req.isLend}</if>
+        <if test="req.accountingSubjectNo!=null and req.accountingSubjectNo!='' ">and t1.accounting_subject_no = #{req.accountingSubjectNo}</if>
+        <if test="req.typeNo!=null and req.typeNo!='' ">t1.type_no = #{req.typeNo}</if>
+        <if test="req.costStatus!=null ">and t1.cost_status = #{req.costStatus}</if>
+        <if test="req.createUserId!=null ">and t1.create_userid = #{req.createUserId}</if>
+        <if test=" req.beginTime != null">AND t1.create_time <![CDATA[>=]]> #{req.beginTime}</if>
+        <if test=" req.endTime != null">AND t1.create_time <![CDATA[<=]]>#{req.endTime}</if>
+        <if test="req.bankCardUser !=null and req.bankCardUser !='' ">and t1.bank_card_user like concat('%',#{req.bankCardUser},'%')</if>
     </sql>
 
     <!--待部门审核-->