|
|
@@ -140,7 +140,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
aids.add(taskReceiverId);
|
|
|
orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),t.getOrderNo(), TokenManager.getAdminId(),0);
|
|
|
- updateOrder(t);
|
|
|
+ checkProjiectAllocation(t);
|
|
|
return 1;
|
|
|
}
|
|
|
private TOrderNew checkDeleteSign(String orderNo) {
|
|
|
@@ -157,21 +157,23 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tOrderLogMapper.insertSelective(tl);
|
|
|
|
|
|
}
|
|
|
- private void updateOrder(TOrderTask t) {
|
|
|
+ public void checkProjiectAllocation(TOrderTask t) {
|
|
|
List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
|
|
|
TOrderNew tNew=new TOrderNew();
|
|
|
tNew.setOrderNo(t.getOrderNo());
|
|
|
int i=0;
|
|
|
for (TOrderTaskBo to : taskBos) {
|
|
|
- if (to.getTaskStatus()>=TaskState.DISTRIBUTION.getCode()&&to.getTaskStatus()<TaskState.INVALID.getCode()) {
|
|
|
+ if (to.getTaskStatus()>TaskState.UN_DISTRIBUTION.getCode()&&to.getTaskStatus()<TaskState.INVALID.getCode()) {
|
|
|
i++;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
if (i==taskBos.size()) {
|
|
|
tNew.setProcessStatus(ProcessStatus.YQBFPZXSGLY.getCode());
|
|
|
- }else{
|
|
|
+ }else if(i>0&&i<taskBos.size()){
|
|
|
tNew.setProcessStatus(ProcessStatus.YBFPZXSGLY.getCode());
|
|
|
+ }else if(i==0){
|
|
|
+ tNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
}
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(tNew);
|
|
|
}
|