Bladeren bron

开项管理 - 涉及code带出章节、目录、序号及名称

wangggziwen 8 maanden geleden
bovenliggende
commit
eeaee2b1e8

+ 24 - 0
rc-buisness/src/main/java/com/ruoyi/rc/domain/TOpenItem.java

@@ -97,6 +97,30 @@ public class TOpenItem extends BaseEntity
     @Excel(name = "序号")
     private Long code;
 
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 章节 */
+    @Excel(name = "章节")
+    private String chapName;
+
+    public String getChapName() {
+        return chapName;
+    }
+
+    public void setChapName(String chapName) {
+        this.chapName = chapName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getDirectory() {
         return directory;
     }

+ 4 - 1
rc-buisness/src/main/resources/mapper/rc/TOpenItemMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reviewerName"    column="reviewer_name"    />
         <result property="apNo"    column="ap_no"    />
         <result property="processId"    column="process_id"    />
+        <result property="chapName"    column="chap_name"    />
     </resultMap>
 
     <sql id="selectTOpenItemVo">
@@ -30,11 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.reviewer, d.result, d.deadline, d.remarks, d.dept_id,
         d.ap_no, d.process_id,
         u1.nick_name as person_in_charge_name, u2.nick_name as reviewer_name,
-        q.directory, q.code
+        q.directory, q.code, q.name,
+        c.name as chap_name
         from t_open_item as d
         left join sys_user u1 on d.person_in_charge = u1.user_id
         left join sys_user u2 on d.reviewer = u2.user_id
         left join t_questionnaire q on q.id = d.questionnaire_id
+        left join t_chapter c on c.id = q.chapter_id
     </sql>
 
     <select id="selectTOpenItemList" parameterType="TOpenItem" resultMap="TOpenItemResult">

+ 10 - 8
ruoyi-ui/src/views/rc/openitem/index.vue

@@ -158,15 +158,17 @@
     <el-table border v-loading="loading" :data="openitemList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="装置" align="center" prop="deptName" width="120"/>
-      <el-table-column label="问题类型" align="center" prop="type">
+      <el-table-column label="问题类型" align="center" prop="type" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.t_open_item_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="目录" align="center" prop="directory" />
-      <el-table-column label="序号" align="center" prop="code" />
+      <el-table-column label="章节" align="center" prop="chapName" width="250"/>
+      <el-table-column label="目录" align="center" prop="directory" width="100" />
+      <el-table-column label="序号" align="center" prop="code" width="100" />
+      <el-table-column label="名称" align="center" prop="name" width="350" />
       <el-table-column label="存在问题描述" align="center" prop="description" width="200" />
-      <el-table-column label="开项级别" align="center" prop="level">
+      <el-table-column label="开项级别" align="center" prop="level" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.t_open_item_level" :value="scope.row.level"/>
         </template>
@@ -181,14 +183,14 @@
           <span>{{ parseTime(scope.row.closeTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="问题处理状态" align="center" prop="status">
+      <el-table-column label="问题处理状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.t_open_item_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="负责人" align="center" prop="personInChargeName" />
-      <el-table-column label="审核人" align="center" prop="reviewerName" />
-      <el-table-column label="负责人确认" align="center" prop="result">
+      <el-table-column label="负责人" align="center" prop="personInChargeName" width="100" />
+      <el-table-column label="审核人" align="center" prop="reviewerName" width="100" />
+      <el-table-column label="负责人确认" align="center" prop="result" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.t_open_item_result" :value="scope.row.result"/>
         </template>