12325321545

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -290,6 +290,10 @@
 	
 	
 	<select id="count" parameterType="com.vion.financial.vo.SelectVo" resultType="int">
 	<select id="count" parameterType="com.vion.financial.vo.SelectVo" resultType="int">
 		select count(1) as count from tb_contract where 1=1
 		select count(1) as count from tb_contract where 1=1
+			<if test="contract_unid !=null and contract_unid !=''">
+			and
+			contract_unid=#{contract_unid}
+			</if>
 		   <if test="salesperson_unids !=null">
 		   <if test="salesperson_unids !=null">
 		   and 
 		   and 
 		   salesperson_unid in
 		   salesperson_unid in
@@ -418,6 +422,10 @@
 		   (select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid  ) as deliver_date,
 		   (select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid  ) as deliver_date,
 		   (select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid  ) as acceptanc_date
 		   (select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid  ) as acceptanc_date
 		    from tb_contract where 1=1
 		    from tb_contract where 1=1
+		    <if test="contract_unid !=null and contract_unid !=''">
+			and
+			contract_unid=#{contract_unid}
+			</if>
 		   <if test="salesperson_unids !=null">
 		   <if test="salesperson_unids !=null">
 		   and 
 		   and 
 		   salesperson_unid in
 		   salesperson_unid in
@@ -559,6 +567,10 @@
 		   (select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid  ) as deliver_date,
 		   (select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid  ) as deliver_date,
 		   (select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid  ) as acceptanc_date
 		   (select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid  ) as acceptanc_date
 		    from tb_contract where 1=1
 		    from tb_contract where 1=1
+		    <if test="contract_unid !=null and contract_unid !=''">
+			and
+			contract_unid=#{contract_unid}
+			</if>
 		   <if test="salesperson_unids !=null">
 		   <if test="salesperson_unids !=null">
 		   and 
 		   and 
 		   salesperson_unid in
 		   salesperson_unid in

code/finance_serv/src/main/java/com/vion/financial/vo/SelectVo.java

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 
 @JsonInclude(value=Include.NON_NULL)
 @JsonInclude(value=Include.NON_NULL)
 public class SelectVo {
 public class SelectVo {
+	private String contract_unid;
 	private String salesperson_name__like;               //销售员name，模糊查询
 	private String salesperson_name__like;               //销售员name，模糊查询
 	private String project_name__like;                   //工程name，模糊查询
 	private String project_name__like;                   //工程name，模糊查询
 	private String customer_name__like;                  //客户name，模糊查询
 	private String customer_name__like;                  //客户name，模糊查询
@@ -205,6 +206,12 @@ public class SelectVo {
 	public void setSalesperson_unids(List<String> salesperson_unids) {
 	public void setSalesperson_unids(List<String> salesperson_unids) {
 		this.salesperson_unids = salesperson_unids;
 		this.salesperson_unids = salesperson_unids;
 	}
 	}
+	public String getContract_unid() {
+		return contract_unid;
+	}
+	public void setContract_unid(String contract_unid) {
+		this.contract_unid = contract_unid;
+	}
 	
 	
 	
 	
 }
 }