Ver Fonte

no message

ly há 1 ano atrás
pai
commit
7c1818bb43

+ 5 - 1
src/main/java/cn/ezhizao/project/business/payment/domain/BizPayment.java

@@ -97,9 +97,11 @@ public class BizPayment extends BaseEntity {
     private BigDecimal allAmount;
 
     @ApiModelProperty("审核日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 //    @TableField(exist = false)
     private Timestamp verifyDate;
-
+    @TableField(exist = false)
+    private List<String> dateFilter;
     @ApiModelProperty("审核意见")
     private String verifyComment;
 
@@ -174,4 +176,6 @@ public class BizPayment extends BaseEntity {
     @TableField(exist = false)
     private String applierName;
 
+    @ApiModelProperty(value = "收款账户开户银行")
+    private String bankNo;
 }

+ 8 - 0
src/main/resources/mybatis/business/BizPaymentMapper.xml

@@ -46,6 +46,7 @@
         SELECT t1.id, t1.flow_no, t1.form_date, t1.subsidiary_id, t1.subsidiary, t1.subsidiary_name,
         t1.contract_id,
         t1.verify_date,
+        t1.bank_no,
         t1.verify_comment,
         t1.subsidiary_bank_account
         , t1.subsidiary_bank_name, t1.company_id, case when b.id is null then t1.company_name else b.name end as
@@ -90,6 +91,13 @@
             DATE_FORMAT(t1.form_date,'%Y-%m-%d') &lt;= #{endDate}
             )
         </if>
+        <if test="dateFilter != null">
+            AND  (
+            DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{dateFilter[0]}
+            AND
+            DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &lt;= #{dateFilter[1]}
+            )
+        </if>
         <if test="verifyStartDate != null and verifyEndDate != null">
             AND exists (
             select 1 from work_flow_content where master_id = t1.id