Browse Source

Merge branch 'test'

anderx 3 years ago
parent
commit
12e92d047e

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -822,7 +822,7 @@
     left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id left join business_project i on a.commodity_id=i.id
     left join business_category c on i.cid=c.id left join admin d on a.task_receiver=d.id
     left join t_task_member ttm on a.id=ttm.tid left join t_task_mid tm on a.id=tm.tid
-    where a.super_id is null   and  a.order_no= #{orderNo,jdbcType=VARCHAR}
+    where a.super_id is null   and a.process_status in (0,3) and  a.order_no= #{orderNo,jdbcType=VARCHAR}
     <if test="splitStatus !=null">
       <if test="splitStatus  &lt; 3">
         and a.split_status= #{splitStatus}

+ 13 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -51,6 +51,11 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 
+	/**
+	 * 新增变更项目
+	 * @param t
+	 * @return
+	 */
 	@RequestMapping(value = "/addChangeTask", method = RequestMethod.POST)
 	public Result addChangeTask(TChangeTask t){
 		Result res = new Result();
@@ -62,6 +67,10 @@ public class OrderChangeApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目金额"));
 			return res;
 		}
+		if (orderChangeService.checkTaskMain(t)){
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "", "主项目"));
+			return res;
+		}
 		if(null==t.getCommodityQuantity()){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目数量"));
 			return res;
@@ -134,6 +143,10 @@ public class OrderChangeApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
 			return res;
 		}
+		if (orderChangeService.checkTaskMain(t)){
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "", "主项目"));
+			return res;
+		}
 		res.setData(orderChangeService.updateChangeTask(t));
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -120,4 +120,6 @@ public interface OrderChangeService {
 
 
 	Object gerProcessName(Integer id);
+
+    boolean checkTaskMain(TChangeTask t);
 }

+ 3 - 2
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -212,8 +212,9 @@ public interface OrderNewService {
 
 	int updateSalesType(TOrderNew in);
 
-	void addTaskMid(Integer id, String commodityId, String orderNo);
-	void addTaskMid(Integer id, String commodityId, String orderNo,Integer change);
+	int addTaskMid(InputAddTask inputAddTask);
+	int addTaskMid(Integer id, String commodityId, String orderNo);
+	int addTaskMid(Integer id, String commodityId, String orderNo,Integer change);
 
 	void pushExamineName(TOrderNew t);
 

+ 36 - 12
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1065,16 +1065,22 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
 				if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
 				tOrderTaskMapper.insertSelective(ot);
-				orderNewService.addTaskMid(ot.getId(),ot.getCommodityId(),ot.getOrderNo(),1);
+				InputAddTask inMid=new InputAddTask();
+				inMid.setId(ot.getId());
+				inMid.setCommodityId(ot.getCommodityId());
+				inMid.setOrderNo(ot.getOrderNo());
+				inMid.setChange(1);
+				inMid.setLastYear(cd.getLastYear());
+				inMid.setLastYearCapital(cd.getLastYearCapital());
+				inMid.setLastYearIncome(cd.getLastYearIncome());
+				orderNewService.addTaskMid(inMid);
 				if (cd.getSplitStatus()==1){
 					map.put(cd.getId(),ot.getId());
 				}
 				if (cd.getServiceLife()!=null){
 					addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
 				}
-				if (cd.getLastYear()!=null){
-					addTaskMid(ot.getId(),cd.getLastYear(),cd.getLastYearCapital(),cd.getLastYearIncome());
-				}
+
 				cd.setTid(ot.getId());
 				tChangeTaskMapper.updateByPrimaryKeySelective(cd);
 				tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
@@ -1108,14 +1114,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		tTaskMidMapper.updateByTid(tTaskMid);
 	}
 
-	private void addTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
-		TTaskMid tTaskMid = new TTaskMid();
-		tTaskMid.setTid(id);
-		tTaskMid.setLastYear(lastYear);
-		tTaskMid.setLastYearCapital(lastYearCapital);
-		tTaskMid.setLastYearIncome(lastYearIncome);
-		tTaskMidMapper.insertSelective(tTaskMid);
-	}
+
 
 	private void updateTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum,String contractTerm) {
 		TTaskMember ttm=new TTaskMember();
@@ -1585,4 +1584,29 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		NewOrderChange newOrderChange=newOrderChangeMapper.selectByPrimaryKey(id);
 		return newOrderChangeMapper.gerProcessName(id,newOrderChange.getOrderNo());
 	}
+
+	@Override
+	public boolean checkTaskMain(TChangeTask t) {
+			int i=0;
+		if (t.getMain()==1){
+			if (t.getId()!=null) {
+				TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(t.getId());
+				t.setCid(tChangeTask.getCid());
+			}
+			List<TChangeTaskOut> l = tChangeTaskMapper.selectByCid(t.getCid(), null);
+			for (TChangeTaskOut task : l) {
+				if (task.getId().equals(t.getId())){
+					task.setMain(1);
+				}
+				if (task.getMain()==1){
+						i++;
+				}
+			}
+			if (i>1){
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

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

@@ -245,25 +245,25 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public void addTaskMid(Integer id, String commodityId, String orderNo) {
+	public int addTaskMid(Integer id, String commodityId, String orderNo) {
 		InputAddTask t = new InputAddTask();
 		t.setId(id);
 		t.setCommodityId(commodityId);
 		t.setOrderNo(orderNo);
-		addTaskMid( t);
+		return  addTaskMid( t);
 	}
 
 	@Override
-	public void addTaskMid(Integer id, String commodityId, String orderNo, Integer change) {
+	public int addTaskMid(Integer id, String commodityId, String orderNo, Integer change) {
 		InputAddTask t = new InputAddTask();
 		t.setId(id);
 		t.setCommodityId(commodityId);
 		t.setOrderNo(orderNo);
 		t.setChange(change);
-		addTaskMid( t);
+		return  addTaskMid( t);
 	}
 
-
+	@Override
 	public int addTaskMid(InputAddTask t) {
 		TTaskMid tm=new TTaskMid();
 		tm.setTid(t.getId());

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

@@ -202,7 +202,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	private void projectDistributionPushUserMid(TOrderNew tn) {
-		if (tn.getProcessStatus()==4){
+		if (tn.getProcessStatus()==ProcessStatus.YPZXSGLY.getCode()){
 			UserMid um=new UserMid();
 			String taskNames=userMidMapper.getUserTaskNames(tn.getBuyerId());
 			UserMid use=userMidMapper.getUserDtails(tn.getBuyerId());