mod: 字段调整

smart-steward-common/src/main/java/com/smartSteward/common/enums/exam/ReviewStatus.java

@@ -3,18 +3,19 @@ package com.smartSteward.common.enums.exam;
 import com.smartSteward.common.enums.task.FormTypeEnum;
 
 public enum ReviewStatus {
-    // review_status-wei
+    // u=unreviewed-未批、reviewing-批改中、reviewed-已批
     /**
      * 为
      */
-    UNREVIEWED("unreviewed","草稿"),
+    UNREVIEWED("unreviewed","未批"),
+    /**
+     * 批改中
+     */
+    REVIEWING("reviewing","批改中"),
     /**
      * 审核中
      */
-    REVIEWED("reviewed","审核中");
-
-
-
+    REVIEWED("reviewed","已批");
 
 
     private final String code;

smart-steward-mapper/src/main/resources/mapper/exam/ExamMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examStatus"    column="exam_status"    />
         <result property="passScore"    column="pass_score"    />
         <result property="isLimit"    column="is_limit"    />
+        <result column="isSubjective"    property="is_subjective"    />
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectExamVo">
-        select id, exam_category_id, exam_name, paper_id, exam_start_time, exam_end_time, exam_duration, exam_status, pass_score, is_limit, remark, create_time, update_time, create_by, update_by, del_flag from exam
+        select id, exam_category_id, exam_name, paper_id, exam_start_time, exam_end_time, exam_duration, exam_status, pass_score, is_limit, is_subjective, remark, create_time, update_time, create_by, update_by, del_flag from exam
     </sql>
 
     <select id="selectExamList" parameterType="Exam" resultMap="ExamResult">
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examStatus != null  and examStatus != ''"> and exam_status = #{examStatus}</if>
             <if test="passScore != null "> and pass_score = #{passScore}</if>
             <if test="isLimit != null "> and is_limit = #{isLimit}</if>
+            <if test="isSubjective != null "> and is_subjective = #{isSubjective}</if>
             <!-- 如果有station_id字段，则增加站点集合查询条件 -->
         </where>
     </select>
@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="exam_end_time" property="examEndTime"/>
         <result column="exam_status" property="examStatus"/>
         <result column="is_limit" property="isLimit"/>
+        <result column="is_subjective" property="isSubjective"/>
         <result column="pass_score" property="passScore"/>
         <!-- 新增答题/批改字段映射 -->
         <result column="exam_score" property="score"/>
@@ -172,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examStatus != null and examStatus != ''">exam_status,</if>
             <if test="passScore != null">pass_score,</if>
             <if test="isLimit != null">is_limit,</if>
+            <if test="isSubjective != null">is_subjective,</if>
             <if test="remark != null">remark,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
@@ -189,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examStatus != null and examStatus != ''">#{examStatus},</if>
             <if test="passScore != null">#{passScore},</if>
             <if test="isLimit != null">#{isLimit},</if>
+            <if test="isSubjective != null">#{isSubjective},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -210,6 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examStatus != null and examStatus != ''">exam_status = #{examStatus},</if>
             <if test="passScore != null">pass_score = #{passScore},</if>
             <if test="isLimit != null">is_limit = #{isLimit},</if>
+            <if test="isSubjective != null">is_subjective = #{isSubjective},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>