添加排课接口 新增空值验证

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -120,6 +120,9 @@ public class BArrangeServiceImpl implements BArrangeService {
 //            throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
 //        }
         bArrange.setDescription(arrange.getString("desc"));
+        if (arrange.getString("termCode").equals("")){
+            throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+        }
         bArrange.setTermCode(arrange.getString("termCode"));
         bArrange.setStatus("0");
         UserUtil.setCurrentPersistOperation(bArrange);
@@ -132,6 +135,9 @@ public class BArrangeServiceImpl implements BArrangeService {
             JSONObject subtask = childList.getJSONObject(i);
             BSubtask bSubtask = new BSubtask();
             List<BSubAgency> bSubAgencyList = new ArrayList<>();
+            if (subtask.getString("name").equals("")){
+                throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+            }
             bSubtask.setName(subtask.getString("name"));
             bSubtask.setArrangeId(bArrange.getBusinessId());
             bSubtask.setStatus("0");
@@ -142,18 +148,19 @@ public class BArrangeServiceImpl implements BArrangeService {
             for(int j = 0; j < childList2.size() ; j++){
                 JSONObject agency = childList2.getJSONObject(j);
                 BSubAgency bSubAgency = new BSubAgency();
-                if (agency.get("agencyCode") != null){
+                if (agency.get("agencyCode") != null && !agency.get("agencyCode").equals("")){
                     bSubAgency.setAgencyCode(agency.getString("agencyCode"));
                     bSubAgency.setStatus("0");
                     bSubAgency.setSubtaskId(bSubtask.getBusinessId());
                     UserUtil.setCurrentPersistOperation(bSubAgency);
-                    bSubAgencyList.add(bSubAgency);
+                    bSubAgencyRepository.insertSelective(bSubAgency);
+//                    bSubAgencyList.add(bSubAgency);
                 }
                 else {
                     throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
                 }
             }
-            bArrangeRepository.insertBSubAgency(bSubAgencyList);
+//            bArrangeRepository.insertBSubAgency(bSubAgencyList);
         }
         bArrangeRepository.insertBSubtask(subtaskList);
         return new PersistModel(line);
@@ -183,6 +190,9 @@ public class BArrangeServiceImpl implements BArrangeService {
         //arrange对象修改操作
         JSONObject arrange = jsonObject.getJSONObject("arrange");
         bArrange.setDescription(arrange.getString("desc"));
+        if (arrange.getString("termCode").equals("")){
+            throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+        }
         bArrange.setTermCode(arrange.getString("termCode"));
         bArrange.setBusinessId(arrange.getString("businessId"));
         bArrangeRepository.updateByPrimaryKeySelective(bArrange);
@@ -193,6 +203,9 @@ public class BArrangeServiceImpl implements BArrangeService {
         for(int i = 0; i < childList.size() ; i++){
             JSONObject subtask = childList.getJSONObject(i);
             BSubtask bSubtask = new BSubtask();
+            if (subtask.getString("name").equals("")){
+                throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+            }
             bSubtask.setName(subtask.getString("name"));
             bSubtask.setArrangeId(arrange.getString("businessId"));
             UserUtil.setCurrentPersistOperation(bSubtask);
@@ -201,9 +214,12 @@ public class BArrangeServiceImpl implements BArrangeService {
             for(int j = 0; j < childList2.size() ; j++){
                 JSONObject agency = childList2.getJSONObject(j);
                 BSubAgency bSubAgency = new BSubAgency();
-                   if (agency.get("agencyCode") != null){
+                   if (agency.get("agencyCode") != null && !agency.get("agencyCode").equals("")){
                        bSubAgency.setAgencyCode(agency.getString("agencyCode"));
                    }
+                   else {
+                       throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+                   }
                 //再插入新记录
                 UserUtil.setCurrentPersistOperation(bSubAgency);
                 bSubAgency.setSubtaskId(bSubtask.getBusinessId());

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -183,6 +183,8 @@ public enum ResultServiceEnums {
     CURRENT_TERM(97,"当前学期不可删除"),
 
     ROOM_HAS_USED(98,"当前教室正在被使用，不可删除"),
+
+    DATA_HAS_USED(100,"当前数据被使用，不可删除"),
     ;
 
     private Integer code;