增加协议编号 字段

src/main/java/com/chinaitop/depot/business/mapper/BusinessContractMapper.xml

@@ -64,6 +64,7 @@
     <result column="khqyr" property="khqyr" jdbcType="VARCHAR" />
     <result column="bfkhh" property="bfkhh" jdbcType="VARCHAR" />
     <result column="bfzh" property="bfzh" jdbcType="VARCHAR" />
+    <result column="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -148,7 +149,7 @@
     change_reason, change_time, change_content, changing, plan_bid, audit_state, process_instance_id, 
     process_definition_id, agree_time, create_man, creater, create_time, create_unit, 
     create_depot, update_time, org_id, in_application, creater_id, identification, updatetime, 
-    qddd, lybzj, khqyr, bfkhh, bfzh
+    qddd, lybzj, khqyr, bfkhh, bfzh,agreement_number
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessContractExample" >
     <!--
@@ -225,7 +226,7 @@
       update_time, org_id, in_application, 
       creater_id, identification, updatetime, 
       qddd, lybzj, khqyr, 
-      bfkhh, bfzh)
+      bfkhh, bfzh,agreement_number)
     values (#{id,jdbcType=INTEGER}, #{contractNumber,jdbcType=VARCHAR}, #{contractTitle,jdbcType=VARCHAR}, 
       #{customerId,jdbcType=VARCHAR}, #{customerBid,jdbcType=INTEGER}, #{customerNumber,jdbcType=VARCHAR}, 
       #{customerName,jdbcType=VARCHAR}, #{grainQuantity,jdbcType=VARCHAR}, #{moneyQuantity,jdbcType=VARCHAR}, 
@@ -245,7 +246,7 @@
       #{updateTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{inApplication,jdbcType=INTEGER}, 
       #{createrId,jdbcType=INTEGER}, #{identification,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, 
       #{qddd,jdbcType=VARCHAR}, #{lybzj,jdbcType=VARCHAR}, #{khqyr,jdbcType=VARCHAR}, 
-      #{bfkhh,jdbcType=VARCHAR}, #{bfzh,jdbcType=VARCHAR})
+      #{bfkhh,jdbcType=VARCHAR}, #{bfzh,jdbcType=VARCHAR},#{agreementNumber,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessContract" >
     <!--
@@ -426,6 +427,9 @@
       <if test="bfzh != null" >
         bfzh,
       </if>
+      <if test="agreementNumber != null" >
+        agreement_number,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -599,6 +603,9 @@
       <if test="bfzh != null" >
         #{bfzh,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber != null" >
+        #{agreementNumber,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessContractExample" resultType="java.lang.Integer" >
@@ -791,6 +798,9 @@
       <if test="record.bfzh != null" >
         bfzh = #{record.bfzh,jdbcType=VARCHAR},
       </if>
+      <if test="record.agreementNumber != null" >
+        agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -859,7 +869,8 @@
       lybzj = #{record.lybzj,jdbcType=VARCHAR},
       khqyr = #{record.khqyr,jdbcType=VARCHAR},
       bfkhh = #{record.bfkhh,jdbcType=VARCHAR},
-      bfzh = #{record.bfzh,jdbcType=VARCHAR}
+      bfzh = #{record.bfzh,jdbcType=VARCHAR},
+      agreement_number = #{record.agreementNumber,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1040,6 +1051,9 @@
       <if test="bfzh != null" >
         bfzh = #{bfzh,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber != null" >
+        agreement_number = #{agreementNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1105,7 +1119,8 @@
       lybzj = #{lybzj,jdbcType=VARCHAR},
       khqyr = #{khqyr,jdbcType=VARCHAR},
       bfkhh = #{bfkhh,jdbcType=VARCHAR},
-      bfzh = #{bfzh,jdbcType=VARCHAR}
+      bfzh = #{bfzh,jdbcType=VARCHAR},
+      agreement_number = #{agreementNumber,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -1119,7 +1134,7 @@
  
   <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     select
-        a.id id, a.contract_number contract_number, a.plan_number plan_number,
+        a.id id, a.contract_number contract_number, a.plan_number plan_number,a.agreement_number agreement_number,
         a.contract_title contract_title,
         a.contract_type contract_type,
         a.customer_name customer_name,

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.xml

@@ -61,6 +61,7 @@
     <result column="change_time" property="changeTime" jdbcType="TIMESTAMP" />
     <result column="change_content" property="changeContent" jdbcType="VARCHAR" />
     <result column="lqss" property="lqss" jdbcType="VARCHAR" />
+    <result column="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -144,7 +145,7 @@
     warehouse_id, warehouse_name, creater, create_time, create_unit, create_depot, update_time, 
     org_id, in_application, creater_id, root_contract_bid, identification, carNumber, 
     changing, change_record_flag, root_notice_bid, original_notice, original_notice_bid, 
-    change_reason, change_time, change_content, lqss
+    change_reason, change_time, change_content, lqss,agreement_number
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
     <!--
@@ -219,7 +220,7 @@
       root_contract_bid, identification, carNumber, 
        changing, change_record_flag, 
       root_notice_bid, original_notice, original_notice_bid, 
-      change_reason, change_time, change_content, lqss
+      change_reason, change_time, change_content, lqss,agreement_number
       )
     values (#{id,jdbcType=INTEGER}, #{billType,jdbcType=VARCHAR}, #{billTypeId,jdbcType=INTEGER}, 
       #{billNumber,jdbcType=VARCHAR}, #{shipingCount,jdbcType=VARCHAR}, #{finishedCount,jdbcType=VARCHAR}, 
@@ -239,7 +240,7 @@
        #{changing,jdbcType=VARCHAR}, #{changeRecordFlag,jdbcType=VARCHAR}, 
       #{rootNoticeBid,jdbcType=INTEGER}, #{originalNotice,jdbcType=VARCHAR}, #{originalNoticeBid,jdbcType=INTEGER}, 
       #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR}
-      )
+      , #{agreementNumber,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
     <!--
@@ -411,6 +412,9 @@
       <if test="lqss != null" >
         lqss,
       </if>
+      <if test="agreementNumber != null" >
+        agreement_number,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -575,6 +579,9 @@
       <if test="lqss != null" >
         #{lqss,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber != null" >
+        #{agreementNumber,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" resultType="java.lang.Integer" >
@@ -758,6 +765,9 @@
       <if test="record.lqss != null" >
         lqss = #{record.lqss,jdbcType=VARCHAR},
       </if>
+      <if test="record.agreementNumber != null" >
+        agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -823,7 +833,8 @@
       change_reason = #{record.changeReason,jdbcType=VARCHAR},
       change_time = #{record.changeTime,jdbcType=TIMESTAMP},
       change_content = #{record.changeContent,jdbcType=VARCHAR},
-      lqss = #{record.lqss,jdbcType=VARCHAR}
+      lqss = #{record.lqss,jdbcType=VARCHAR},
+      agreement_number = #{record.agreementNumber,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -995,6 +1006,9 @@
       <if test="lqss != null" >
         lqss = #{lqss,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber != null" >
+        agreement_number = #{agreementNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1057,7 +1071,8 @@
       change_reason = #{changeReason,jdbcType=VARCHAR},
       change_time = #{changeTime,jdbcType=TIMESTAMP},
       change_content = #{changeContent,jdbcType=VARCHAR},
-      lqss = #{lqss,jdbcType=VARCHAR}
+      lqss = #{lqss,jdbcType=VARCHAR},
+      agreement_number = #{agreementNumber,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -1072,7 +1087,7 @@
  
   <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     select
-        a.id id, a.bill_type bill_type, a.bill_number bill_number,
+        a.id id, a.bill_type bill_type, a.bill_number bill_number,a.agreement_number agreement_number,
         a.contract contract,
         a.plan_number plan_number,
         a.delivery_customer delivery_customer,

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.xml

@@ -41,6 +41,7 @@
     <result column="kszxrq" property="kszxrq" jdbcType="TIMESTAMP" />
     <result column="jzzxrq" property="jzzxrq" jdbcType="TIMESTAMP" />
     <result column="jhnd" property="jhnd" jdbcType="VARCHAR" />
+    <result column="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
   </resultMap>
   
   <resultMap id="approvalResultMap" type="com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO" extends="BaseResultMap">
@@ -144,7 +145,7 @@
     process_instance_id, process_definition_id, current_approve_path, agree_time, creater_id, 
     creater, create_time, create_unit, org_id, in_application, total_quantity, report_date, 
     send_date, province_remark, enterprise_remark, attribute_type, refuse_reason, updatetime, 
-    kszxrq, jzzxrq, jhnd
+    kszxrq, jzzxrq, jhnd ,agreement_number
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" >
     <!--
@@ -213,7 +214,7 @@
       report_date, send_date, province_remark, 
       enterprise_remark, attribute_type, refuse_reason, 
       updatetime, kszxrq, jzzxrq, 
-      jhnd)
+      jhnd,agreement_number)
     values (#{id,jdbcType=INTEGER}, #{planNumber,jdbcType=VARCHAR}, #{planTitle,jdbcType=VARCHAR}, 
       #{referenceNumber,jdbcType=VARCHAR}, #{planDesc,jdbcType=VARCHAR}, #{executeType,jdbcType=INTEGER}, 
       #{outAmount,jdbcType=VARCHAR}, #{inAmount,jdbcType=VARCHAR}, #{outTotalPrice,jdbcType=VARCHAR}, 
@@ -225,7 +226,7 @@
       #{reportDate,jdbcType=TIMESTAMP}, #{sendDate,jdbcType=TIMESTAMP}, #{provinceRemark,jdbcType=VARCHAR}, 
       #{enterpriseRemark,jdbcType=VARCHAR}, #{attributeType,jdbcType=INTEGER}, #{refuseReason,jdbcType=VARCHAR}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{kszxrq,jdbcType=TIMESTAMP}, #{jzzxrq,jdbcType=TIMESTAMP}, 
-      #{jhnd,jdbcType=VARCHAR})
+      #{jhnd,jdbcType=VARCHAR},#{agreementNumber,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessPlan" >
     <!--
@@ -337,6 +338,9 @@
       <if test="jhnd != null" >
         jhnd,
       </if>
+      <if test="agreementNumber != null" >
+        agreement_number,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -441,6 +445,9 @@
       <if test="jhnd != null" >
         #{jhnd,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber != null" >
+        #{agreementNumber,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" resultType="java.lang.Integer" >
@@ -564,6 +571,9 @@
       <if test="record.jhnd != null" >
         jhnd = #{record.jhnd,jdbcType=VARCHAR},
       </if>
+      <if test="record.agreementNumber != null" >
+        agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -609,7 +619,8 @@
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       kszxrq = #{record.kszxrq,jdbcType=TIMESTAMP},
       jzzxrq = #{record.jzzxrq,jdbcType=TIMESTAMP},
-      jhnd = #{record.jhnd,jdbcType=VARCHAR}
+      jhnd = #{record.jhnd,jdbcType=VARCHAR},
+      agreement_number = #{record.agreementNumber,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -721,6 +732,9 @@
       <if test="jhnd != null" >
         jhnd = #{jhnd,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber != null" >
+        agreement_number = #{agreementNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -763,14 +777,15 @@
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       kszxrq = #{kszxrq,jdbcType=TIMESTAMP},
       jzzxrq = #{jzzxrq,jdbcType=TIMESTAMP},
-      jhnd = #{jhnd,jdbcType=VARCHAR}
+      jhnd = #{jhnd,jdbcType=VARCHAR},
+      agreement_number = #{agreementNumber,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
    <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     select
         a.id id, a.plan_number plan_number, a.reference_number reference_number, a.execute_type execute_type,
-        a.in_amount in_amount,a.out_amount out_amount, a.create_time create_time,
+        a.in_amount in_amount,a.out_amount out_amount, a.create_time create_time,a.agreement_number agreement_number,
         a.process_instance_id process_instance_id,
         a.process_definition_id process_definition_id,
         b.id auditId,
@@ -818,7 +833,7 @@
   <select id="getAcceptanceList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     SELECT
       a.id id,a.plan_number plan_number,a.reference_number reference_number,
-      a.execute_type execute_type,
+      a.execute_type execute_type,a.agreement_number agreement_number,
       a.customer_plan_state customer_plan_state,
       a.in_application in_application,
       detail.grain_kind grain_kind,

src/main/java/com/chinaitop/depot/business/model/BusinessContract.java

@@ -3,7 +3,18 @@ package com.chinaitop.depot.business.model;
 import java.util.Date;
 
 public class BusinessContract {
-    /**
+	
+	private String agreementNumber;//协议编号
+	
+    public String getAgreementNumber() {
+		return agreementNumber;
+	}
+
+	public void setAgreementNumber(String agreementNumber) {
+		this.agreementNumber = agreementNumber;
+	}
+
+	/**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column business_contract.id
      *

src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryStorageNotice.java

@@ -4,6 +4,16 @@ import java.util.Date;
 
 public class BusinessDeliveryStorageNotice {
 	
+    private String agreementNumber;//协议编号
+	
+    public String getAgreementNumber() {
+		return agreementNumber;
+	}
+
+	public void setAgreementNumber(String agreementNumber) {
+		this.agreementNumber = agreementNumber;
+	}
+	
 	
 	//业务字段(用于通知单新增)
     private Integer grainProducingArea;

src/main/java/com/chinaitop/depot/business/model/BusinessPlan.java

@@ -4,6 +4,16 @@ import java.util.Date;
 
 public class BusinessPlan {
 	
+    private String agreementNumber;//协议编号
+	
+    public String getAgreementNumber() {
+		return agreementNumber;
+	}
+
+	public void setAgreementNumber(String agreementNumber) {
+		this.agreementNumber = agreementNumber;
+	}
+	
 	
 	//业务字段
     private String grainAttributeByfirst; //省平台展示粮油性质