Browse Source

增加筛选

anderx 5 years ago
parent
commit
ec4c4c1c81

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

@@ -1082,6 +1082,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id left joi
   	<if test="cid != null">
   	and b.cid = #{cid,jdbcType=VARCHAR}
   	</if>
+  	<if test="outsource != null">
+  	and a.outsource = #{outsource,jdbcType=INTEGER}
+  	</if>
   	<if test="depId != null">
   	and e.order_dep = #{depId,jdbcType=VARCHAR}
   	</if>
@@ -1117,6 +1120,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id left joi
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
+  	<if test="outsource != null">
+  	and a.outsource = #{outsource,jdbcType=INTEGER}
+  	</if>
   	<if test="cid != null">
   	and b.cid = #{cid,jdbcType=VARCHAR}
   	</if>

+ 69 - 62
src/main/java/com/goafanti/order/bo/inuptTaskHoursListBo.java

@@ -1,62 +1,69 @@
-package com.goafanti.order.bo;
-
-
-public class inuptTaskHoursListBo {
-	private String name;
-	private String orderNo;
-	private String taskId;
-	private String starTime;
-	private String endTime; 
-	private String cid;
-	private String depId;
-	private String contractNo;
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getOrderNo() {
-		return orderNo;
-	}
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-	public String getTaskId() {
-		return taskId;
-	}
-	public void setTaskId(String taskId) {
-		this.taskId = taskId;
-	}
-	public String getStarTime() {
-		return starTime;
-	}
-	public void setStarTime(String starTime) {
-		this.starTime = starTime;
-	}
-	public String getEndTime() {
-		return endTime;
-	}
-	public void setEndTime(String endTime) {
-		this.endTime = endTime;
-	}
-	public String getCid() {
-		return cid;
-	}
-	public void setCid(String cid) {
-		this.cid = cid;
-	}
-	public String getDepId() {
-		return depId;
-	}
-	public void setDepId(String depId) {
-		this.depId = depId;
-	}
-	public String getContractNo() {
-		return contractNo;
-	}
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-	
-}
+package com.goafanti.order.bo;
+
+
+public class inuptTaskHoursListBo {
+	private String name;
+	private String orderNo;
+	private String taskId;
+	private String starTime;
+	private String endTime; 
+	private String cid;
+	private String depId;
+	private String contractNo;
+	private Integer outsource;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getTaskId() {
+		return taskId;
+	}
+	public void setTaskId(String taskId) {
+		this.taskId = taskId;
+	}
+	public String getStarTime() {
+		return starTime;
+	}
+	public void setStarTime(String starTime) {
+		this.starTime = starTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public String getCid() {
+		return cid;
+	}
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+	public String getDepId() {
+		return depId;
+	}
+	public void setDepId(String depId) {
+		this.depId = depId;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public Integer getOutsource() {
+		return outsource;
+	}
+	public void setOutsource(Integer outsource) {
+		this.outsource = outsource;
+	}
+	
+}

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

@@ -478,6 +478,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(StringUtils.isNotBlank(ib.getContractNo()))params.put("contractNo", ib.getContractNo());
 		if(StringUtils.isNotBlank(ib.getDepId()))params.put("depId", ib.getDepId());
 		if(StringUtils.isNotBlank(ib.getCid()))params.put("cid", ib.getCid());
+		if(StringUtils.isNotBlank(ib.getCid()))params.put("cid", ib.getOutsource());
 		Integer i=null;
 		if (TokenManager.hasRole(AFTConstants.FINANCE))i=1;
 		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER))i=2;