Prechádzať zdrojové kódy

开项管理台账带出目录和序号

wangggziwen 8 mesiacov pred
rodič
commit
cff579702c

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

@@ -89,6 +89,30 @@ public class TOpenItem extends BaseEntity
     /** 流程id */
     private String processId;
 
+    /** 目录 */
+    @Excel(name = "目录")
+    private String directory;
+
+    /** 序号 */
+    @Excel(name = "序号")
+    private Long code;
+
+    public String getDirectory() {
+        return directory;
+    }
+
+    public void setDirectory(String directory) {
+        this.directory = directory;
+    }
+
+    public Long getCode() {
+        return code;
+    }
+
+    public void setCode(Long code) {
+        this.code = code;
+    }
+
     public String getApNo() {
         return apNo;
     }

+ 5 - 2
rc-buisness/src/main/resources/mapper/rc/TOpenItemMapper.xml

@@ -26,12 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTOpenItemVo">
-        select id, type, questionnaire_id, description, level, open_time, close_time, d.status, person_in_charge, reviewer, result, deadline, remarks, d.dept_id,
+        select d.id, d.type, d.questionnaire_id, d.description, d.level, d.open_time, d.close_time, d.status, d.person_in_charge,
+        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
+        u1.nick_name as person_in_charge_name, u2.nick_name as reviewer_name,
+        q.directory, q.code
         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
     </sql>
 
     <select id="selectTOpenItemList" parameterType="TOpenItem" resultMap="TOpenItemResult">

+ 2 - 1
ruoyi-ui/src/views/rc/openitem/index.vue

@@ -163,7 +163,8 @@
           <dict-tag :options="dict.type.t_open_item_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="涉及整改code" align="center" prop="questionnaireId" />
+      <el-table-column label="目录" align="center" prop="directory" />
+      <el-table-column label="序号" align="center" prop="code" />
       <el-table-column label="存在问题描述" align="center" prop="description" width="200" />
       <el-table-column label="开项级别" align="center" prop="level">
         <template slot-scope="scope">