Browse Source

修改订单查询

wanghui 7 years ago
parent
commit
2fcca5f0a1

+ 4 - 2
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -580,12 +580,14 @@
 		c.order_status as orderStatus,
 		c.liquidation_status as liquidationStatus,
 		c.approval,
-		d.name as salesmanName
+		d.name as salesmanName,
+		e.name as departmentName
 	from
 		contract a left join user b on
 		a.uid = b.id left join t_order c on
 		a.order_no = c.order_no left join admin d on
-		c.salesman_id = d.id
+		c.salesman_id = d.id left join department_management e on
+		d.department_id = e.id
 	where 1=1
 	<if test="deleteSign != null">
 		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}

+ 8 - 0
src/main/java/com/goafanti/techproject/bo/ProjectListBo.java

@@ -32,6 +32,8 @@ public class ProjectListBo {
 	private String technicianName;
 	/** 项目负责人 **/
 	private String principalName;
+	/** 订单部门 **/
+	private String departmentName;
 	/** 立项时间 **/
 	private String signDate;
 	/** 结项时间 **/
@@ -132,6 +134,12 @@ public class ProjectListBo {
 	public void setPrincipalName(String principalName) {
 		this.principalName = principalName;
 	}
+	public String getDepartmentName() {
+		return departmentName;
+	}
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
 	public String getSignDate() {
 		return signDate;
 	}