Browse Source

新增财务当前负责人

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
f442084ea5

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

@@ -1426,7 +1426,7 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>
   
   <select id="getOrderNewDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-    select 
+   select 
     a.order_no as orderNo, a.order_type as orderType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId,
     a.first_amount as firstAmount,a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus,
     a.liquidation_status as liquidationStatus, a.process_status as processStatus, a.project_status as projectStatus, a.approval,
@@ -1436,10 +1436,10 @@ where super_id is null ) e on e.order_no=a.order_no
     a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
     c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName ,e.back_status as backStatus,f.name as initiateName,
     e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
-    g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.additional_order additionalOrder
-    from t_order_new a left join `user` b on a.buyer_id=b.id left join admin c on a.salesman_id=c.id
-    left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id
-  	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
+    g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,
+    h.name NowFinance,a.additional_order additionalOrder from t_order_new a left join `user` b on a.buyer_id=b.id 
+    left join admin c on a.salesman_id=c.id left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id
+    left join admin h on dep.finance_id=h.id left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
   	left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
     where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>

+ 9 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -31,6 +31,7 @@ public class TOrderNewBo extends TOrderNew{
 	private Integer locationCity;
 	private Integer locationArea;
 	private String postalAddress;
+	private String NowFinance;
 	
 	public Integer getLocationProvince() {
 		return locationProvince;
@@ -241,5 +242,13 @@ public class TOrderNewBo extends TOrderNew{
 	public void setUncollectedAmount(String uncollectedAmount) {
 		this.uncollectedAmount = uncollectedAmount;
 	}
+
+	public String getNowFinance() {
+		return NowFinance;
+	}
+
+	public void setNowFinance(String nowFinance) {
+		NowFinance = nowFinance;
+	}
 	
 }