|
|
@@ -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);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|