|
|
@@ -70,6 +70,9 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
|
|
|
@Autowired
|
|
|
private NewOrderChangeMapper newOrderChangeMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private OrderChangeLogMapper orderChangeLogMapper;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
|
|
|
@@ -235,14 +238,14 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- private void pushTechTransfer(String aid, String transferId,Date date,Admin admin,Admin tadmin) {
|
|
|
+ public void pushTechTransfer(String aid, String transferId,Date date,Admin admin,Admin tadmin) {
|
|
|
//获取旧人员与新人员的角色
|
|
|
int useType=getTech(aid);
|
|
|
int newType=getTech(transferId);
|
|
|
//如果不是咨询或者经理不走项目转交
|
|
|
if(useType!=-1&&newType!=-1){
|
|
|
//获取所有需要修改角色的变更项目
|
|
|
- List<TOrderTaskBo> list = tOrderTaskMapper.selectByAid(aid);
|
|
|
+ List<TChangeTask> list = tOrderTaskMapper.selectByAid(aid);
|
|
|
if ((useType==0&&newType==0)||(useType==1&&newType==1)){
|
|
|
tOrderTaskMapper.updateDimissionTransfer(aid, transferId, useType);
|
|
|
orderExamineMapper.updateDimissionTransfer(aid, transferId,useType);
|
|
|
@@ -255,24 +258,34 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
|
|
|
orderExamineMapper.updateDimissionTransfer(aid, transferId,newType);
|
|
|
orderExamineMapper.deleteByAidAndStatus(aid,useType);
|
|
|
}
|
|
|
- List<Integer> tlist=new ArrayList<>();
|
|
|
- for (TOrderTaskBo tOrderTaskBo : list) {
|
|
|
- TChangeTask tct = tChangeTaskMapper.selectBytid(tOrderTaskBo.getId());
|
|
|
+ List<Integer> clist=new ArrayList<>();
|
|
|
+ for (TChangeTask tct : list) {
|
|
|
+ TChangeTask nt = new TChangeTask();
|
|
|
+ tct.setId(tct.getId());
|
|
|
tct.setReceiverName(tadmin.getName());
|
|
|
tChangeTaskMapper.updateByPrimaryKeySelective(tct);
|
|
|
- //如果不包含就加入集合
|
|
|
- if (tlist.contains(tct.getId()))tlist.add(tct.getId());
|
|
|
+ if (!clist.contains(tct.getCid()))clist.add(tct.getCid());
|
|
|
}
|
|
|
- for (Integer i : tlist) {
|
|
|
+ for (Integer i : clist) {
|
|
|
NewOrderChangeBo changeBo = newOrderChangeMapper.selectById(i);
|
|
|
+ int x=1;
|
|
|
if (changeBo.getProcessState()==2){
|
|
|
- int x=orderExamineMapper.checkCountStatus(changeBo.getOrderNo(), 0,0);
|
|
|
- if (x==0)changeBo.setProcessState(changeBo.getProcessState()+1);
|
|
|
+ x=orderExamineMapper.checkCountStatus(changeBo.getOrderNo(), 0,0);
|
|
|
}else if (changeBo.getProcessState()==3){
|
|
|
- int x=orderExamineMapper.checkCountStatus(changeBo.getOrderNo(), 1,0);
|
|
|
- if (x==0)changeBo.setProcessState(changeBo.getProcessState()+1);
|
|
|
+ x=orderExamineMapper.checkCountStatus(changeBo.getOrderNo(), 1,0);
|
|
|
+ }
|
|
|
+ if (x==0){
|
|
|
+ OrderChangeLog log=new OrderChangeLog();
|
|
|
+ log.setChangeId(i);
|
|
|
+ log.setCreateTime(date);
|
|
|
+ log.setOrderNo(changeBo.getOrderNo());
|
|
|
+ log.setStatus(2);
|
|
|
+ log.setRemarks("离职转交自动通过");
|
|
|
+ log.setAuditor("1");
|
|
|
+ orderChangeLogMapper.insertSelective(log);
|
|
|
+ changeBo.setProcessState(changeBo.getProcessState()+1);
|
|
|
+ newOrderChangeMapper.updateByPrimaryKeySelective(changeBo);
|
|
|
}
|
|
|
- newOrderChangeMapper.updateByPrimaryKeySelective(changeBo);
|
|
|
}
|
|
|
taskAttributionLogMapper.insertList(aid, transferId, date);
|
|
|
tTaskLogMapper.updateDimissionTransfer(aid, transferId);
|