修改提交问卷判断

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 < 23) {
+        if (num < 24) {
            flag = false;
         }
         String answer = questionnaireDetailDao.queryXGZL(detailId);

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

@@ -187,7 +187,7 @@ public class QuestionnaireService implements IQuestionnaireService{
         stringList.add("QXXWJ");
         List<CodeVo.Basic> qxxwj = codeDictionariesDao.query(stringList);
         log.info("QXXWJ数量:{}",qxxwj.size());
-        if (num < (qxxwj.size()-1)) {
+        if (num < qxxwj.size()) {
             throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE);
         }
         String answer = questionnaireDetailDao.queryXGZL(param.getDetailId());

src/main/resources/mapper_dao/AreaDao.xml

@@ -3,15 +3,11 @@
 <mapper namespace="com.ccsens.carbasics.persist.dao.AreaDao">
 
     <resultMap id="area" type="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
-        <id column="shengid" property="id"/>
+        <id column="shiid" property="id"/>
-        <result column="sheng" property="name"/>
+        <result column="shiName" property="name"/>
         <collection property="child" ofType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
-            <id column="shiid" property="id"/>
+            <id column="quid" property="id"/>
-            <result column="shiname" property="name"/>
+            <result column="quName" property="name"/>
-            <collection property="child" ofType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
-                <id column="quid" property="id"/>
-                <result column="quname" property="name"/>
-            </collection>
         </collection>
     </resultMap>