Sfoglia il codice sorgente

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 anni fa
parent
commit
d563bbc884

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

@@ -1138,7 +1138,7 @@
 	too.company_name as outsourceName, 0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,a.invoice_amount invoiceAmount ,
 	date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.order_receivables orderReceivables,a.order_arrears orderArrears
 	from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no 
-	left join t_order_outsource too on o.order_no=too.order_no where delete_sign != 1 and approval !=3 and outsource=  #{o.outsource,jdbcType=INTEGER}	
+	left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign != 1 and approval !=3 and outsource=  #{o.outsource,jdbcType=INTEGER}	
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>

+ 2 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderDunApiController.java

@@ -74,7 +74,7 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 		return res;
 	}	
 	/**
-	 * 查看催款信息
+	 * 	查看催款信息
 	 * @return
 	 */
 	@RequestMapping(value = "/selectDun",method = RequestMethod.GET)
@@ -88,7 +88,7 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 		return res;
 	}	
 	/**
-	 * 催款信息列表
+	 * 	催款信息列表
 	 * @return
 	 */
 	@RequestMapping(value = "/selectListNewOrderDun",method = RequestMethod.GET)