From e4a45f4d826c550f9130413f04b5b15feddc017c Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Thu, 4 Aug 2022 15:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A1=B9=E7=9B=AE=E7=94=B3?=
=?UTF-8?q?=E6=8A=A5=E4=B9=A6=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projectplan/ProjectPlanSvrImpl.java | 149 +++++++++---------
1 file changed, 74 insertions(+), 75 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
index 06ada21a1..1b55ef062 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
@@ -219,95 +219,94 @@ public class ProjectPlanSvrImpl implements ProjectPlanSvr {
* @param projectPlanBookCmd 椤圭洰瑙勫垝涔md
*/
public void checkThreeQuota(ProjectPlanBookCmd projectPlanBookCmd){
- if ("涓€娆℃€ч」鐩�".equals(projectPlanBookCmd.getProjectType()) || "浠ｇ紪椤圭洰".equals(projectPlanBookCmd.getProjectType()) ||
- "瀹氬悜椤圭洰".equals(projectPlanBookCmd.getProjectType()) || "瀛︾敓濂栧姪瀛﹂噾椤圭洰".equals(projectPlanBookCmd.getProjectType())) {
- if (projectPlanBookCmd.getWhether()) {
- //鍒ゆ柇瀵硅薄鏄惁涓虹┖
- if (!(ObjectUtils.isEmpty(projectPlanBookCmd.getProjectTargetCmd()))) {
- //鍒ゆ柇骞村害鐩爣
- if (JSONObject.isValidObject(projectPlanBookCmd.getProjectTargetCmd().getSummaryJson())) {
- JSONObject jsonObject = JSONObject.parseObject(projectPlanBookCmd.getProjectTargetCmd().getSummaryJson());
- if (!(ObjectUtils.isEmpty(jsonObject))) {
- if (ObjectUtils.isEmpty(jsonObject.get("yearGoal"))) {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "骞村害鐩爣涓嶈兘涓虹┖", ""));
- }
- }else {
+
+ if (projectPlanBookCmd.getWhether()) {
+ //鍒ゆ柇瀵硅薄鏄惁涓虹┖
+ if (!(ObjectUtils.isEmpty(projectPlanBookCmd.getProjectTargetCmd()))) {
+ //鍒ゆ柇骞村害鐩爣
+ if (JSONObject.isValidObject(projectPlanBookCmd.getProjectTargetCmd().getSummaryJson())) {
+ JSONObject jsonObject = JSONObject.parseObject(projectPlanBookCmd.getProjectTargetCmd().getSummaryJson());
+ if (!(ObjectUtils.isEmpty(jsonObject))) {
+ if (ObjectUtils.isEmpty(jsonObject.get("yearGoal"))) {
throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "骞村害鐩爣涓嶈兘涓虹┖", ""));
}
+ }else {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "骞村害鐩爣涓嶈兘涓虹┖", ""));
}
- //鍒ゆ柇涓夌骇鎸囨爣鏄惁涓虹┖
- if (JSONArray.isValidArray(projectPlanBookCmd.getProjectTargetCmd().getSubOtherArrayJson())) {
- JSONArray objects = JSON.parseArray(projectPlanBookCmd.getProjectTargetCmd().getSubOtherArrayJson());
- // 鏁伴噺鎸囨爣鏄惁婊¤冻
- boolean flag1 = false;
- // 璐ㄩ噺鎸囨爣鏄惁婊¤冻
- boolean flag2 = false;
- // 鏃舵晥鎸囨爣鏄惁婊¤冻
- boolean flag3 = false;
- // 绀句細鏁堢泭鎸囨爣鏄惁婊¤冻
- boolean flag4 = false;
- // 婊℃剰搴︽寚鏍囨槸鍚︽弧瓒�
- boolean flag5 = false;
- if (ObjectUtils.isEmpty(objects)) {
- ExceptionUtil.getException(null,"鎸囨爣涓嶈兘涓虹┖");
+ }
+ //鍒ゆ柇涓夌骇鎸囨爣鏄惁涓虹┖
+ if (JSONArray.isValidArray(projectPlanBookCmd.getProjectTargetCmd().getSubOtherArrayJson())) {
+ JSONArray objects = JSON.parseArray(projectPlanBookCmd.getProjectTargetCmd().getSubOtherArrayJson());
+ // 鏁伴噺鎸囨爣鏄惁婊¤冻
+ boolean flag1 = false;
+ // 璐ㄩ噺鎸囨爣鏄惁婊¤冻
+ boolean flag2 = false;
+ // 鏃舵晥鎸囨爣鏄惁婊¤冻
+ boolean flag3 = false;
+ // 绀句細鏁堢泭鎸囨爣鏄惁婊¤冻
+ boolean flag4 = false;
+ // 婊℃剰搴︽寚鏍囨槸鍚︽弧瓒�
+ boolean flag5 = false;
+ if (ObjectUtils.isEmpty(objects)) {
+ ExceptionUtil.getException(null,"鎸囨爣涓嶈兘涓虹┖");
+ }
+ for (Object item : objects) {
+ JSONObject jsonObject = JSON.parseObject(item.toString());
+ if (ObjectUtils.isEmpty(jsonObject)) {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鎸囨爣涓嶈兘涓虹┖", ""));
}
- for (Object item : objects) {
- JSONObject jsonObject = JSON.parseObject(item.toString());
- if (ObjectUtils.isEmpty(jsonObject)) {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鎸囨爣涓嶈兘涓虹┖", ""));
- }
- if ("鏁伴噺鎸囨爣".equals(jsonObject.get("two").toString())) {
- flag1 = true;
- if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鏁伴噺鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
- }
+ if ("鏁伴噺鎸囨爣".equals(jsonObject.get("two").toString())) {
+ flag1 = true;
+ if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鏁伴噺鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
}
- if ("璐ㄩ噺鎸囨爣".equals(jsonObject.get("two").toString())) {
- flag2 = true;
- if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "璐ㄩ噺鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
- }
- }
- if ("鏃舵晥鎸囨爣".equals(jsonObject.get("two").toString())) {
- flag3 = true;
- if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鏃舵晥鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
- }
- }
- if ("绀句細鏁堢泭鎸囨爣".equals(jsonObject.get("two").toString())) {
- flag4 = true;
- if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "绀句細鏁堢泭鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
- }
- }
- if ("鏈嶅姟瀵硅薄婊℃剰搴︽寚鏍�".equals(jsonObject.get("two").toString())) {
- flag5 = true;
- if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鏈嶅姟瀵硅薄婊℃剰搴︽寚鏍囩殑涓夌骇鎸囨爣涓嶈兘涓虹┖", ""));
- }
- }
- }
- if (!flag1) {
- ExceptionUtil.getException(null,"鏁伴噺鎸囨爣涓嶈兘涓虹┖");
}
- if (!flag2) {
- ExceptionUtil.getException(null,"璐ㄩ噺鎸囨爣涓嶈兘涓虹┖");
+ if ("璐ㄩ噺鎸囨爣".equals(jsonObject.get("two").toString())) {
+ flag2 = true;
+ if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "璐ㄩ噺鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
+ }
}
- if (!flag3) {
- ExceptionUtil.getException(null,"鏃舵晥鎸囨爣涓嶈兘涓虹┖");
+ if ("鏃舵晥鎸囨爣".equals(jsonObject.get("two").toString())) {
+ flag3 = true;
+ if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鏃舵晥鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
+ }
}
- if (!flag4) {
- ExceptionUtil.getException(null,"绀句細鏁堢泭鎸囨爣涓嶈兘涓虹┖");
+ if ("绀句細鏁堢泭鎸囨爣".equals(jsonObject.get("two").toString())) {
+ flag4 = true;
+ if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "绀句細鏁堢泭鎸囨爣鐨勪笁绾ф寚鏍囦笉鑳戒负绌�", ""));
+ }
}
- if (!flag5) {
- ExceptionUtil.getException(null,"鏈嶅姟瀵硅薄婊℃剰搴︽寚鏍囦笉鑳戒负绌�");
+ if ("鏈嶅姟瀵硅薄婊℃剰搴︽寚鏍�".equals(jsonObject.get("two").toString())) {
+ flag5 = true;
+ if (ObjectUtils.isEmpty(jsonObject.get("three"))) {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鏈嶅姟瀵硅薄婊℃剰搴︽寚鏍囩殑涓夌骇鎸囨爣涓嶈兘涓虹┖", ""));
+ }
}
}
- }else {
- throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "骞村害鐩爣銆佹寚鏍囦笉鑳戒负绌�", ""));
+ if (!flag1) {
+ ExceptionUtil.getException(null,"鏁伴噺鎸囨爣涓嶈兘涓虹┖");
+ }
+ if (!flag2) {
+ ExceptionUtil.getException(null,"璐ㄩ噺鎸囨爣涓嶈兘涓虹┖");
+ }
+ if (!flag3) {
+ ExceptionUtil.getException(null,"鏃舵晥鎸囨爣涓嶈兘涓虹┖");
+ }
+ if (!flag4) {
+ ExceptionUtil.getException(null,"绀句細鏁堢泭鎸囨爣涓嶈兘涓虹┖");
+ }
+ if (!flag5) {
+ ExceptionUtil.getException(null,"鏈嶅姟瀵硅薄婊℃剰搴︽寚鏍囦笉鑳戒负绌�");
+ }
}
+ }else {
+ throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "骞村害鐩爣銆佹寚鏍囦笉鑳戒负绌�", ""));
}
}
+
}
/**
--
GitLab