|
|
@@ -117,9 +117,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Autowired
|
|
|
private NewOrderChangeMapper newOrderChangeMapper;
|
|
|
@Autowired
|
|
|
- private TaskSoptMapper taskSoptMapper;
|
|
|
+ private TaskStopMapper taskStopMapper;
|
|
|
@Autowired
|
|
|
- private TaskSoptLogMapper taskSoptLogMapper;
|
|
|
+ private TaskStopLogMapper taskStopLogMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1463,25 +1463,25 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
String adminId = TokenManager.getAdminId();
|
|
|
for (String s : split) {
|
|
|
Integer id=Integer.valueOf(s);
|
|
|
- TaskSopt use = taskSoptMapper.selectByTid(id);
|
|
|
+ TaskStop use = taskStopMapper.selectByTid(id);
|
|
|
if (use!=null){
|
|
|
throw new BusinessException(String.format("项目[%s]暂停流程已存在,请先走完流程",id));
|
|
|
}
|
|
|
- TaskSopt taskSopt = new TaskSopt();
|
|
|
- taskSopt.setTid(id);
|
|
|
- taskSopt.setType(in.getType());
|
|
|
- taskSopt.setStatus(0);
|
|
|
- taskSopt.setReason(in.getReason());
|
|
|
- taskSopt.setAnnexUrl(in.getAnnexUrl());
|
|
|
- taskSopt.setCreateBy(adminId);
|
|
|
- taskSopt.setCreateTime(date);
|
|
|
- taskSoptMapper.insertSelective(taskSopt);
|
|
|
- TaskSoptLog log = new TaskSoptLog();
|
|
|
- log.setTaskSoptId(taskSopt.getId());
|
|
|
+ TaskStop ts = new TaskStop();
|
|
|
+ ts.setTid(id);
|
|
|
+ ts.setType(in.getType());
|
|
|
+ ts.setStatus(0);
|
|
|
+ ts.setReason(in.getReason());
|
|
|
+ ts.setAnnexUrl(in.getAnnexUrl());
|
|
|
+ ts.setCreateBy(adminId);
|
|
|
+ ts.setCreateTime(date);
|
|
|
+ taskStopMapper.insertSelective(ts);
|
|
|
+ TaskStopLog log = new TaskStopLog();
|
|
|
+ log.setTaskStopId(ts.getId());
|
|
|
log.setReason(in.getReason());
|
|
|
log.setCreateBy(adminId);
|
|
|
log.setCreateTime(date);
|
|
|
- taskSoptLogMapper.insertSelective(log);
|
|
|
+ taskStopLogMapper.insertSelective(log);
|
|
|
TTaskMid tt=new TTaskMid();
|
|
|
tt.setTid(id);
|
|
|
tt.setStopStatus(1);
|
|
|
@@ -1494,22 +1494,22 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
@Override
|
|
|
public Integer updateProjectStop(InputProjectStop in) {
|
|
|
- TaskSopt use = taskSoptMapper.selectByPrimaryKey(in.getStopId());
|
|
|
+ TaskStop use = taskStopMapper.selectByPrimaryKey(in.getStopId());
|
|
|
Date date = new Date();
|
|
|
String adminId = TokenManager.getAdminId();
|
|
|
- TaskSopt taskSopt = new TaskSopt();
|
|
|
- taskSopt.setId(in.getStopId());
|
|
|
- taskSopt.setType(in.getType());
|
|
|
- taskSopt.setStatus(0);
|
|
|
- taskSopt.setReason(in.getReason());
|
|
|
- taskSopt.setAnnexUrl(in.getAnnexUrl());
|
|
|
- taskSoptMapper.updateByPrimaryKeySelective(taskSopt);
|
|
|
- TaskSoptLog log = new TaskSoptLog();
|
|
|
- log.setTaskSoptId(taskSopt.getId());
|
|
|
+ TaskStop ts = new TaskStop();
|
|
|
+ ts.setId(in.getStopId());
|
|
|
+ ts.setType(in.getType());
|
|
|
+ ts.setStatus(0);
|
|
|
+ ts.setReason(in.getReason());
|
|
|
+ ts.setAnnexUrl(in.getAnnexUrl());
|
|
|
+ taskStopMapper.updateByPrimaryKeySelective(ts);
|
|
|
+ TaskStopLog log = new TaskStopLog();
|
|
|
+ log.setTaskStopId(ts.getId());
|
|
|
log.setReason(in.getReason());
|
|
|
log.setCreateBy(adminId);
|
|
|
log.setCreateTime(date);
|
|
|
- taskSoptLogMapper.insertSelective(log);
|
|
|
+ taskStopLogMapper.insertSelective(log);
|
|
|
asyncUtils.addProjectSotpNotic(0, in.getType(),use.getTid().toString(),null);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -1542,15 +1542,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<TaskSoptLogBo> projectStopList(Integer taskStopId) {
|
|
|
- List<TaskSoptLogBo> list =taskSoptLogMapper.selectListBySoptId(taskStopId);
|
|
|
+ public List<TaskStopLogBo> projectStopList(Integer taskStopId) {
|
|
|
+ List<TaskStopLogBo> list =taskStopLogMapper.selectListBySoptId(taskStopId);
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Object pushExamineProjectStop(InputTaskStopLog in) {
|
|
|
- TaskSopt use = taskSoptMapper.selectByPrimaryKey(in.getTaskStopId());
|
|
|
- TaskSopt t=new TaskSopt();
|
|
|
+ TaskStop use = taskStopMapper.selectByPrimaryKey(in.getTaskStopId());
|
|
|
+ TaskStop t=new TaskStop();
|
|
|
t.setId(use.getId());
|
|
|
if (in.getStatus()==1){
|
|
|
t.setStatus(1);
|
|
|
@@ -1583,14 +1583,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}else if(in.getStatus()==2) {
|
|
|
t.setStatus(2);
|
|
|
}
|
|
|
- TaskSoptLog taskSoptLog=new TaskSoptLog();
|
|
|
- taskSoptLog.setTaskSoptId(in.getTaskStopId());
|
|
|
- taskSoptLog.setReason(in.getReason());
|
|
|
- taskSoptLog.setStatus(in.getStatus());
|
|
|
- taskSoptLog.setCreateTime(new Date());
|
|
|
- taskSoptLog.setCreateBy(TokenManager.getAdminId());
|
|
|
- taskSoptLogMapper.insertSelective(taskSoptLog);
|
|
|
- return taskSoptMapper.updateByPrimaryKeySelective(t);
|
|
|
+ TaskStopLog tsl=new TaskStopLog();
|
|
|
+ tsl.setTaskStopId(in.getTaskStopId());
|
|
|
+ tsl.setReason(in.getReason());
|
|
|
+ tsl.setStatus(in.getStatus());
|
|
|
+ tsl.setCreateTime(new Date());
|
|
|
+ tsl.setCreateBy(TokenManager.getAdminId());
|
|
|
+ taskStopLogMapper.insertSelective(tsl);
|
|
|
+ return taskStopMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
|
|
|
private void examineProjectSotpAddNotice(TOrderTask task,Integer status,Integer sotpType) {
|