|
|
@@ -5,10 +5,11 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
<id column="id" jdbcType="INTEGER" property="id" />
|
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
+ <result column="main" jdbcType="INTEGER" property="main" />
|
|
|
<result column="super_id" jdbcType="VARCHAR" property="superId" />
|
|
|
<result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
|
|
|
<result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
|
|
|
@@ -23,19 +24,17 @@
|
|
|
<result column="task_start_time" jdbcType="TIMESTAMP" property="taskStartTime" />
|
|
|
<result column="task_end_time" jdbcType="TIMESTAMP" property="taskEndTime" />
|
|
|
<result column="project_status" jdbcType="INTEGER" property="projectStatus" />
|
|
|
- <result column="main" jdbcType="INTEGER" property="main" />
|
|
|
<result column="accept_time" jdbcType="DATE" property="acceptTime" />
|
|
|
<result column="review_time" jdbcType="DATE" property="reviewTime" />
|
|
|
<result column="publicity_time" jdbcType="DATE" property="publicityTime" />
|
|
|
<result column="licence_time" jdbcType="DATE" property="licenceTime" />
|
|
|
- <result column="name" jdbcType="VARCHAR" property="name" />
|
|
|
- <result column="email" jdbcType="VARCHAR" property="email" />
|
|
|
+ <result column="certificate_number" jdbcType="VARCHAR" property="certificateNumber" />
|
|
|
</resultMap>
|
|
|
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
<result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
|
|
|
</resultMap>
|
|
|
@@ -43,7 +42,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
<where>
|
|
|
<foreach collection="oredCriteria" item="criteria" separator="or">
|
|
|
@@ -77,7 +76,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
<where>
|
|
|
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
|
|
@@ -111,18 +110,18 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
- id, order_no, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode,
|
|
|
+ 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, project_status, accept_time, review_time,
|
|
|
- publicity_time, licence_time ,main
|
|
|
+ publicity_time, licence_time, certificate_number
|
|
|
</sql>
|
|
|
<sql id="Blob_Column_List">
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
attachment_url
|
|
|
</sql>
|
|
|
@@ -130,7 +129,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
select
|
|
|
<if test="distinct">
|
|
|
@@ -151,7 +150,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
select
|
|
|
<if test="distinct">
|
|
|
@@ -170,7 +169,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
select
|
|
|
<include refid="Base_Column_List" />
|
|
|
@@ -183,7 +182,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
delete from t_order_task
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
@@ -192,7 +191,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
delete from t_order_task
|
|
|
<if test="_parameter != null">
|
|
|
@@ -203,30 +202,30 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
- insert into t_order_task (id, order_no, 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, project_status, accept_time,
|
|
|
review_time, publicity_time, licence_time,
|
|
|
- attachment_url,main)
|
|
|
- values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{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},
|
|
|
+ certificate_number, attachment_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}, #{projectStatus,jdbcType=INTEGER}, #{acceptTime,jdbcType=DATE},
|
|
|
#{reviewTime,jdbcType=DATE}, #{publicityTime,jdbcType=DATE}, #{licenceTime,jdbcType=DATE},
|
|
|
- #{attachmentUrl,jdbcType=LONGVARCHAR},#{main,jdbcType=INTEGER})
|
|
|
+ #{certificateNumber,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
insert into t_order_task
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
@@ -236,6 +235,9 @@
|
|
|
<if test="orderNo != null">
|
|
|
order_no,
|
|
|
</if>
|
|
|
+ <if test="main != null">
|
|
|
+ main,
|
|
|
+ </if>
|
|
|
<if test="superId != null">
|
|
|
super_id,
|
|
|
</if>
|
|
|
@@ -290,12 +292,12 @@
|
|
|
<if test="licenceTime != null">
|
|
|
licence_time,
|
|
|
</if>
|
|
|
+ <if test="certificateNumber != null">
|
|
|
+ certificate_number,
|
|
|
+ </if>
|
|
|
<if test="attachmentUrl != null">
|
|
|
attachment_url,
|
|
|
</if>
|
|
|
- <if test="main != null">
|
|
|
- main,
|
|
|
- </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="id != null">
|
|
|
@@ -304,6 +306,9 @@
|
|
|
<if test="orderNo != null">
|
|
|
#{orderNo,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="main != null">
|
|
|
+ #{main,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
<if test="superId != null">
|
|
|
#{superId,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -358,19 +363,19 @@
|
|
|
<if test="licenceTime != null">
|
|
|
#{licenceTime,jdbcType=DATE},
|
|
|
</if>
|
|
|
+ <if test="certificateNumber != null">
|
|
|
+ #{certificateNumber,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
<if test="attachmentUrl != null">
|
|
|
#{attachmentUrl,jdbcType=LONGVARCHAR},
|
|
|
</if>
|
|
|
- <if test="main != null">
|
|
|
- #{main,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<select id="countByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultType="java.lang.Long">
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
select count(*) from t_order_task
|
|
|
<if test="_parameter != null">
|
|
|
@@ -381,7 +386,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
update t_order_task
|
|
|
<set>
|
|
|
@@ -391,6 +396,9 @@
|
|
|
<if test="record.orderNo != null">
|
|
|
order_no = #{record.orderNo,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="record.main != null">
|
|
|
+ main = #{record.main,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
<if test="record.superId != null">
|
|
|
super_id = #{record.superId,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -445,6 +453,9 @@
|
|
|
<if test="record.licenceTime != null">
|
|
|
licence_time = #{record.licenceTime,jdbcType=DATE},
|
|
|
</if>
|
|
|
+ <if test="record.certificateNumber != null">
|
|
|
+ certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
<if test="record.attachmentUrl != null">
|
|
|
attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
|
|
|
</if>
|
|
|
@@ -457,11 +468,12 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
update t_order_task
|
|
|
set id = #{record.id,jdbcType=INTEGER},
|
|
|
order_no = #{record.orderNo,jdbcType=VARCHAR},
|
|
|
+ main = #{record.main,jdbcType=INTEGER},
|
|
|
super_id = #{record.superId,jdbcType=VARCHAR},
|
|
|
commodity_id = #{record.commodityId,jdbcType=VARCHAR},
|
|
|
commodity_name = #{record.commodityName,jdbcType=VARCHAR},
|
|
|
@@ -480,6 +492,7 @@
|
|
|
review_time = #{record.reviewTime,jdbcType=DATE},
|
|
|
publicity_time = #{record.publicityTime,jdbcType=DATE},
|
|
|
licence_time = #{record.licenceTime,jdbcType=DATE},
|
|
|
+ certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
|
|
|
attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
|
|
|
<if test="_parameter != null">
|
|
|
<include refid="Update_By_Example_Where_Clause" />
|
|
|
@@ -489,11 +502,12 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
update t_order_task
|
|
|
set id = #{record.id,jdbcType=INTEGER},
|
|
|
order_no = #{record.orderNo,jdbcType=VARCHAR},
|
|
|
+ main = #{record.main,jdbcType=INTEGER},
|
|
|
super_id = #{record.superId,jdbcType=VARCHAR},
|
|
|
commodity_id = #{record.commodityId,jdbcType=VARCHAR},
|
|
|
commodity_name = #{record.commodityName,jdbcType=VARCHAR},
|
|
|
@@ -511,7 +525,8 @@
|
|
|
accept_time = #{record.acceptTime,jdbcType=DATE},
|
|
|
review_time = #{record.reviewTime,jdbcType=DATE},
|
|
|
publicity_time = #{record.publicityTime,jdbcType=DATE},
|
|
|
- licence_time = #{record.licenceTime,jdbcType=DATE}
|
|
|
+ licence_time = #{record.licenceTime,jdbcType=DATE},
|
|
|
+ certificate_number = #{record.certificateNumber,jdbcType=VARCHAR}
|
|
|
<if test="_parameter != null">
|
|
|
<include refid="Update_By_Example_Where_Clause" />
|
|
|
</if>
|
|
|
@@ -520,13 +535,16 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
update t_order_task
|
|
|
<set>
|
|
|
<if test="orderNo != null">
|
|
|
order_no = #{orderNo,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="main != null">
|
|
|
+ main = #{main,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
<if test="superId != null">
|
|
|
super_id = #{superId,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -581,11 +599,14 @@
|
|
|
<if test="licenceTime != null">
|
|
|
licence_time = #{licenceTime,jdbcType=DATE},
|
|
|
</if>
|
|
|
+ <if test="certificateNumber != null">
|
|
|
+ certificate_number = #{certificateNumber,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
<if test="attachmentUrl != null">
|
|
|
attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
|
|
|
</if>
|
|
|
- <if test="main != null">
|
|
|
- main = #{main,jdbcType=INTEGER},
|
|
|
+ <if test="certificateNumber != null">
|
|
|
+ certificate_number = #{certificateNumber,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
@@ -594,10 +615,11 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
update t_order_task
|
|
|
set order_no = #{orderNo,jdbcType=VARCHAR},
|
|
|
+ main = #{main,jdbcType=INTEGER},
|
|
|
super_id = #{superId,jdbcType=VARCHAR},
|
|
|
commodity_id = #{commodityId,jdbcType=VARCHAR},
|
|
|
commodity_name = #{commodityName,jdbcType=VARCHAR},
|
|
|
@@ -616,18 +638,19 @@
|
|
|
review_time = #{reviewTime,jdbcType=DATE},
|
|
|
publicity_time = #{publicityTime,jdbcType=DATE},
|
|
|
licence_time = #{licenceTime,jdbcType=DATE},
|
|
|
- attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
|
|
|
- main = #{main,jdbcType=INTEGER}
|
|
|
+ certificate_number = #{certificateNumber,jdbcType=VARCHAR},
|
|
|
+ attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
<update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderTask">
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 11:03:38 CST 2018.
|
|
|
+ This element was generated on Sun May 05 08:49:10 CST 2019.
|
|
|
-->
|
|
|
update t_order_task
|
|
|
set order_no = #{orderNo,jdbcType=VARCHAR},
|
|
|
+ main = #{main,jdbcType=INTEGER},
|
|
|
super_id = #{superId,jdbcType=VARCHAR},
|
|
|
commodity_id = #{commodityId,jdbcType=VARCHAR},
|
|
|
commodity_name = #{commodityName,jdbcType=VARCHAR},
|
|
|
@@ -646,14 +669,14 @@
|
|
|
review_time = #{reviewTime,jdbcType=DATE},
|
|
|
publicity_time = #{publicityTime,jdbcType=DATE},
|
|
|
licence_time = #{licenceTime,jdbcType=DATE},
|
|
|
- main = #{main,jdbcType=INTEGER}
|
|
|
+ certificate_number = #{certificateNumber,jdbcType=VARCHAR}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
- <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
|
|
|
+ <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
|
|
|
select
|
|
|
a.id,a.order_no as orderNo,a.commodity_name as commodityName,a.commodity_id as commodityId,
|
|
|
a.commodity_quantity as commodityQuantity,a.commodity_price as commodityPrice,a.task_comment as taskComment,
|
|
|
- a.task_status as taskStatus,a.project_status as projectStatus,a.main,a.task_receiver as taskReceiver ,
|
|
|
+ a.task_status as taskStatus,a.project_status as projectStatus,a.main,a.task_receiver as taskReceiver ,a.certificate_number as certificateNumber,
|
|
|
d.name as contacts,d.contact_mobile as contactsMobile,c.cname
|
|
|
from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
|
|
|
@@ -756,7 +779,7 @@
|
|
|
select
|
|
|
a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,
|
|
|
a.project_status as projectStatus,a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,
|
|
|
- f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,
|
|
|
+ f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.certificate_number as certificateNumber,
|
|
|
date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,
|
|
|
date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,
|
|
|
date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
|
|
|
@@ -769,14 +792,15 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
left join admin g on e.salesman_id=g.id
|
|
|
where a.id= #{id,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
- <select id="selectBySuperId" resultType="com.goafanti.common.model.TOrderTask">
|
|
|
+ <select id="selectBySuperId" resultType="com.goafanti.common.model.TOrderTask">
|
|
|
select super_id as superId,min(task_status) as taskStatus,min(project_status) as projectStatus,max(main) as main from t_order_task
|
|
|
where super_id = #{superId,jdbcType=VARCHAR} group by super_id
|
|
|
</select>
|
|
|
|
|
|
<select id="selectTaskHoursListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
|
|
|
select a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,
|
|
|
- a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity
|
|
|
+ a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity,
|
|
|
+ e.contract_no as contractNo,date_format(e.create_time,'%Y-%m-%d %H:%I:%S')as creteTime,date_format(e.sign_time,'%Y-%m-%d')as signTime
|
|
|
from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
left join business_category c on b.cid=c.id
|
|
|
left join admin d on a.task_receiver=d.id
|
|
|
@@ -900,4 +924,4 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
update t_order_task set task_allocator= #{aid,jdbcType=VARCHAR},task_receiver= #{transferId,jdbcType=VARCHAR}
|
|
|
where task_receiver=#{aid,jdbcType=VARCHAR}
|
|
|
</update>
|
|
|
-</mapper>
|
|
|
+</mapper>
|