Kaynağa Gözat

合同前期费用

Antiloveg 8 yıl önce
ebeveyn
işleme
90e5b967d7

+ 16 - 5
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -24,12 +24,13 @@
     <result column="complete_date" property="completeDate" jdbcType="TIMESTAMP" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
     <result column="contacts" property="contacts" jdbcType="INTEGER" />
+    <result column="previous_fee" property="previousFee" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, serial_number, name, type, sign_date, founder, depict, status, patent_num, 
     patent_status, copyright_num, copyright_status, cognizance_year, cognizance_status, 
     tech_project_num, tech_project_status, comment, create_time, complete_date, deleted_sign,
-    contacts
+    contacts, previous_fee
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -48,7 +49,7 @@
       patent_num, patent_status, copyright_num, 
       copyright_status, cognizance_year, cognizance_status, 
       tech_project_num, tech_project_status, comment, 
-      create_time, complete_date, deleted_sign, contacts
+      create_time, complete_date, deleted_sign, contacts, previous_fee
       )
     values (
       #{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, 
@@ -58,7 +59,7 @@
       #{copyrightStatus,jdbcType=INTEGER}, #{cognizanceYear,jdbcType=INTEGER}, #{cognizanceStatus,jdbcType=INTEGER}, 
       #{techProjectNum,jdbcType=INTEGER}, #{techProjectStatus,jdbcType=INTEGER}, #{comment,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{completeDate,jdbcType=TIMESTAMP}, #{deletedSign,jdbcType=INTEGER},
-      #{contacts,jdbcType=INTEGER}
+      #{contacts,jdbcType=INTEGER}, #{previousFee,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Contract" >
@@ -130,6 +131,9 @@
       <if test="contacts != null" >
         contacts,
       </if>
+      <if test="previousFee != null" >
+        previous_fee,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -198,6 +202,9 @@
       <if test="contacts != null" >
         #{contacts,jdbcType=INTEGER},
       </if>
+       <if test="previousFee != null" >
+        #{previousFee,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Contract" >
@@ -266,6 +273,9 @@
       <if test="contacts != null" >
         contacts = #{contacts,jdbcType=INTEGER},
       </if>
+       <if test="previousFee != null" >
+        previous_fee = #{previousFee,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -291,7 +301,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       complete_date = #{completeDate,jdbcType=TIMESTAMP},
       deleted_sign = #{deletedSign,jdbcType=INTEGER},
-      contacts = #{contacts,jdbcType=INTEGER}
+      contacts = #{contacts,jdbcType=INTEGER},
+      previous_fee = #{previousFee,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -400,7 +411,7 @@
 			c.patent_status as patentStatus, c.copyright_num as copyrightNum, c.copyright_status as copyrightStatus, 
 			c.cognizance_year as cognizanceYear, c.cognizance_status as cognizanceStatus, c.tech_project_num as techProjectNum, 
 			c.tech_project_status as techProjectStatus, c.comment, c.complete_date as completeDate,
-      c.contacts
+      c.contacts, c.previous_fee as previousFee
 	from contract c 
 	LEFT JOIN organization_identity oi on oi.uid = c.uid 
 	LEFT JOIN admin a on a.id = c.founder

+ 13 - 1
src/main/java/com/goafanti/common/model/Contract.java

@@ -110,6 +110,19 @@ public class Contract {
 	private Date	completeDate;
 
 	private Integer	deletedSign;
+	
+	/**
+	 * 前期费用(万元)
+	 */
+	private String	previousFee;
+
+	public String getPreviousFee() {
+		return previousFee;
+	}
+
+	public void setPreviousFee(String previousFee) {
+		this.previousFee = previousFee;
+	}
 
 	public String getId() {
 		return id;
@@ -177,7 +190,6 @@ public class Contract {
 		this.founder = founder;
 	}
 
-
 	public String getDepict() {
 		return depict;
 	}

+ 12 - 0
src/main/java/com/goafanti/contract/bo/InputContract.java

@@ -13,6 +13,9 @@ public class InputContract {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	uid;
 	
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String previousFee;
+	
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	type;
@@ -135,6 +138,15 @@ public class InputContract {
 	public void setContacts(Integer contacts) {
 		this.contacts = contacts;
 	}
+
+	public String getPreviousFee() {
+		return previousFee;
+	}
+
+	public void setPreviousFee(String previousFee) {
+		this.previousFee = previousFee;
+	}
+	
 	
 	
 	

+ 10 - 0
src/main/java/com/goafanti/contract/bo/InputSaveContract.java

@@ -51,11 +51,21 @@ public class InputSaveContract {
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	techProjectNum;
+	
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String previousFee;
 
 
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	comment;
+	
+	public String getPreviousFee() {
+		return previousFee;
+	}
 
+	public void setPreviousFee(String previousFee) {
+		this.previousFee = previousFee;
+	}
 
 	public String getId() {
 		return id;