diff --git a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java index ac2644e..4ad8bea 100644 --- a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java +++ b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java @@ -88,7 +88,7 @@ public class AccountManageService implements IAccountManageService { boolean flag = true; //1.校验字段是否都填写 Integer num = questionnaireDetailDao.countCodeNumber(detailId); - if (num < 22) { + if (num < 23) { flag = false; } String answer = questionnaireDetailDao.queryXGZL(detailId); diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index b4f966a..09f55aa 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -186,7 +186,8 @@ public class QuestionnaireService implements IQuestionnaireService{ List stringList = new ArrayList<>(); stringList.add("QXXWJ"); List qxxwj = codeDictionariesDao.query(stringList); - if (num <= qxxwj.size()) { + log.info("QXXWJ数量:{}",qxxwj.size()); + if (num < (qxxwj.size()-1)) { throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE); } String answer = questionnaireDetailDao.queryXGZL(param.getDetailId()); @@ -195,7 +196,7 @@ public class QuestionnaireService implements IQuestionnaireService{ sonCode.add("XGZL"); List xgzl = codeDictionariesDao.query(sonCode); Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId()); - if (sonOfXGZLNum <= xgzl.size()) { + 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 c3b11fb..5abf242 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test + active: prod + include: common, util-prod