Browse Source

离职技术员、经理转交修改开发

anderx 3 years ago
parent
commit
514f6ff338

+ 1 - 1
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -49,7 +49,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	private String	uploadPath			= null;
 
 	/**
-	 * 项目分配、项目派单
+	 * 项目分配、项目派单、项目转交
 	 * taskId 项目ID
 	 * taskReceiverId 受理人ID
 	 * type 0管理员派单 1经理转交 2经理派单 3咨询师转交 4回退

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

@@ -681,7 +681,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setApplicant(t.getApplicant());
 			noc.setStatus(1);//订单置为正常
 			noc.setDepName(t.getDepName());
-			addOrderChangeLog(startRemarks==null?"":startRemarks, 0, t.getOrderNo(), noc.getId());
+			Date date =new Date();
+			addOrderChangeLog(startRemarks==null?"":startRemarks, 0, t.getOrderNo(), noc.getId(),date);
 			if(t.getType()!=0)chekeAmout(t);
 			TOrderNew ton=new TOrderNew();
 			ton.setOrderNo(noc.getOrderNo());
@@ -689,7 +690,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			tOrderNewMapper.updateByPrimaryKeySelective(ton);
 			TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 			if (t.getType()!=OrderChangeType.JBGGT.getCode()){
-				Date date =new Date();
 				if (tOrderNew.getManagerName()!=null){
 					noc.setProcessState(OrderChangeProcess.YXJL.getCode());
 				}else {