Browse Source

订单派单BUG修复

anderx 3 years ago
parent
commit
904ff91310

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

@@ -1202,7 +1202,7 @@
   </select>
 
   <select id="splitProjectList" 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,a.project_status as projectStatus,
+    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,d.mobile receiverMobile,
             e.contract_no contractNo,a.task_receiver taskReceiver, a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
             a.commodity_quantity as commodityQuantity,e.approval,l.refund_status outsourceStatus, ifnull(i.alreadyNumber,0) as alreadyNumber,a.task_comment taskComment ,
             f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper,a.member_type memberType,

+ 10 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -102,6 +102,16 @@ public class TOrderTaskListBo {
 
 	private Integer memberType;
 
+	private String receiverMobile;
+
+	public String getReceiverMobile() {
+		return receiverMobile;
+	}
+
+	public void setReceiverMobile(String receiverMobile) {
+		this.receiverMobile = receiverMobile;
+	}
+
 	public Integer getMemberType() {
 		return memberType;
 	}

+ 6 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -821,7 +821,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				ot.setTaskStatus(0);
 				ot.setSplitStatus(cd.getSplitStatus());
 				if (cd.getSplitStatus()==2){
-					Integer tid=input.get(cd.getChangeSplitSuper());
+					Integer tid;
+					if (cd.getTid()!=null){
+						tid=cd.getTid();
+					}else{
+						tid=input.get(cd.getChangeSplitSuper());
+					}
 					if (tid==null)tid=tChangeTaskMapper.selectByPrimaryKey(cd.getChangeSplitSuper()).getTid();
 					ot.setSplitSuper(tid);
 				}