Browse Source

新增子项主项本次派单修改

anderx 9 months ago
parent
commit
7a06f35ae8

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

@@ -1697,23 +1697,27 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			tChangeTasks = tChangeTaskMapper.selectBySuper(null, in.getId(), tChangeTask.getCid());
 		}
 		int a=0,b=0,c=0;
+		StringBuilder str= null;
 		for (TChangeTask e : tChangeTasks) {
 			if (a==0&&e.getHtMember()!=null&&e.getHtMember()==1)a=e.getHtMember();
 			if (b==0&&e.getAdditionalDeduction()!=null&&e.getAdditionalDeduction()==1)b=e.getAdditionalDeduction();
 			if (c==0&&e.getRdAwardsubsidy()!=null&&e.getRdAwardsubsidy()==1)c=e.getRdAwardsubsidy();
+			if (e.getServiceYear()!=null){
+                    str.append(e.getServiceYear()).append(",");
+            }
 		}
-		tChangeTask.setHtMember(a);
+        if (str != null) {
+            tChangeTask.setServiceYear(str.substring(0,str.length()-1));
+        }
+        tChangeTask.setHtMember(a);
 		tChangeTask.setAdditionalDeduction(b);
 		tChangeTask.setRdAwardsubsidy(c);
 		//根据上级id修改上级
 		tChangeTaskMapper.update(tChangeTask);
-		updateSuperServiceYear(tChangeTask);
 		return newT;
 	}
 
 	public  void updateSuperServiceYear(TChangeTask tChangeTask) {
-
-
 		if(tChangeTask.getSplitSuper()!=null){
 			tChangeTaskMapper.updateSuperServiceYear(tChangeTask);
 		}else {
@@ -1753,7 +1757,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (in.getAdditionalDeduction()!=null) tChangeTask.setAdditionalDeduction(in.getAdditionalDeduction());
 		if (in.getRdAwardsubsidy()!=null) tChangeTask.setRdAwardsubsidy(in.getRdAwardsubsidy());
 		tChangeTaskMapper.update(tChangeTask);
-		updateSuperServiceYear(tChangeTask);
 		return tChangeTask;
 	}