|
|
@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.UUID;
|
|
|
@@ -86,6 +87,7 @@ import com.goafanti.order.service.OrderChangeService;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderProjectService;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
+import com.goafanti.techproject.enums.TaskState;
|
|
|
|
|
|
@Service
|
|
|
public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
|
|
|
@@ -585,6 +587,21 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
pushTaskAndDun(nob.getId(),nob.getOrderNo());
|
|
|
}
|
|
|
//
|
|
|
+ List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(nb.getOrderNo());
|
|
|
+ int i=0;
|
|
|
+ for (TOrderTaskBo to : taskBos) {
|
|
|
+ if (to.getTaskStatus()>TaskState.UN_DISTRIBUTION.getCode()&&to.getTaskStatus()<TaskState.INVALID.getCode()) {
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ if (i==taskBos.size()) {
|
|
|
+ o.setProcessStatus(ProcessStatus.YQBFPZXSGLY.getCode());
|
|
|
+ }else if(i>0&&i<taskBos.size()){
|
|
|
+ o.setProcessStatus(ProcessStatus.YBFPZXSGLY.getCode());
|
|
|
+ }else if(i==0){
|
|
|
+ o.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
+ }
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(o);
|
|
|
return o;
|
|
|
}
|
|
|
@@ -605,7 +622,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ot.setTaskStatus(0);
|
|
|
tOrderTaskMapper.insertSelective(ot);
|
|
|
cd.setTid(ot.getId());
|
|
|
- orderProjectService.checkProjiectAllocation(ot);
|
|
|
TChangeTaskMapper.updateByPrimaryKeySelective(cd);
|
|
|
}else if (cd.getType()==2) {
|
|
|
ot.setId(cd.getTid());
|
|
|
@@ -643,9 +659,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
newOrderDunMapper.deleteByPrimaryKey(cd.getDid());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
@Override
|