|
|
@@ -64,6 +64,7 @@
|
|
|
<result column="pubicity_url" jdbcType="VARCHAR" property="pubicityUrl" />
|
|
|
<result column="process_status" jdbcType="INTEGER" property="processStatus" />
|
|
|
<result column="member_type" jdbcType="INTEGER" property="memberType" />
|
|
|
+ <result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode,
|
|
|
@@ -76,7 +77,7 @@
|
|
|
declaration_batch, cost_reduction, official_cost, set_up_status, set_up_time, spot_check_status,
|
|
|
high_tech_status, special_comment, if_certification_fee, certification_fee, certification_corporate,
|
|
|
time_record, if_publicity, check_status, patent_type, pubicity_url, process_status,
|
|
|
- member_type
|
|
|
+ member_type, picture_url
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -88,11 +89,12 @@
|
|
|
delete from t_order_task
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</delete>
|
|
|
+
|
|
|
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
|
|
|
- insert into t_order_task (order_no, main, super_id,
|
|
|
- commodity_id, commodity_name, commodity_quantity,
|
|
|
- commodity_mode, commodity_price, task_status,
|
|
|
- task_distribution_time, task_allocator,
|
|
|
+ insert into t_order_task (id, order_no, main,
|
|
|
+ super_id, commodity_id, commodity_name,
|
|
|
+ commodity_quantity, commodity_mode, commodity_price,
|
|
|
+ task_status, task_distribution_time, task_allocator,
|
|
|
task_receiver, task_comment, task_start_time,
|
|
|
task_end_time, attachment_url, project_status,
|
|
|
accept_time, review_time, publicity_time,
|
|
|
@@ -109,11 +111,12 @@
|
|
|
special_comment, if_certification_fee, certification_fee,
|
|
|
certification_corporate, time_record, if_publicity,
|
|
|
check_status, patent_type, pubicity_url,
|
|
|
- process_status, member_type)
|
|
|
- values (#{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{superId,jdbcType=VARCHAR},
|
|
|
- #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER},
|
|
|
- #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, #{taskStatus,jdbcType=INTEGER},
|
|
|
- #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR},
|
|
|
+ process_status, member_type, picture_url
|
|
|
+ )
|
|
|
+ values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER},
|
|
|
+ #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR},
|
|
|
+ #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL},
|
|
|
+ #{taskStatus,jdbcType=INTEGER}, #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR},
|
|
|
#{taskReceiver,jdbcType=VARCHAR}, #{taskComment,jdbcType=VARCHAR}, #{taskStartTime,jdbcType=TIMESTAMP},
|
|
|
#{taskEndTime,jdbcType=TIMESTAMP}, #{attachmentUrl,jdbcType=VARCHAR}, #{projectStatus,jdbcType=INTEGER},
|
|
|
#{acceptTime,jdbcType=DATE}, #{reviewTime,jdbcType=DATE}, #{publicityTime,jdbcType=DATE},
|
|
|
@@ -130,11 +133,16 @@
|
|
|
#{specialComment,jdbcType=VARCHAR}, #{ifCertificationFee,jdbcType=INTEGER}, #{certificationFee,jdbcType=DECIMAL},
|
|
|
#{certificationCorporate,jdbcType=VARCHAR}, #{timeRecord,jdbcType=VARCHAR}, #{ifPublicity,jdbcType=INTEGER},
|
|
|
#{checkStatus,jdbcType=INTEGER}, #{patentType,jdbcType=INTEGER}, #{pubicityUrl,jdbcType=VARCHAR},
|
|
|
- #{processStatus,jdbcType=INTEGER}, #{memberType,jdbcType=INTEGER})
|
|
|
+ #{processStatus,jdbcType=INTEGER}, #{memberType,jdbcType=INTEGER}, #{pictureUrl,jdbcType=VARCHAR}
|
|
|
+ )
|
|
|
</insert>
|
|
|
+
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
|
|
|
insert into t_order_task
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
+ <if test="id != null">
|
|
|
+ id,
|
|
|
+ </if>
|
|
|
<if test="orderNo != null">
|
|
|
order_no,
|
|
|
</if>
|
|
|
@@ -318,8 +326,14 @@
|
|
|
<if test="memberType != null">
|
|
|
member_type,
|
|
|
</if>
|
|
|
+ <if test="pictureUrl != null">
|
|
|
+ picture_url,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
+ <if test="id != null">
|
|
|
+ #{id,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
<if test="orderNo != null">
|
|
|
#{orderNo,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -503,6 +517,9 @@
|
|
|
<if test="memberType != null">
|
|
|
#{memberType,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
+ <if test="pictureUrl != null">
|
|
|
+ #{pictureUrl,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderTask">
|
|
|
@@ -691,6 +708,9 @@
|
|
|
<if test="memberType != null">
|
|
|
member_type = #{memberType,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
+ <if test="pictureUrl != null">
|
|
|
+ picture_url = #{pictureUrl,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
@@ -756,7 +776,8 @@
|
|
|
patent_type = #{patentType,jdbcType=INTEGER},
|
|
|
pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
|
|
|
process_status = #{processStatus,jdbcType=INTEGER},
|
|
|
- member_type = #{memberType,jdbcType=INTEGER}
|
|
|
+ member_type = #{memberType,jdbcType=INTEGER},
|
|
|
+ picture_url = #{pictureUrl,jdbcType=VARCHAR}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
|
|
|
@@ -771,7 +792,7 @@
|
|
|
a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,
|
|
|
a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
|
|
|
a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
|
|
|
- a.patent_type patentType
|
|
|
+ a.patent_type patentType,a.picture_url pictureUrl
|
|
|
from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
left join t_order_new e on a.order_no=e.order_no
|
|
|
left join admin f on e.salesman_id=f.id left join department g on
|
|
|
@@ -1744,7 +1765,7 @@
|
|
|
c.salesman_name salesmanName,c.finance_name financeName,a.commodity_name projectName,a.member_type memberType,
|
|
|
b.delete_sign deleteSign ,b.total_amount totalAmount ,b.sales_type salesType ,b.other,
|
|
|
a.process_status status,a.commodity_id commodityId,a.commodity_name commodityName,
|
|
|
- a.commodity_quantity commodityQuantity,a.task_comment taskComment
|
|
|
+ a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl
|
|
|
from t_order_task a left join t_order_new b on a.order_no =b.order_no
|
|
|
left join t_order_mid c on a.order_no =c.order_no
|
|
|
<if test="shiroType ==2">
|