|
|
@@ -1488,6 +1488,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public Integer updateProjectSotp(InputProjectSotp in) {
|
|
|
+ TaskSopt use = taskSoptMapper.selectByPrimaryKey(in.getSoptId());
|
|
|
+ Date date = new Date();
|
|
|
+ String adminId = TokenManager.getAdminId();
|
|
|
+ TaskSopt taskSopt = new TaskSopt();
|
|
|
+ taskSopt.setId(in.getSoptId());
|
|
|
+ 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());
|
|
|
+ log.setReason(in.getReason());
|
|
|
+ log.setCreateBy(adminId);
|
|
|
+ log.setCreateTime(date);
|
|
|
+ taskSoptLogMapper.insertSelective(log);
|
|
|
+ asyncUtils.addProjectSotpNotic(0, in.getType(),use.getTid().toString(),null);
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public Pagination<?> selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
|
|
|
Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object>params =new HashMap<>();
|
|
|
@@ -1516,7 +1538,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
@Override
|
|
|
public List<TaskSoptLogBo> projectSotpList(Integer taskSoptId) {
|
|
|
- return null;
|
|
|
+ List<TaskSoptLogBo> list =taskSoptLogMapper.selectListBySoptId(taskSoptId);
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1543,6 +1566,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
taskLog.setContent(str.toString());
|
|
|
taskLog.setAid(use.getCreateBy());
|
|
|
taskLogMapper.insertSelective(taskLog);
|
|
|
+ TOrderTask task2 =new TOrderTask();
|
|
|
+ task2.setId(task.getId());
|
|
|
+ task2.setProjectStatus(NewProjectStatus.ZT.getCode());
|
|
|
+ tOrderTaskMapper.updateByPrimaryKeySelective(task2);
|
|
|
}else if(in.getStatus()==2) {
|
|
|
t.setStatus(2);
|
|
|
}
|