Browse Source

项目导出BUG修复

anderx 5 years ago
parent
commit
e8a35eae15

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

@@ -1415,7 +1415,7 @@
   c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
   a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
   a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,
-  a.split_status splitStatus,a.cost_reduction costReduction,a.official_cost officialCost,i.`type` 
+  a.split_status splitStatus,a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name consultantName
   	 from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
   	 left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
   	 left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -12,6 +12,7 @@ public class TOrderTaskBo extends TOrderTask{
 	private String contractNo;
 
 	private String salesmanName;
+	private String consultantName;
 
 	private String depName;
 
@@ -98,6 +99,12 @@ public class TOrderTaskBo extends TOrderTask{
 	public void setType(Integer type) {
 		this.type = type;
 	}
+	public String getConsultantName() {
+		return consultantName;
+	}
+	public void setConsultantName(String consultantName) {
+		this.consultantName = consultantName;
+	}
 	
 	
 }

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1255,7 +1255,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
     				case "订单负责人": o = ob.getSalesmanName(); break;
     				case "订单部门": o = ob.getDepName(); break;
     				case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
-    				case "项目负责人": o = ob.getSalesmanName(); break;
+    				case "项目负责人": o = ob.getConsultantName(); break;
     				case "是否主项目": o = ob.getMain()==0?"否":"是"; break;
     				case "项目别类": o = ob.getCname(); break;
     				case "项目名称": o = ob.getCommodityName(); break;