Просмотр исходного кода

变更项目新增、修改主项目BUG修复

anderx лет назад: 3
Родитель
Сommit
198d371aff

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

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

@@ -1583,4 +1583,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;
+	}
 }