From 1a4efb75c7a71ebdacbca7d0e180654ef00c5b57 Mon Sep 17 00:00:00 2001 From: lucky Date: Mon, 27 Dec 2021 09:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=97=AE=E5=8D=B7code?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/carbasics/service/QuestionnaireService.java | 10 ++++++++-- src/main/resources/application.yml | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index 8913869..db71f6e 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -183,13 +183,19 @@ public class QuestionnaireService implements IQuestionnaireService{ } //1.校验字段是否都填写 Integer num = questionnaireDetailDao.countCodeNumber(param.getDetailId()); - if (num < 22) { + List stringList = new ArrayList<>(); + stringList.add("QXXWJ"); + List qxxwj = codeDictionariesDao.query(stringList); + if (num <= qxxwj.size()) { throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE); } String answer = questionnaireDetailDao.queryXGZL(param.getDetailId()); if ("是".equals(answer)) { + List sonCode = new ArrayList<>(); + stringList.add("XGZL"); + List xgzl = codeDictionariesDao.query(stringList); Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId()); - if (sonOfXGZLNum < 23) { + if (sonOfXGZLNum <= xgzl.size()) { throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5abf242..c3b11fb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod + active: test + include: common, util-test