Browse Source

项目任务详情订单总金额展示

anderx 7 years ago
parent
commit
05dbf1e7c3

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

@@ -568,6 +568,7 @@
 			f.name as taskReceiverName,
 			g.nickname as buyerName,
 			h.contract_no as contractNo,
+			ifnull(h.sign_total_amount,0) as signTotalAmount,
 			d.uid,
 			i.name as salesmanName,
 			j.name as departmentName,

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

@@ -1045,17 +1045,19 @@ from
 			d.status,
 			d.deleted_sign as deletedSign,
 			e.nickname as buyerName,
-			f.name as taskReceiverName
+			f.name as taskReceiverName,
+			ifnull(g.sign_total_amount,0) as signTotalAmount
 		from
 			(select *
 		from contract_task_log
-		where task_receiver=#{taskReceiver,jdbcType=VARCHAR}) x left join contract_task a on 
+		where task_receiver='1') x left join contract_task a on 
 			x.contract_task_id=a.id	left join business_project b on
 			a.commodity_id = b.id left join business_varieties c on
 			b.cid = c.id left join contract d on
 			a.contract_id = d.id left join user e on
 			d.uid = e.id left join admin f on 
-			a.task_receiver = f.id
+			a.task_receiver = f.id left join t_order g on 
+			d.order_no=g.order_no
 		where 1=1
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
@@ -1099,13 +1101,14 @@ from
 		from
 			(select *
 		from contract_task_log
-		where task_receiver=#{taskReceiver,jdbcType=VARCHAR}) x left join contract_task a on  
+		where task_receiver='1') x left join contract_task a on 
 			x.contract_task_id=a.id	left join business_project b on
 			a.commodity_id = b.id left join business_varieties c on
 			b.cid = c.id left join contract d on
 			a.contract_id = d.id left join user e on
 			d.uid = e.id left join admin f on 
-			a.task_receiver = f.id
+			a.task_receiver = f.id left join t_order g on 
+			d.order_no=g.order_no
 		where 1=1
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}

+ 9 - 1
src/main/java/com/goafanti/techproject/bo/TaskDetailBo.java

@@ -41,8 +41,10 @@ public class TaskDetailBo{
 	private String orderRemarks;
 	/** 订单部门 **/
 	private String departmentName;
-	
+	/** 公示状态 **/
 	private Integer publishStatus;
+	/** 订单总金额 **/
+	private String signTotalAmount;
 	
 	public String getTaskId() {
 		return taskId;
@@ -170,4 +172,10 @@ public class TaskDetailBo{
 	public void setDepartmentName(String departmentName) {
 		this.departmentName = departmentName;
 	}
+	public String getSignTotalAmount() {
+		return signTotalAmount;
+	}
+	public void setSignTotalAmount(String signTotalAmount) {
+		this.signTotalAmount = signTotalAmount;
+	}
 }

+ 7 - 0
src/main/java/com/goafanti/techproject/bo/TaskListBo.java

@@ -17,6 +17,7 @@ public class TaskListBo{
 	private String categoryId;
 	private Integer status;
 	private Integer deletedSign;
+	private String signTotalAmount;
 	private String buyerName;
 	private String taskReceiverName;
 	private Integer publishStatus;
@@ -135,4 +136,10 @@ public class TaskListBo{
 	public void setTechnicianMobile(String technicianMobile) {
 		this.technicianMobile = technicianMobile;
 	}
+	public String getSignTotalAmount() {
+		return signTotalAmount;
+	}
+	public void setSignTotalAmount(String signTotalAmount) {
+		this.signTotalAmount = signTotalAmount;
+	}
 }