Sfoglia il codice sorgente

变更新增项目改变项目状态

anderx 6 anni fa
parent
commit
f23895d8b5

+ 2 - 1
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
@@ -48,5 +49,5 @@ public interface OrderProjectService {
 
 	void exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize)throws IOException ;
 
-	
+	void checkProjiectAllocation(TOrderTask t);
 }

+ 5 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -79,10 +79,12 @@ import com.goafanti.order.bo.TOrderTaskBo;
 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.FundManageOrderService;
 import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderNewService;
+import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.order.service.OrderService;
 
 @Service
@@ -120,6 +122,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderNewService	orderNewService;
 	@Autowired
+	private OrderProjectService	orderProjectService;
+	@Autowired
 	private NewOrderDunService	newOrderDunService;
 	@Autowired
 	private TChangeTaskMapper	TChangeTaskMapper;
@@ -603,6 +607,7 @@ 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());

+ 6 - 4
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -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);
 	}