|
|
@@ -571,10 +571,11 @@
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as projectTime,
|
|
|
a.uid,
|
|
|
a.status as projectStatus,
|
|
|
- a.deleted_sign as deleteSign,
|
|
|
+ a.deleted_sign as deletedSign,
|
|
|
a.order_no as orderNo,
|
|
|
a.type as projectType,
|
|
|
b.nickname as buyerName,
|
|
|
+ b.type as buyerType,
|
|
|
f.cname as buyerType,
|
|
|
c.create_time as orderTime,
|
|
|
c.order_status as orderStatus,
|
|
|
@@ -591,7 +592,7 @@
|
|
|
a.type = f.id
|
|
|
where 1=1
|
|
|
<if test="deleteSign != null">
|
|
|
- and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
|
|
|
+ and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="orderNo != null and orderNo != ''">
|
|
|
and a.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
@@ -635,8 +636,8 @@
|
|
|
d.department_id = e.id left join business_varieties f on
|
|
|
a.type = f.id
|
|
|
where 1=1
|
|
|
- <if test="deleteSign != null">
|
|
|
- and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
|
|
|
+ <if test="deletedSign != null">
|
|
|
+ and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="orderNo != null and orderNo != ''">
|
|
|
and a.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
@@ -679,7 +680,7 @@
|
|
|
a.complete_comment as completeComment,
|
|
|
a.uid,
|
|
|
a.status as projectStatus,
|
|
|
- a.deleted_sign as deleteSign,
|
|
|
+ a.deleted_sign as deletedSign,
|
|
|
a.order_no as orderNo,
|
|
|
a.type as projectType,
|
|
|
b.nickname as buyerName,
|
|
|
@@ -707,7 +708,7 @@
|
|
|
a.complete_comment as completeComment,
|
|
|
a.uid,
|
|
|
a.status as projectStatus,
|
|
|
- a.deleted_sign as deleteSign,
|
|
|
+ a.deleted_sign as deletedSign,
|
|
|
a.order_no as orderNo,
|
|
|
a.type as projectType,
|
|
|
b.nickname as buyerName,
|
|
|
@@ -734,7 +735,7 @@
|
|
|
a.commodity_name as commodityName,
|
|
|
a.commodity_quantity as commodityQuantity,
|
|
|
a.task_status as taskStatus,
|
|
|
- a.delete_sign as deleteSign,
|
|
|
+ a.deleted_sign as deletedSign,
|
|
|
a.task_comment as taskComment,
|
|
|
b.name as technicianName
|
|
|
from
|
|
|
@@ -748,7 +749,7 @@
|
|
|
a.commodity_id as commodityId,
|
|
|
a.serial_number as taskNo,
|
|
|
a.task_status as taskStatus,
|
|
|
- a.delete_sign as deleteSign,
|
|
|
+ a.deleted_sign as deletedSign,
|
|
|
date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDistributionTimes,
|
|
|
a.task_comment as taskComment,
|
|
|
b.bname as commodityName ,
|