Просмотр исходного кода

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

anderx лет назад: 3
Родитель
Сommit
7c12b1c557

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

@@ -812,7 +812,7 @@ select
     where a.id= #{id}
   </select>
     <select id="selectProcess" resultType="java.lang.Integer">
-      select t0.id from (select x.id,min(y.status)status
+      select t0.id from (select x.id
                          from (select a.id
                                from new_order_change a left join t_order_task c on a.order_no =c.order_no
                                where a.process_state= #{type}
@@ -820,6 +820,5 @@ select
                                 left join new_order_change z on x.id=z.id
                                 left join order_examine y on z.order_no=y.order_no
                          where y.`type` =0 group by x.id)t0
-      where t0.status>0
     </select>
 </mapper>

+ 34 - 18
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -254,57 +254,73 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 		String transferId=tadmin.getId();
 		if (useType.contains(AFTConstants.TECH)&&newType.contains(AFTConstants.TECH)){
 			//System.out.println("同咨询师");
+			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
 				tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 0);
 				orderExamineMapper.updateDimissionTransfer(aid, transferId,0);
-			pushChangeDimissionTransfer(aid);
+			pushChangeProcessZXS(list);
 		}else if (useType.contains(AFTConstants.TECH)&&newType.contains(AFTConstants.TECH_MANAGER)){
 //			System.out.println("不同职业");
-				tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 3);
-				orderExamineMapper.updateDimissionTransfer(aid, transferId,3);
-				//如果转交后订单全通过了,则变更+1
-				pushChangeDimissionTransfer(aid);
+			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
+			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 3);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,3);
+			List<Integer> list2 = newOrderChangeMapper.selectProcess(4, transferId);
+			//如果转交后订单全通过了,则变更+1
+			pushChangeProcessZXS(list);
+			pushChangeProcessZXSJL(list2);
 		}
 		if (useType.contains(AFTConstants.TECH_MANAGER)&&newType.contains(AFTConstants.TECH_MANAGER)){
 //			System.out.println("同咨询师经理");
+			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 1);
 			orderExamineMapper.updateDimissionTransfer(aid, transferId,1);
-			pushChangeProcess(aid,4);
+			pushChangeProcessZXSJL(list);
 		}else if (useType.contains(AFTConstants.TECH_MANAGER)&&newType.contains(AFTConstants.TECH)){
 //			System.out.println("不同职业");
+			//获取转交前的
+			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 4);
 			orderExamineMapper.updateDimissionTransfer(aid, transferId,4);
-			pushChangeDimissionTransfer(aid);
+			List<Integer> list2 = newOrderChangeMapper.selectProcess(3, transferId);
+			pushChangeProcessZXSJL(list);
+			pushChangeProcessZXS(list2);
 		}
 			taskAttributionLogMapper.insertList(aid, transferId, date);
 			tTaskLogMapper.updateDimissionTransfer(aid, transferId);
-
 	}
 
-	private void pushChangeDimissionTransfer(String aid) {
-			pushChangeProcess(aid,3);
-			pushChangeProcess(aid,4);
-
+	private void pushChangeProcessZXSJL(List<Integer> list) {
+		if(!list.isEmpty()){
+			Date date =new Date();
+			for (Integer i : list) {
+				NewOrderChangeBo changeBo = orderChangeService.orderChangeDetailsById(i);
+				pushZXSJL(changeBo,date,1);
+				orderChangeService.pushOrderCangeProcess(changeBo);
+				newOrderChangeMapper.updateByPrimaryKeySelective(changeBo);
+			}
+		}
 	}
 
-	private void pushChangeProcess(String aid,Integer type) {
-		List<Integer> list = newOrderChangeMapper.selectProcess(type, aid);
+
+	private void pushChangeProcessZXS(List<Integer> list) {
 		if(!list.isEmpty()){
 			Date date =new Date();
 			for (Integer i : list) {
 				NewOrderChangeBo changeBo = orderChangeService.orderChangeDetailsById(i);
-				if (type==3)pushZXS(changeBo,date,1);
-				if (type==4)pushZXSJL(changeBo,date,1);
+				pushZXS(changeBo,date,1);
+//				if (type==4)pushZXSJL(changeBo,date,1);
+					orderChangeService.pushOrderCangeProcess(changeBo);
+					newOrderChangeMapper.updateByPrimaryKeySelective(changeBo);
 			}
 		}
 	}
 	public void pushZXS(NewOrderChangeBo nb,  Date date,Integer type) {
 		orderChangeService.pushZXS( nb,   date, type);
-		orderChangeService.pushOrderCangeProcess(nb);
+
 	}
 
 	public void pushZXSJL(NewOrderChangeBo nb,Date date,Integer type) {
 		orderChangeService.pushZXSJL(nb,date,type);
-		orderChangeService.pushOrderCangeProcess(nb);
+
 	}