Преглед изворни кода

订单列表新增特批类型与说明

anderx пре 1 година
родитељ
комит
ba94176590

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

@@ -1080,7 +1080,7 @@
     e.approval,l.refund_status outsourceStatus,l.start_type outsourceType,ttm.certificates_count  alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
     e.approval,l.refund_status outsourceStatus,l.start_type outsourceType,ttm.certificates_count  alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
     ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ttm.cost_amount costAmount,tm.salesman_name salesmanName ,
     ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ttm.cost_amount costAmount,tm.salesman_name salesmanName ,
     ttm.party_amount  partyAmount,a.commodity_price commodityPrice,a.outsource,date_format(a.task_end_time,'%Y-%m-%d') taskEndTime,date_format(e.sign_time,'%Y-%m-%d') signTime,
     ttm.party_amount  partyAmount,a.commodity_price commodityPrice,a.outsource,date_format(a.task_end_time,'%Y-%m-%d') taskEndTime,date_format(e.sign_time,'%Y-%m-%d') signTime,
-    date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType,tmer.service_year serviceYear
+    date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType,tmer.service_year serviceYear,e.approval_type as approvalType,e.approval_type_explain as approvalTypeExplain
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no =tm.order_no
     left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no =tm.order_no
     left join department h on e.order_dep=h.id  left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
     left join department h on e.order_dep=h.id  left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
@@ -1490,7 +1490,8 @@
     date_format(tp.accept_time, '%Y-%m-%d ' ) acceptTime , date_format(tp.authorize_time, '%Y-%m-%d ' )  authorizeTime, ttm.reject_count rejectCount ,
     date_format(tp.accept_time, '%Y-%m-%d ' ) acceptTime , date_format(tp.authorize_time, '%Y-%m-%d ' )  authorizeTime, ttm.reject_count rejectCount ,
     tm.service_life serviceLife,tm.service_year serviceyear, tm.year_sum yearsum,tm.contract_term contractTerm, a.commodity_price commodityPrice ,
     tm.service_life serviceLife,tm.service_year serviceyear, tm.year_sum yearsum,tm.contract_term contractTerm, a.commodity_price commodityPrice ,
     a.special_comment specialComment,a.task_comment taskComment,ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,
     a.special_comment specialComment,a.task_comment taskComment,ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,
-    e.service_type serviceType,e.service_project serviceProject, a.form_retrieve formRetrieve  ,a.satisfaction_degree satisfactionDegree
+    e.service_type serviceType,e.service_project serviceProject, a.form_retrieve formRetrieve  ,a.satisfaction_degree satisfactionDegree,
+    b.approval_type approvalType,b.approval_type_explain approvalTypeExplain
     from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id
     from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id
     left join district_glossory d on c.province=d.id left join task_progress tp  on a.id=tp.task_id left join t_task_member tm on a.id=tm.tid
     left join district_glossory d on c.province=d.id left join task_progress tp  on a.id=tp.task_id left join t_task_member tm on a.id=tm.tid
     left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id
     left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id

+ 18 - 2
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -1,7 +1,5 @@
 package com.goafanti.order.bo;
 package com.goafanti.order.bo;
 
 
-import com.goafanti.common.utils.excel.Excel;
-
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 
 
 
 
@@ -76,6 +74,24 @@ public class OutProjectStatistics {
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 	private BigDecimal lastYearIncome;
 
 
+	private Integer approvalType;
+	private String approvalTypeExplain;
+
+	public Integer getApprovalType() {
+		return approvalType;
+	}
+
+	public void setApprovalType(Integer approvalType) {
+		this.approvalType = approvalType;
+	}
+
+	public String getApprovalTypeExplain() {
+		return approvalTypeExplain;
+	}
+
+	public void setApprovalTypeExplain(String approvalTypeExplain) {
+		this.approvalTypeExplain = approvalTypeExplain;
+	}
 
 
 	public Integer getFormRetrieve() {
 	public Integer getFormRetrieve() {
 		return formRetrieve;
 		return formRetrieve;

+ 19 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -100,6 +100,25 @@ public class TOrderTaskListBo {
 
 
 	private String receiverMobile;
 	private String receiverMobile;
 
 
+	private Integer approvalType;
+	private String approvalTypeExplain;
+
+	public Integer getApprovalType() {
+		return approvalType;
+	}
+
+	public void setApprovalType(Integer approvalType) {
+		this.approvalType = approvalType;
+	}
+
+	public String getApprovalTypeExplain() {
+		return approvalTypeExplain;
+	}
+
+	public void setApprovalTypeExplain(String approvalTypeExplain) {
+		this.approvalTypeExplain = approvalTypeExplain;
+	}
+
 	public String getReceiverMobile() {
 	public String getReceiverMobile() {
 		return receiverMobile;
 		return receiverMobile;
 	}
 	}