|
|
@@ -1360,7 +1360,7 @@
|
|
|
<select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
|
|
|
select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
|
|
|
a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.tag,
|
|
|
- a.contract_picture_url contractPictureUrl,
|
|
|
+ a.contract_picture_url contractPictureUrl,a.score_status scoreStatus,
|
|
|
a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
|
|
|
dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
|
|
|
a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject,toa.type,toa.type_explain typeExplain
|
|
|
@@ -1445,8 +1445,12 @@
|
|
|
<if test="approval ==null">
|
|
|
and a.approval in(0,1,2,4,5,7,8)
|
|
|
</if>
|
|
|
+ <if test="scoreStatus !=null">
|
|
|
+ and a.score_status = #{scoreStatus}
|
|
|
+ </if>
|
|
|
and a.order_status in(0,1,2,4)
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
+
|
|
|
</if>
|
|
|
<if test="specially == 10">
|
|
|
and a.process_status = 1 and a.order_status in (0,1,2)
|