anderx 5 lat temu
rodzic
commit
6dd1571d73

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

@@ -1062,9 +1062,9 @@ 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,
+    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
   	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  

+ 169 - 162
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -1,162 +1,169 @@
-package com.goafanti.order.bo;
-
-import java.math.BigDecimal;
-
-public class TOrderTaskListBo {
-	private String id;
-	private String taskName;
-	private String orderNo;
-	private String userName;
-	private String cname;
-	private String receiverName;
-	private Integer projectStatus;
-	private Integer taskStatus;
-	private String taskDate;
-	private Integer commodityQuantity;
-	private BigDecimal commodityPrice;
-	private Double hours;
-	private String depName;
-	private String contractNo;
-	private String creteTime;
-	private String signTime;
-	private Integer alreadyNumber;
-	private String salesmanName;
-	private String taskDistributionTime;
-	private String taskEndTime;
-	private Integer approval;
-	/** 外包部门 */
-	private String outsourceName;
-	public String getContractNo() {
-		return contractNo;
-	}
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-	public String getCreteTime() {
-		return creteTime;
-	}
-	public void setCreteTime(String creteTime) {
-		this.creteTime = creteTime;
-	}
-	public String getSignTime() {
-		return signTime;
-	}
-	public void setSignTime(String signTime) {
-		this.signTime = signTime;
-	}
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getTaskName() {
-		return taskName;
-	}
-	public void setTaskName(String taskName) {
-		this.taskName = taskName;
-	}
-	public String getOrderNo() {
-		return orderNo;
-	}
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-	public String getCname() {
-		return cname;
-	}
-	public void setCname(String cname) {
-		this.cname = cname;
-	}
-	public String getReceiverName() {
-		return receiverName;
-	}
-	public void setReceiverName(String receiverName) {
-		this.receiverName = receiverName;
-	}
-	public Integer getProjectStatus() {
-		return projectStatus;
-	}
-	public void setProjectStatus(Integer projectStatus) {
-		this.projectStatus = projectStatus;
-	}
-	public Integer getTaskStatus() {
-		return taskStatus;
-	}
-	public void setTaskStatus(Integer taskStatus) {
-		this.taskStatus = taskStatus;
-	}
-	public String getTaskDate() {
-		return taskDate;
-	}
-	public void setTaskDate(String taskDate) {
-		this.taskDate = taskDate;
-	}
-	public Integer getCommodityQuantity() {
-		return commodityQuantity;
-	}
-	public void setCommodityQuantity(Integer commodityQuantity) {
-		this.commodityQuantity = commodityQuantity;
-	}
-	public String getUserName() {
-		return userName;
-	}
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	public Double getHours() {
-		return hours;
-	}
-	public void setHours(Double hours) {
-		this.hours = hours;
-	}
-	public String getDepName() {
-		return depName;
-	}
-	public void setDepName(String depName) {
-		this.depName = depName;
-	}
-	public Integer getAlreadyNumber() {
-		return alreadyNumber;
-	}
-	public void setAlreadyNumber(Integer alreadyNumber) {
-		this.alreadyNumber = alreadyNumber;
-	}
-	public String getOutsourceName() {
-		return outsourceName;
-	}
-	public void setOutsourceName(String outsourceName) {
-		this.outsourceName = outsourceName;
-	}
-	public String getTaskDistributionTime() {
-		return taskDistributionTime;
-	}
-	public void setTaskDistributionTime(String taskDistributionTime) {
-		this.taskDistributionTime = taskDistributionTime;
-	}
-	public String getTaskEndTime() {
-		return taskEndTime;
-	}
-	public void setTaskEndTime(String taskEndTime) {
-		this.taskEndTime = taskEndTime;
-	}
-	public BigDecimal getCommodityPrice() {
-		return commodityPrice;
-	}
-	public void setCommodityPrice(BigDecimal commodityPrice) {
-		this.commodityPrice = commodityPrice;
-	}
-	public String getSalesmanName() {
-		return salesmanName;
-	}
-	public void setSalesmanName(String salesmanName) {
-		this.salesmanName = salesmanName;
-	}
-	public Integer getApproval() {
-		return approval;
-	}
-	public void setApproval(Integer approval) {
-		this.approval = approval;
-	}
-	
-}
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+
+public class TOrderTaskListBo {
+	private String id;
+	private String taskName;
+	private String orderNo;
+	private String userName;
+	private String cname;
+	private String receiverName;
+	private Integer projectStatus;
+	private Integer taskStatus;
+	private String taskDate;
+	private Integer commodityQuantity;
+	private BigDecimal commodityPrice;
+	private Double hours;
+	private String depName;
+	private String contractNo;
+	private String creteTime;
+	private String signTime;
+	private Integer alreadyNumber;
+	private String salesmanName;
+	private String taskDistributionTime;
+	private String taskEndTime;
+	private Integer approval;
+	private Integer outsource;
+	/** 外包部门 */
+	private String outsourceName;
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getCreteTime() {
+		return creteTime;
+	}
+	public void setCreteTime(String creteTime) {
+		this.creteTime = creteTime;
+	}
+	public String getSignTime() {
+		return signTime;
+	}
+	public void setSignTime(String signTime) {
+		this.signTime = signTime;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getTaskName() {
+		return taskName;
+	}
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getReceiverName() {
+		return receiverName;
+	}
+	public void setReceiverName(String receiverName) {
+		this.receiverName = receiverName;
+	}
+	public Integer getProjectStatus() {
+		return projectStatus;
+	}
+	public void setProjectStatus(Integer projectStatus) {
+		this.projectStatus = projectStatus;
+	}
+	public Integer getTaskStatus() {
+		return taskStatus;
+	}
+	public void setTaskStatus(Integer taskStatus) {
+		this.taskStatus = taskStatus;
+	}
+	public String getTaskDate() {
+		return taskDate;
+	}
+	public void setTaskDate(String taskDate) {
+		this.taskDate = taskDate;
+	}
+	public Integer getCommodityQuantity() {
+		return commodityQuantity;
+	}
+	public void setCommodityQuantity(Integer commodityQuantity) {
+		this.commodityQuantity = commodityQuantity;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public Double getHours() {
+		return hours;
+	}
+	public void setHours(Double hours) {
+		this.hours = hours;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public Integer getAlreadyNumber() {
+		return alreadyNumber;
+	}
+	public void setAlreadyNumber(Integer alreadyNumber) {
+		this.alreadyNumber = alreadyNumber;
+	}
+	public String getOutsourceName() {
+		return outsourceName;
+	}
+	public void setOutsourceName(String outsourceName) {
+		this.outsourceName = outsourceName;
+	}
+	public String getTaskDistributionTime() {
+		return taskDistributionTime;
+	}
+	public void setTaskDistributionTime(String taskDistributionTime) {
+		this.taskDistributionTime = taskDistributionTime;
+	}
+	public String getTaskEndTime() {
+		return taskEndTime;
+	}
+	public void setTaskEndTime(String taskEndTime) {
+		this.taskEndTime = taskEndTime;
+	}
+	public BigDecimal getCommodityPrice() {
+		return commodityPrice;
+	}
+	public void setCommodityPrice(BigDecimal commodityPrice) {
+		this.commodityPrice = commodityPrice;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	public Integer getApproval() {
+		return approval;
+	}
+	public void setApproval(Integer approval) {
+		this.approval = approval;
+	}
+	public Integer getOutsource() {
+		return outsource;
+	}
+	public void setOutsource(Integer outsource) {
+		this.outsource = outsource;
+	}
+	
+}

Plik diff jest za duży
+ 622 - 620
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java