Procházet zdrojové kódy

update

Signed-off-by: anderx <312518615@qq.com>
anderx před 5 roky
rodič
revize
97abdc7a7b

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

@@ -1154,17 +1154,16 @@ ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.s
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
 select  
-	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,
-    a.project_status as projectStatus,a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName,
-	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent,
-	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,
-	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,
-	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,
+	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
+	a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
+	g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
+	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,a.task_receiver taskReceiver,
+	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,e.contacts ,
+	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
-	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-	e.contacts ,e.contact_mobile as contactMobile ,e.legal_person as legalPerson,e.legal_person_tel as legalPersonTel,
-	a.set_up_amount as setUpAmount,a.arrival_money as arrivalMoney,a.task_receiver taskReceiver
-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
+	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,e.legal_person as legalPerson,
+	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId
+	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 admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
     left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id
     left join admin g on e.salesman_id=g.id
@@ -1176,10 +1175,11 @@ from t_order_task a left join business_project b on a.commodity_id=b.id left joi
   </select>
   
    <select id="selectTaskHoursListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,a.project_status projectStatus,
+  	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,a.project_status projectStatus,
     a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity,a.commodity_price commodityPrice,
     e.contract_no as contractNo,date_format(e.create_time,'%Y-%m-%d %H:%i:%S')as creteTime,date_format(e.sign_time,'%Y-%m-%d')as signTime,a.outsource,
-    date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S')taskDistributionTime, date_format(a.task_end_time,'%Y-%m-%d')taskEndTime,tm.salesman_name salesmanName
+    date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S')taskDistributionTime, date_format(a.task_end_time,'%Y-%m-%d')taskEndTime,tm.salesman_name salesmanName,
+    a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId
   	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 admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join department dep on e.order_dep=dep.id  
     left join user f on e.buyer_id=f.id left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id

+ 25 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -73,6 +73,31 @@ public class TOrderTaskDetailBo {
 	private String outsourcePrice;
 	
 	
+	private Integer splitStatus;
+	private String splitSuper;
+	private Integer splitId;
+	
+	
+	
+	
+	public Integer getSplitStatus() {
+		return splitStatus;
+	}
+	public void setSplitStatus(Integer splitStatus) {
+		this.splitStatus = splitStatus;
+	}
+	public String getSplitSuper() {
+		return splitSuper;
+	}
+	public void setSplitSuper(String splitSuper) {
+		this.splitSuper = splitSuper;
+	}
+	public Integer getSplitId() {
+		return splitId;
+	}
+	public void setSplitId(Integer splitId) {
+		this.splitId = splitId;
+	}
 	public String getOutsourceName() {
 		return outsourceName;
 	}