进度跟踪 - 新增二次审核功能

rc-buisness/src/main/resources/mapper/rc/TQuestionnaireMapper.xml

@@ -63,8 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectTQuestionnaireById" parameterType="Long" resultMap="TQuestionnaireResult">
-        <include refid="selectTQuestionnaireVo"/>
-        where id = #{id}
+        select q.id, audit_id, chapter_id, year, q.type, directory, code, name, yes_no_na, minimum_standard,
+        good_practices, standard, completion_status, q.person_in_charge, q.reviewer, q.remarks, q.dept_id
+        from t_questionnaire q
+        where q.id = #{id}
     </select>
 
     <insert id="insertTQuestionnaire" parameterType="TQuestionnaire" useGeneratedKeys="true" keyProperty="id">

ruoyi-ui/src/views/rc/progress/index.vue

@@ -194,8 +194,14 @@
             size="mini"
             type="text"
             @click="handleApply(scope.row)"
-            v-if="(scope.row.applyStatus == 1 || scope.row.applyStatus == 3) && scope.row.preparation == 6"
+            v-if="scope.row.applyStatus == 1 && scope.row.preparation == 6"
           >提交申请</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleApply(scope.row)"
+            v-if="(scope.row.applyStatus == 3 || scope.row.applyStatus == 4) && scope.row.preparation == 6"
+          >重新提交申请</el-button>
         </template>
       </el-table-column>
     </el-table>