Browse Source

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

anderx 3 years ago
parent
commit
ab02b67580

+ 12 - 0
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -1,11 +1,13 @@
 package com.goafanti.order.service;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
@@ -72,6 +74,9 @@ public interface OrderChangeService {
 			String startTime, String endTime, String deps, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
 			Integer pageNo) throws IOException ;
 
+	void pushOrderCangeProcess(NewOrderChange noc);
+	void pushZXS(NewOrderChangeBo nb, Date date, Integer type);
+	void pushZXSJL(NewOrderChangeBo nb,  Date date,Integer type);
 
 
 	Object addChangeTask(TChangeTask t);
@@ -122,4 +127,11 @@ public interface OrderChangeService {
 	Object gerProcessName(Integer id);
 
     boolean checkTaskMain(TChangeTask t);
+
+	/**
+	 *
+	 * @param taskReceiverId 转交接受人
+	 * @param type  3咨询师 4咨询师经理
+	 */
+	void pushChangeProcess(String taskReceiverId, Integer type);
 }

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

@@ -390,6 +390,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * @param date
 	 * @param type 0正常审核  1跨流程需要通知
 	 */
+	@Override
 	public void pushZXS(NewOrderChangeBo nb,  Date date,Integer type) {
 		int zxs=orderExamineMapper.checkCountStatus(nb.getOrderNo(),0,null);
 		if (zxs>0){
@@ -409,6 +410,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * @param type 0正常审核  1跨流程需要通知
 	 * @return
 	 */
+	@Override
 	public void pushZXSJL(NewOrderChangeBo nb,Date date,Integer type) {
 		int zxsjl=orderExamineMapper.checkCountStatus(nb.getOrderNo(),1,0);
 		if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
@@ -737,6 +739,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return 1;
 	}
 
+	@Override
 	public  void pushOrderCangeProcess(NewOrderChange noc) {
 		if (noc.getProcessState()== OrderChangeProcess.YXY.getCode()){
 			TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
@@ -1583,4 +1586,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 		return false;
 	}
+
+	@Override
+	public void pushChangeProcess(String taskReceiverId, Integer type) {
+		List<Integer> list = newOrderChangeMapper.selectProcess(type, taskReceiverId);
+		if(!list.isEmpty()){
+			Date date =new Date();
+			for (Integer i : list) {
+				NewOrderChangeBo changeBo = orderChangeDetailsById(i);
+				if (type==3)pushZXS(changeBo,date,1);
+				if (type==4)pushZXSJL(changeBo,date,1);
+				newOrderChangeMapper.updateByPrimaryKeySelective(changeBo);
+			}
+		}
+	}
+
 }

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

@@ -19,6 +19,7 @@ import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.controller.InputTaskStopLog;
 import com.goafanti.order.enums.*;
+import com.goafanti.order.service.OrderChangeService;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -120,6 +121,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private TaskStopMapper taskStopMapper;
 	@Autowired
 	private TaskStopLogMapper taskStopLogMapper;
+	@Autowired
+	private OrderChangeService orderChangeService;
 
 
 
@@ -157,14 +160,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}else if(type==1) {
 			t.setManagerId(taskReceiverId);
 			t.setConsultantId(null);
+			orderExamineMapper.updateDimissionTransfer(TokenManager.getAdminId(), taskReceiverId,1);
 		}else if(type==2) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMJLPD.getCode(),remarks);
 			t.setConsultantId(taskReceiverId);
+			//订单新增审任务
+			OrderExamine o=new OrderExamine();
+			o.setAid(taskReceiverId);
+			o.setOrderNo(t.getOrderNo());
+			o.setCreateTime(new Date());
+			o.setType(0);//咨询师
+			o.setStatus(0);//正常
+			orderExamineMapper.insertSelective(o);
+			orderChangeService.pushChangeProcess(taskReceiverId,3);
+		}else if(type==3) {
+			t.setConsultantId(taskReceiverId);
+			orderExamineMapper.updateDimissionTransfer(TokenManager.getAdminId(), taskReceiverId,1);
 		}else if(type==4) {
 			t.setConsultantId(null);
 			t.setManagerId(taskReceiverId);
+			orderExamineMapper.updateDimissionTransfer(TokenManager.getAdminId(), taskReceiverId,4);
+			orderChangeService.pushChangeProcess(taskReceiverId,3);
 		}
-
 		t.setReceiverName(a.getName());
 		tOrderTaskMapper.updateByPrimaryKey(t);
 		List<String> aids = new ArrayList<>();

+ 6 - 9
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -19,7 +19,6 @@ import com.goafanti.order.enums.ChangeState;
 import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.order.enums.OrderChangeProcess;
 import com.goafanti.order.service.OrderChangeService;
-import com.goafanti.order.service.impl.OrderChangeServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -76,7 +75,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	private NewOrderChangeMapper newOrderChangeMapper;
 
 	@Autowired
-	private OrderChangeServiceImpl	orderChangeServiceImpl;
+	private OrderChangeService	orderChangeService;
 
 
 	@Override
@@ -292,22 +291,20 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 		if(!list.isEmpty()){
 			Date date =new Date();
 			for (Integer i : list) {
-				NewOrderChangeBo changeBo = orderChangeServiceImpl.orderChangeDetailsById(i);
+				NewOrderChangeBo changeBo = orderChangeService.orderChangeDetailsById(i);
 				if (type==3)pushZXS(changeBo,date,1);
 				if (type==4)pushZXSJL(changeBo,date,1);
 			}
 		}
 	}
 	public void pushZXS(NewOrderChangeBo nb,  Date date,Integer type) {
-		orderChangeServiceImpl.pushZXS( nb,   date, type);
-		orderChangeServiceImpl.pushOrderCangeProcess(nb);
-		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
+		orderChangeService.pushZXS( nb,   date, type);
+		orderChangeService.pushOrderCangeProcess(nb);
 	}
 
 	public void pushZXSJL(NewOrderChangeBo nb,Date date,Integer type) {
-		orderChangeServiceImpl.pushZXSJL(nb,date,type);
-		orderChangeServiceImpl.pushOrderCangeProcess(nb);
-		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
+		orderChangeService.pushZXSJL(nb,date,type);
+		orderChangeService.pushOrderCangeProcess(nb);
 	}