|
|
@@ -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
|