|
|
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.model.*;
|
|
|
+import com.goafanti.order.service.*;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
|
@@ -51,10 +52,6 @@ import com.goafanti.order.enums.OrderChangeType;
|
|
|
import com.goafanti.order.enums.OrderNewState;
|
|
|
import com.goafanti.order.enums.OrderType;
|
|
|
import com.goafanti.order.enums.ProcessStatus;
|
|
|
-import com.goafanti.order.service.NewOrderDunService;
|
|
|
-import com.goafanti.order.service.OrderChangeService;
|
|
|
-import com.goafanti.order.service.OrderNewService;
|
|
|
-import com.goafanti.order.service.OrderService;
|
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
|
|
|
|
@Service
|
|
|
@@ -109,6 +106,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
private UserMidMapper userMidMapper;
|
|
|
@Autowired
|
|
|
private DepartmentService departmentService;
|
|
|
+ @Autowired
|
|
|
+ private OrderProjectService orderProjectService;
|
|
|
|
|
|
Logger logger = LoggerFactory.getLogger(OrderChangeServiceImpl.class);
|
|
|
|
|
|
@@ -735,21 +734,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
// if (i<1) userLockReleaseMapper.updateReleaseUser(o.getOrderNo());
|
|
|
}
|
|
|
//
|
|
|
- List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo(),null);
|
|
|
- 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());
|
|
|
- }
|
|
|
+ o.setProcessStatus(orderProjectService.getOrderProcessStatus(nb.getOrderNo()));
|
|
|
o.setDeleteSign(0);
|
|
|
//处理客户中间表退单标识
|
|
|
//处理客户已派项目
|
|
|
@@ -763,6 +748,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
return o;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
private void pushTaskAndDun(Integer id,TOrderNew o) {
|
|
|
List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
|
|
|
HashMap<Integer, Integer> map=changeAddOrderTask(listct,0,null);
|