|
|
@@ -5,10 +5,10 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
<id column="id" jdbcType="INTEGER" property="id" />
|
|
|
- <result column="Number" jdbcType="INTEGER" property="number" />
|
|
|
+ <result column="already_number" jdbcType="INTEGER" property="alreadyNumber" />
|
|
|
<result column="licence_time" jdbcType="TIMESTAMP" property="licenceTime" />
|
|
|
<result column="task_id" jdbcType="INTEGER" property="taskId" />
|
|
|
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
|
|
@@ -17,7 +17,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
<where>
|
|
|
<foreach collection="oredCriteria" item="criteria" separator="or">
|
|
|
@@ -51,7 +51,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
<where>
|
|
|
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
|
|
@@ -85,15 +85,15 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
- id, Number, licence_time, task_id, create_time
|
|
|
+ id, already_number, licence_time, task_id, create_time
|
|
|
</sql>
|
|
|
<select id="selectByExample" parameterType="com.goafanti.common.model.TaskProgressExample" resultMap="BaseResultMap">
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
select
|
|
|
<if test="distinct">
|
|
|
@@ -112,7 +112,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
select
|
|
|
<include refid="Base_Column_List" />
|
|
|
@@ -123,7 +123,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
delete from task_progress
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
@@ -132,7 +132,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
delete from task_progress
|
|
|
<if test="_parameter != null">
|
|
|
@@ -143,26 +143,26 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
- insert into task_progress (id, Number, licence_time,
|
|
|
+ insert into task_progress (id, already_number, licence_time,
|
|
|
task_id, create_time)
|
|
|
- values (#{id,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{licenceTime,jdbcType=TIMESTAMP},
|
|
|
+ values (#{id,jdbcType=INTEGER}, #{alreadyNumber,jdbcType=INTEGER}, #{licenceTime,jdbcType=TIMESTAMP},
|
|
|
#{taskId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" parameterType="com.goafanti.common.model.TaskProgress">
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
insert into task_progress
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
<if test="id != null">
|
|
|
id,
|
|
|
</if>
|
|
|
- <if test="number != null">
|
|
|
- Number,
|
|
|
+ <if test="alreadyNumber != null">
|
|
|
+ already_number,
|
|
|
</if>
|
|
|
<if test="licenceTime != null">
|
|
|
licence_time,
|
|
|
@@ -178,8 +178,8 @@
|
|
|
<if test="id != null">
|
|
|
#{id,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
- <if test="number != null">
|
|
|
- #{number,jdbcType=INTEGER},
|
|
|
+ <if test="alreadyNumber != null">
|
|
|
+ #{alreadyNumber,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="licenceTime != null">
|
|
|
#{licenceTime,jdbcType=TIMESTAMP},
|
|
|
@@ -196,7 +196,7 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
select count(*) from task_progress
|
|
|
<if test="_parameter != null">
|
|
|
@@ -207,15 +207,15 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
update task_progress
|
|
|
<set>
|
|
|
<if test="record.id != null">
|
|
|
id = #{record.id,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
- <if test="record.number != null">
|
|
|
- Number = #{record.number,jdbcType=INTEGER},
|
|
|
+ <if test="record.alreadyNumber != null">
|
|
|
+ already_number = #{record.alreadyNumber,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="record.licenceTime != null">
|
|
|
licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
|
|
|
@@ -235,11 +235,11 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
update task_progress
|
|
|
set id = #{record.id,jdbcType=INTEGER},
|
|
|
- Number = #{record.number,jdbcType=INTEGER},
|
|
|
+ already_number = #{record.alreadyNumber,jdbcType=INTEGER},
|
|
|
licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
|
|
|
task_id = #{record.taskId,jdbcType=INTEGER},
|
|
|
create_time = #{record.createTime,jdbcType=TIMESTAMP}
|
|
|
@@ -251,12 +251,12 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
update task_progress
|
|
|
<set>
|
|
|
- <if test="number != null">
|
|
|
- Number = #{number,jdbcType=INTEGER},
|
|
|
+ <if test="alreadyNumber != null">
|
|
|
+ already_number = #{alreadyNumber,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="licenceTime != null">
|
|
|
licence_time = #{licenceTime,jdbcType=TIMESTAMP},
|
|
|
@@ -274,13 +274,39 @@
|
|
|
<!--
|
|
|
WARNING - @mbg.generated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Jun 03 11:03:50 CST 2019.
|
|
|
+ This element was generated on Wed Jun 05 14:03:08 CST 2019.
|
|
|
-->
|
|
|
update task_progress
|
|
|
- set Number = #{number,jdbcType=INTEGER},
|
|
|
+ set already_number = #{alreadyNumber,jdbcType=INTEGER},
|
|
|
licence_time = #{licenceTime,jdbcType=TIMESTAMP},
|
|
|
task_id = #{taskId,jdbcType=INTEGER},
|
|
|
create_time = #{createTime,jdbcType=TIMESTAMP}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
+ <select id="selectTaskProgress" resultType="com.goafanti.order.bo.TaskProgressBo">
|
|
|
+ select a.id,a.task_id as taskId,a.already_number as alreadyNumber,date_format(a.licence_time,'%Y-%m-%d')as licenceTimes,
|
|
|
+date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTimes ,(b.commodity_quantity-a.already_number) as notCount
|
|
|
+from task_progress a left join t_order_task b on a.task_id=b.id
|
|
|
+where a.task_id= #{id,jdbcType=INTEGER}
|
|
|
+order by a.create_time
|
|
|
+ </select>
|
|
|
+ <select id="AlreadyNuberCount" resultType="java.lang.Integer">
|
|
|
+ select ifnull(sum(already_number),0) from task_progress
|
|
|
+ where task_id= #{id,jdbcType=INTEGER}
|
|
|
+ </select>
|
|
|
+ <select id="selectMyTaskList" 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,
|
|
|
+ a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
|
|
|
+ a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName
|
|
|
+ from t_task_log x left join t_order_task a on x.task_id=a.id
|
|
|
+ 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
|
|
|
+ left join t_order_new e on a.order_no=e.order_no
|
|
|
+ left join user f on e.buyer_id=f.id
|
|
|
+ left join department h on e.order_dep=h.id
|
|
|
+ where e.delete_sign=0
|
|
|
+ and x.task_receiver= #{aid,jdbcType=VARCHAR}
|
|
|
+ order by a.task_distribution_time desc
|
|
|
+ </select>
|
|
|
</mapper>
|