|
|
@@ -124,6 +124,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
private TaskStopLogMapper taskStopLogMapper;
|
|
|
@Autowired
|
|
|
private CustomerService customerService;
|
|
|
+ @Autowired
|
|
|
+ private TaskTimeMapper taskTimeMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -422,6 +424,18 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public TOrderTaskDetailBo orderTaskDetail(Integer id) {
|
|
|
TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(id);
|
|
|
+ TaskTime tt=new TaskTime();
|
|
|
+ tt.setTid(t.getId());
|
|
|
+ tt.setProjectStatus(t.getProjectStatus());
|
|
|
+ List<TaskTime> taskTimes = taskTimeMapper.selectByTidAndProject(tt);
|
|
|
+ Map<String,Object> map=new HashMap<>();
|
|
|
+ for (TaskTime e : taskTimes) {
|
|
|
+ Map<String,Object> param=new HashMap<>();
|
|
|
+ param.put("date",DateUtils.formatDate(e.getDateTime(),AFTConstants.YYYYMMDD));
|
|
|
+ param.put("title",NewProjectStatus.getValueByCode(e.getProjectStatus()));
|
|
|
+ map.put(e.getProjectStatus().toString(),param);
|
|
|
+ }
|
|
|
+ t.setTimeRecord(JSON.toJSONString(map));
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
|
|
|
||TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)
|
|
|
||TokenManager.getAdminId().equals(t.getTaskReceiver())) {
|
|
|
@@ -552,7 +566,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if(b.getSetUpAmount()!=null)t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
|
|
|
if (b.getPubicityUrl()!=null)t.setPubicityUrl(b.getPubicityUrl());
|
|
|
TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(b.getTid());//查询出项目信息
|
|
|
- if(b.getProjectStatus()!=task2.getProjectStatus()){
|
|
|
+ if(b.getProjectStatus()!=task2.getProjectStatus()||!b.getTimeRecord().equals(task2.getTimeRecord())){
|
|
|
TTaskMid taskMid = new TTaskMid();
|
|
|
taskMid.setTid(b.getTid());
|
|
|
if(b.getProjectStatus()==NewProjectStatus.YLX.getCode()||b.getProjectStatus()==NewProjectStatus.YNGS.getCode()){
|
|
|
@@ -578,6 +592,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
taskMid.getCompleteCount()!=null ||taskMid.getStockCount()!=null){
|
|
|
tTaskMidMapper.updateByTid(taskMid);
|
|
|
}
|
|
|
+ //做计时处理
|
|
|
+ pushTaskTimes(t);
|
|
|
tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
projectSplitPush(b.getTid(), b.getProjectStatus(),task2);
|
|
|
pushTaskLog(b.getTid(), b.getProjectStatus());
|
|
|
@@ -586,6 +602,22 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ private void pushTaskTimes(TOrderTask t) {
|
|
|
+ Map<String,Object> map = JSON.parseObject(t.getTimeRecord(), Map.class);
|
|
|
+ for (String key : map.keySet()) {
|
|
|
+ Map map1 = JSON.parseObject(map.get(key).toString(), Map.class);
|
|
|
+ TaskTime tt=new TaskTime();
|
|
|
+ tt.setTid(t.getId());
|
|
|
+ tt.setProjectStatus(Integer.valueOf(key));
|
|
|
+ String date = map1.get("date").toString();
|
|
|
+ tt.setDateTime(DateUtils.StringToDate(date,AFTConstants.YYYYMMDD));
|
|
|
+ int i = taskTimeMapper.updateByTidAndProjectSelective(tt);
|
|
|
+ if (i==0){
|
|
|
+ taskTimeMapper.insertSelective(tt);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void completeSendCustomerService(Integer id) {
|
|
|
OrderOperator orderOperator = tOrderTaskMapper.selectAidByParam(id);
|
|
|
String content=String.format("[%s]企业[%s]项目已完成,订单编号[%s]。",orderOperator.getBuyerName(),orderOperator.getProjectName(),orderOperator.getOrderNo());
|
|
|
@@ -1630,6 +1662,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (use.getType()==0){
|
|
|
task.setProjectStatus(NewProjectStatus.ZT.getCode());
|
|
|
str=str.append("已暂停");
|
|
|
+ //处理时间
|
|
|
+ pushExamineTaskTimes(task);
|
|
|
+
|
|
|
}else {
|
|
|
task.setProjectStatus(NewProjectStatus.JXZ.getCode());
|
|
|
str=str.append("进行中");
|
|
|
@@ -1643,6 +1678,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
TOrderTask task2 =new TOrderTask();
|
|
|
task2.setId(task.getId());
|
|
|
task2.setProjectStatus(task.getProjectStatus());
|
|
|
+
|
|
|
tOrderTaskMapper.updateByPrimaryKeySelective(task2);
|
|
|
tOrderMidMapper.updateStopProjectByOrderNo(task.getOrderNo());
|
|
|
if (task.getSplitStatus()==1){
|
|
|
@@ -1671,6 +1707,16 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
return taskStopMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
|
|
|
+ private void pushExamineTaskTimes(TOrderTask task) {
|
|
|
+ TaskTime tt=new TaskTime();
|
|
|
+ tt.setTid(task.getId());
|
|
|
+ tt.setProjectStatus(task.getProjectStatus());
|
|
|
+ tt.setDateTime(new Date());
|
|
|
+ int i = taskTimeMapper.updateByTidAndProjectSelective(tt);
|
|
|
+ if (i==0){
|
|
|
+ taskTimeMapper.insertSelective(tt);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
private void examineProjectSotpAddNotice(TOrderTask task,Integer status,Integer sotpType) {
|