Skip to content

platform / finance_serv

Go to a project
Commit 7608fd2e by 王军业
Options

225365

1 parent 97cf9522
Inline Side-by-side
Showing 2 changed files with 11 additions and 2 deletions
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -489,6 +489,8 @@ ...@@ -489,6 +489,8 @@
<if test="start_date != null "> <if test="start_date != null ">
and and
#{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date #{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date
</if>
<if test="end_date !=null">
and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler}
</if> </if>
<if test="amount_start_point !=null and amount_start_point !=0.00"> <if test="amount_start_point !=null and amount_start_point !=0.00">
...@@ -629,9 +631,12 @@ ...@@ -629,9 +631,12 @@
and and
amount_state_unid=#{amount_state_unid} amount_state_unid=#{amount_state_unid}
</if> </if>
<if test="start_date != null and end_date !=null"> <if test="start_date != null ">
and and
#{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} #{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date
</if>
<if test="end_date!=null">
and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler}
</if> </if>
<if test="amount_start_point !=null and amount_start_point !=0.00"> <if test="amount_start_point !=null and amount_start_point !=0.00">
and and
......
code/finance_serv/src/main/java/com/vion/financial/vo/SelectVo.java
...@@ -3,6 +3,8 @@ package com.vion.financial.vo; ...@@ -3,6 +3,8 @@ package com.vion.financial.vo;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
...@@ -24,7 +26,9 @@ public class SelectVo { ...@@ -24,7 +26,9 @@ public class SelectVo {
private Boolean is_archive; //是否归档 private Boolean is_archive; //是否归档
private Double confirm_income_amount; //确认收入金额 private Double confirm_income_amount; //确认收入金额
private String amount_state_unid; //账款状态 private String amount_state_unid; //账款状态
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date start_date; //设置开始查询时间 private Date start_date; //设置开始查询时间
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date end_date; //设置结束时间 private Date end_date; //设置结束时间
private Double amount_start_point; //设置金额开始查询节点 private Double amount_start_point; //设置金额开始查询节点
private Double amount_end_point; //设置金额结束查询节点 private Double amount_end_point; //设置金额结束查询节点
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!