|
@@ -10,6 +10,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.TOrderTaskBo;
|
|
import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
|
|
+import com.goafanti.techproject.bo.InputTaskDetailsBo;
|
|
|
import com.goafanti.techproject.bo.InputTaskFeature;
|
|
import com.goafanti.techproject.bo.InputTaskFeature;
|
|
|
import com.goafanti.techproject.bo.TaskDetailsBo;
|
|
import com.goafanti.techproject.bo.TaskDetailsBo;
|
|
|
import com.goafanti.techproject.service.TaskDetailsService;
|
|
import com.goafanti.techproject.service.TaskDetailsService;
|
|
@@ -108,7 +109,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
}
|
|
|
if (taskDetails==null&&!e.getId().equals(id)&&e.getcSort()==6){
|
|
if (taskDetails==null&&!e.getId().equals(id)&&e.getcSort()==6){
|
|
|
taskDetails=taskDetailsMapper.selectByTid(e.getId());
|
|
taskDetails=taskDetailsMapper.selectByTid(e.getId());
|
|
|
- tid=e.getId();
|
|
|
|
|
}
|
|
}
|
|
|
list.add(map);
|
|
list.add(map);
|
|
|
}
|
|
}
|
|
@@ -130,13 +130,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
String lvl=getOrderLvl(totalAmount);
|
|
String lvl=getOrderLvl(totalAmount);
|
|
|
res.setMemberLvl(lvl);
|
|
res.setMemberLvl(lvl);
|
|
|
res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
|
- if (tid==null&&taskDetails!=null){
|
|
|
|
|
- tid=taskDetails.getTid();
|
|
|
|
|
- TOrderTask update =new TOrderTask();
|
|
|
|
|
- update.setId(id);
|
|
|
|
|
- update.setProgressTid(tid);
|
|
|
|
|
- tOrderTaskMapper.update(update);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
}else {
|
|
}else {
|
|
|
taskDetails=taskDetailsMapper.selectByTid(tOrderTask.getProgressTid());
|
|
taskDetails=taskDetailsMapper.selectByTid(tOrderTask.getProgressTid());
|
|
|
//如果是会员
|
|
//如果是会员
|
|
@@ -177,6 +171,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Object detailsList(InputTaskDetailsBo in) {
|
|
|
|
|
+ return null;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private String getServiceYer(String serviceYear) {
|
|
private String getServiceYer(String serviceYear) {
|
|
|
String serviceYear2=null;
|
|
String serviceYear2=null;
|
|
|
if (StringUtils.isEmpty(serviceYear)){
|
|
if (StringUtils.isEmpty(serviceYear)){
|
|
@@ -233,6 +232,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
//数据计算
|
|
//数据计算
|
|
|
countTaskDetails(taskDetails);
|
|
countTaskDetails(taskDetails);
|
|
|
this.taskDetailsMapper.insert(taskDetails);
|
|
this.taskDetailsMapper.insert(taskDetails);
|
|
|
|
|
+ updateTask(taskDetails,tOrderNew.getOrderNo());
|
|
|
|
|
+
|
|
|
//新增日志数据
|
|
//新增日志数据
|
|
|
if (type==1){
|
|
if (type==1){
|
|
|
try {
|
|
try {
|
|
@@ -244,6 +245,17 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
return taskDetails;
|
|
return taskDetails;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void updateTask(TaskDetails taskDetails, String orderNo) {
|
|
|
|
|
+ List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(orderNo, null);
|
|
|
|
|
+ List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
|
|
+ for (TOrderTaskBo tOrderTaskBo : collect) {
|
|
|
|
|
+ TOrderTask updatedTask = new TOrderTask();
|
|
|
|
|
+ updatedTask.setId(tOrderTaskBo.getId());
|
|
|
|
|
+ updatedTask.setProgressTid(taskDetails.getTid());
|
|
|
|
|
+ tOrderTaskMapper.update(updatedTask);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
*新增的时候特殊数据可以是单传输,修改的时候可以多传
|
|
*新增的时候特殊数据可以是单传输,修改的时候可以多传
|
|
|
*
|
|
*
|