Browse Source

项目列表BUG修复

anderx 4 years ago
parent
commit
a6d542bc05
1 changed files with 10 additions and 8 deletions
  1. 10 8
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 10 - 8
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1397,14 +1397,16 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </update>
 
   <select id="selectArrearsDunListByPage" resultType="com.goafanti.order.bo.OutArrearsDunListBo">
-select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userName,tm.salesman_name as salesmanName,
-   	b.project_status projectStatus, b.total_amount as totalAmount,b.liquidation_status as liquidationStatus,a.`type`,
-   	b.settlement_amount as settlementAmount, a.order_receivables orderReceivables,a.order_arrears as orderArrears,
-   	b.order_status as orderStatus, date_format(a.start_time, '%Y-%m-%d %H:%i:%s') as startDate,dep.name as depName,
-   	date_format(b.sign_time,'%Y-%m-%d') as signDate,a.dun_status dunStatus  from t_arrears_dun a
-   	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
-	left join t_order_mid tm on b.order_no=tm.order_no left join department dep on b.order_dep=dep.id
-	where  b.delete_sign != 1 and dun_status in (1,2,3)
+    select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userName,tm.salesman_name as salesmanName,
+    b.project_status projectStatus, b.total_amount as totalAmount,b.liquidation_status as liquidationStatus,a.`type`,
+    b.settlement_amount as settlementAmount, a.order_receivables orderReceivables,a.order_arrears as orderArrears,
+    b.order_status as orderStatus, date_format(a.start_time, '%Y-%m-%d %H:%i:%s') as startDate,dep.name as depName,
+    date_format(b.sign_time,'%Y-%m-%d') as signDate,a.dun_status dunStatus,x.commodity_name commodityName
+    from t_arrears_dun a
+    left join (select order_no ,commodity_name from t_order_task where main =1)x on a.order_no =x.order_no
+    left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
+    left join t_order_mid tm on b.order_no=tm.order_no left join department dep on b.order_dep=dep.id
+    where  b.delete_sign != 1 and dun_status in (1,2,3)
 	<if test="shiroType == 1 and fid !=null">
   	 and tm.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>