|
|
@@ -990,7 +990,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
<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,toprc.max_status as maxStatus,
|
|
|
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
|
|
|
@@ -1029,6 +1029,8 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</foreach>
|
|
|
group by order_no) toa2 on a.order_no=toa2.order_no
|
|
|
</if>
|
|
|
+ left join t_order_public_release_count toprc on a.order_no=toprc.order_no
|
|
|
+
|
|
|
where a.delete_sign in(0,2)
|
|
|
<include refid="selectOrderNewSql"/>
|
|
|
order by
|
|
|
@@ -1051,7 +1053,9 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</select>
|
|
|
|
|
|
<sql id="selectOrderNewSql">
|
|
|
-
|
|
|
+ <if test="maxStatus !=null">
|
|
|
+ and toprc.max_status = #{maxStatus}
|
|
|
+ </if>
|
|
|
<if test="specially ==7">
|
|
|
and a.process_status > 5
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|