Sfoglia il codice sorgente

Merge branch 'test' of jishutao/kede-server into prod

anderx 3 anni fa
parent
commit
cf1975f945

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

@@ -538,7 +538,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 新增会员子项目
+	 * 变更-新增会员子项目
 	 *
 	 * @return
 	 */

+ 2 - 2
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -586,7 +586,7 @@ public class OrderProjectApiController extends CertifyApiController {
 
 
 	/**
-	 * 新增会员子项目
+	 * 新增会员子项目(发起新增、无需审核)
 	 *
 	 * @return
 	 */
@@ -605,7 +605,7 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	}
 	/**
-	 * 新增会员子项目
+	 * 新增会员子项目(审核)
 	 *
 	 * @return
 	 */

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

@@ -967,10 +967,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 
 	private void pushTaskAndDun(Integer id,TOrderNew o) {
-		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
-		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
-		List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
-		changeAddOrderTask(listct2,map);
+		pushChangeAddOrderTask(id);
+
 		//处理主项目显示派单年份
 		List<TChangeDunOut> listcd=tChangeDunMapper.selectByCid(id);
 		for (TChangeDunOut cd : listcd) {
@@ -1005,6 +1003,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	/**
+	 * 通过变更id来处理变更,先将父级新增、再新增子集。为了获取到订单项目的父子级关系
+	 * @param id
+	 */
+	private void pushChangeAddOrderTask(Integer id) {
+		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
+		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
+		List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
+		changeAddOrderTask(listct2,map);
+	}
+
+	/**
 	 *
 	 * @param listct 变更数据
 	 * @param input  新增数据Id
@@ -1039,6 +1048,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						if (tid==null)tid=tChangeTaskMapper.selectByPrimaryKey(cd.getChangeSplitSuper()).getTid();
 						ot.setSplitSuper(tid);
 					}
+					ot.setSplitId(pushSplitId(ot.getSplitSuper()));
+					ot.setCommodityPrice(new BigDecimal(0));
 				}
 				if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
 				if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
@@ -1066,6 +1077,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				ot.setId(cd.getTid());
 				ot.setCommodityPrice(cd.getCommodityPrice());
 				ot.setCommodityQuantity(cd.getCommodityQuantity());
+				if (ot.getSplitSuper()!=null)ot.setSplitId(pushSplitId(ot.getSplitSuper()));
 				if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
 				if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
 				tOrderTaskMapper.updateByPrimaryKeySelective(ot);
@@ -1078,11 +1090,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}else if(cd.getType()==3) {
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
 			}
-
 		}
 		return map;
 	}
 
+	private Integer pushSplitId(Integer splitSuper) {
+		//计算出拆分编号
+		Integer i = tOrderTaskMapper.getSplitCount(splitSuper);
+		i++;
+		return i;
+	}
+
 	private void updateTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
 		TTaskMid tTaskMid = new TTaskMid();
 		tTaskMid.setTid(id);
@@ -1490,6 +1508,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}
 		tChangeTask.setType(1);
 		tChangeTask.setCommodityQuantity(1);
+		tChangeTask.setCommodityPrice(new BigDecimal(0));
 		tChangeTask.setTaskComment(taskComment);
 		tChangeTask.setServiceYear(serviceYear);
 		tChangeTaskMapper.insertSelective(tChangeTask);

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

@@ -1279,7 +1279,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderTask.setCommodityQuantity(1);
 		tOrderTask.setTaskComment(taskComment);
 		tOrderTask.setMain(0);
-		if (i!=1)tOrderTask.setCommodityPrice(new BigDecimal(0));
+		tOrderTask.setCommodityPrice(new BigDecimal(0));
 		tOrderTaskMapper.insertSelective(tOrderTask);
 		TTaskMember t = tTaskMemberMapper.selectByTid(tid);
 		TOrderTaskBo tb=new TOrderTaskBo();
@@ -1295,12 +1295,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
 		}
-
 		orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
 		//处理主项目本次派单年份
 		tTaskMemberMapper.updateServiceYearBySplitSuper(tid);
 		addMemberLog(tOrderTask.getId(),0,"新增会员项目");
-		addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
+		if(memberType!=null){
+			addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
+		}
 		return tb;
 	}
 	public void addNoticMember(Integer type,  String orderNo,Integer shiroType,Integer result) {