Browse Source

修改问卷校验

master^2
lucky 4 years ago
parent
commit
4cebd898ab
  1. 2
      src/main/java/com/ccsens/carbasics/service/AccountManageService.java
  2. 5
      src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
  3. 4
      src/main/resources/application.yml

2
src/main/java/com/ccsens/carbasics/service/AccountManageService.java

@ -88,7 +88,7 @@ public class AccountManageService implements IAccountManageService {
boolean flag = true; boolean flag = true;
//1.校验字段是否都填写 //1.校验字段是否都填写
Integer num = questionnaireDetailDao.countCodeNumber(detailId); Integer num = questionnaireDetailDao.countCodeNumber(detailId);
if (num < 22) { if (num < 23) {
flag = false; flag = false;
} }
String answer = questionnaireDetailDao.queryXGZL(detailId); String answer = questionnaireDetailDao.queryXGZL(detailId);

5
src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@ -186,7 +186,8 @@ public class QuestionnaireService implements IQuestionnaireService{
List<String> stringList = new ArrayList<>(); List<String> stringList = new ArrayList<>();
stringList.add("QXXWJ"); stringList.add("QXXWJ");
List<CodeVo.Basic> qxxwj = codeDictionariesDao.query(stringList); List<CodeVo.Basic> 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); throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE);
} }
String answer = questionnaireDetailDao.queryXGZL(param.getDetailId()); String answer = questionnaireDetailDao.queryXGZL(param.getDetailId());
@ -195,7 +196,7 @@ public class QuestionnaireService implements IQuestionnaireService{
sonCode.add("XGZL"); sonCode.add("XGZL");
List<CodeVo.Basic> xgzl = codeDictionariesDao.query(sonCode); List<CodeVo.Basic> xgzl = codeDictionariesDao.query(sonCode);
Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId()); Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId());
if (sonOfXGZLNum <= xgzl.size()) { if (sonOfXGZLNum < xgzl.size()) {
throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE); throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE);
} }
} }

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: test active: prod
include: common, util-test include: common, util-prod

Loading…
Cancel
Save