定期会议 - 涉及code带出章节、目录、序号及名称

定期会议 - 新增对话框中添加“章节”、和问卷”下拉框，关联问卷CODE

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TMeetingController.java

@@ -1,12 +1,15 @@
 package com.ruoyi.web.controller.rc;
 
+import java.util.HashMap;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.rc.domain.TAudit;
-import com.ruoyi.rc.domain.TDeptInfo;
+import com.ruoyi.rc.domain.*;
+import com.ruoyi.rc.service.ITAuditService;
+import com.ruoyi.rc.service.ITChapterService;
+import com.ruoyi.rc.service.ITQuestionnaireService;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +25,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.rc.domain.TMeeting;
 import com.ruoyi.rc.service.ITMeetingService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -43,6 +45,44 @@ public class TMeetingController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private ITAuditService tAuditService;
+
+    @Autowired
+    private ITChapterService tChapterService;
+
+    @Autowired
+    private ITQuestionnaireService tQuestionnaireService;
+
+    /**
+     * 查询CODE列表
+     */
+    @GetMapping("/listCode/{chapterId}")
+    public AjaxResult listCode(@PathVariable("chapterId") Long chapterId) {
+        TQuestionnaire questionnaire = new TQuestionnaire();
+        questionnaire.setChapterId(chapterId);
+        List<TQuestionnaire> tQuestionnaires = tQuestionnaireService.selectTQuestionnaireList(questionnaire);
+        return AjaxResult.success(tQuestionnaires);
+    }
+
+    /**
+     * 查询章节列表
+     */
+    @GetMapping("/listChapter")
+    public AjaxResult listChapter() {
+        TAudit audit = new TAudit();
+        audit.setDeptId(getLoginUser().getDeptId().toString());
+        TAudit latest = tAuditService.selectTAuditLatest(audit);
+        if (latest != null) {
+            Long auditId = latest.getId();
+            TChapter chapter = new TChapter();
+            chapter.setAuditId(auditId);
+            List<TChapter> tChapters = tChapterService.selectTChapterList(chapter);
+            return AjaxResult.success(tChapters);
+        }
+        return AjaxResult.success();
+    }
+
     /**
      * 查询会议列表
      */

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TOpenItemController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.rc;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -78,15 +79,18 @@ public class TOpenItemController extends BaseController
         if (taskName.equals("提交申请")) {
             // 进度审批状态修改为2-待审核
             openItem.setStatus("2");
+            questionnaire.setOpenItemStatus("2");
             comment = "重新提交";
         } else if (taskName.equals("审核")) {
             if ("1".equals(condition)) {
                 // 进度审批状态修改为4-已通过
                 openItem.setStatus("4");
+                questionnaire.setOpenItemStatus("4");
                 comment = "通过";
             } else {
                 // 进度审批状态修改为3-未通过
                 openItem.setStatus("3");
+                questionnaire.setOpenItemStatus("3");
                 comment = "驳回";
             }
         }
@@ -157,11 +161,17 @@ public class TOpenItemController extends BaseController
 
         tOpenItem.setProcessId(pi.getProcessInstanceId());
         tOpenItem.setApNo(DateUtils.dateTimeNow() + userId);
-        // 进度审批状态修改为2-待审核
+        // 开项问题处理状态修改为2-待审核
         tOpenItem.setStatus("2");
 
         tOpenItemService.updateTOpenItem(tOpenItem);
 
+        // 同步更新问卷中的开项问题处理状态
+        TQuestionnaire questionnaire = tQuestionnaireService.selectTQuestionnaireById(tOpenItem.getQuestionnaireId());
+        questionnaire.setOpenItemStatus("2");
+        questionnaire.setYear(null);
+        tQuestionnaireService.updateTQuestionnaire(questionnaire);
+
         return AjaxResult.success();
     }
 

rc-buisness/src/main/java/com/ruoyi/rc/domain/TMeeting.java

@@ -44,6 +44,54 @@ public class TMeeting extends BaseEntity
     @Excel(name = "装置")
     private String deptName;
 
+    /** 目录 */
+    @Excel(name = "目录")
+    private String directory;
+
+    /** 序号 */
+    @Excel(name = "序号")
+    private Long code;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 章节 */
+    @Excel(name = "章节")
+    private String chapName;
+
+    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 getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getChapName() {
+        return chapName;
+    }
+
+    public void setChapName(String chapName) {
+        this.chapName = chapName;
+    }
+
     public String getPersonInChargeName() {
         return personInChargeName;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TQuestionnaire.java

@@ -91,14 +91,14 @@ public class TQuestionnaire extends BaseEntity
     private String deptName;
 
     /** 开项问题处理状态 */
-    private String openitemStatus;
+    private String openItemStatus;
 
-    public String getOpenitemStatus() {
-        return openitemStatus;
+    public String getOpenItemStatus() {
+        return openItemStatus;
     }
 
-    public void setOpenitemStatus(String openitemStatus) {
-        this.openitemStatus = openitemStatus;
+    public void setOpenItemStatus(String openItemStatus) {
+        this.openItemStatus = openItemStatus;
     }
 
     public String getPersonInChargeName() {

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

@@ -12,13 +12,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="deptId"    column="dept_id"    />
         <result property="personInChargeName"    column="person_in_charge_name"    />
+        <result property="chapName"    column="chap_name"    />
     </resultMap>
 
     <sql id="selectTMeetingVo">
-        select d.id, year, questionnaire_id, person_in_charge, remarks, d.dept_id,
-        u.nick_name as person_in_charge_name
+        select d.id, d.year, d.questionnaire_id, d.person_in_charge, d.remarks, d.dept_id,
+        u.nick_name as person_in_charge_name,
+        q.directory, q.code, q.name,
+        c.name as chap_name
         from t_meeting d
         left join sys_user u on d.person_in_charge = u.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="selectTMeetingList" parameterType="TMeeting" resultMap="TMeetingResult">

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

@@ -24,19 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="personInChargeName"    column="person_in_charge_name"    />
         <result property="reviewerName"    column="reviewer_name"    />
-        <result property="openitemStatus"    column="openitem_status"    />
+        <result property="openItemStatus"    column="open_item_status"    />
     </resultMap>
 
     <sql id="selectTQuestionnaireVo">
         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,
+        good_practices, standard, completion_status, q.person_in_charge, q.reviewer, q.remarks, q.dept_id,q.open_item_status,
         SUBSTR(q.directory, 1, INSTR(q.directory, '.') - 1) as codeSubStr,
-        u1.nick_name as person_in_charge_name, u2.nick_name as reviewer_name,
-        o.status as openitem_status
+        u1.nick_name as person_in_charge_name, u2.nick_name as reviewer_name
+--         o.status as openitem_status
         from t_questionnaire q
         left join sys_user u1 on q.person_in_charge = u1.user_id
         left join sys_user u2 on q.reviewer = u2.user_id
-        left join t_open_item o on o.questionnaire_id = q.id
+--         left join t_open_item o on o.questionnaire_id = q.id
     </sql>
 
     <select id="selectTQuestionnaireListByDirectory" parameterType="TQuestionnaire" resultMap="TQuestionnaireResult">
@@ -133,26 +133,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateTQuestionnaire" parameterType="TQuestionnaire">
-        update t_questionnaire
+        update t_questionnaire q
         <trim prefix="SET" suffixOverrides=",">
-            <if test="auditId != null">audit_id = #{auditId},</if>
-            <if test="chapterId != null">chapter_id = #{chapterId},</if>
-            <if test="year != null">year = #{year},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="directory != null">directory = #{directory},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="yesNoNa != null">yes_no_na = #{yesNoNa},</if>
-            <if test="minimumStandard != null">minimum_standard = #{minimumStandard},</if>
-            <if test="goodPractices != null">good_practices = #{goodPractices},</if>
-            <if test="standard != null">standard = #{standard},</if>
-            <if test="completionStatus != null">completion_status = #{completionStatus},</if>
-            <if test="personInCharge != null">person_in_charge = #{personInCharge},</if>
-            <if test="reviewer != null">reviewer = #{reviewer},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="auditId != null">q.audit_id = #{auditId},</if>
+            <if test="chapterId != null">q.chapter_id = #{chapterId},</if>
+            <if test="year != null">q.year = #{year},</if>
+            <if test="type != null">q.type = #{type},</if>
+            <if test="directory != null">q.directory = #{directory},</if>
+            <if test="code != null">q.code = #{code},</if>
+            <if test="name != null">q.name = #{name},</if>
+            <if test="yesNoNa != null">q.yes_no_na = #{yesNoNa},</if>
+            <if test="minimumStandard != null">q.minimum_standard = #{minimumStandard},</if>
+            <if test="goodPractices != null">q.good_practices = #{goodPractices},</if>
+            <if test="standard != null">q.standard = #{standard},</if>
+            <if test="completionStatus != null">q.completion_status = #{completionStatus},</if>
+            <if test="personInCharge != null">q.person_in_charge = #{personInCharge},</if>
+            <if test="reviewer != null">q.reviewer = #{reviewer},</if>
+            <if test="remarks != null">q.remarks = #{remarks},</if>
+            <if test="deptId != null">q.dept_id = #{deptId},</if>
+            <if test="openItemStatus != null">q.open_item_status = #{openItemStatus},</if>
         </trim>
-        where id = #{id}
+        where q.id = #{id}
     </update>
 
     <delete id="deleteTQuestionnaireById" parameterType="Long">

ruoyi-ui/src/api/rc/meeting.js

@@ -1,5 +1,21 @@
 import request from '@/utils/request'
 
+// 查询章节列表
+export function listChapter() {
+  return request({
+    url: '/rc/meeting/listChapter',
+    method: 'get'
+  })
+}
+
+// 查询CODE列表
+export function listCode(chapterId) {
+  return request({
+    url: '/rc/meeting/listCode/' + chapterId,
+    method: 'get'
+  })
+}
+
 // 查询会议列表
 export function listMeeting(query) {
   return request({

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

@@ -9,14 +9,14 @@
                         placeholder="请选择年份">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="涉及code" prop="questionnaireId">
-        <el-input
-          v-model="queryParams.questionnaireId"
-          placeholder="请输入涉及code"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <!--<el-form-item label="涉及code" prop="questionnaireId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.questionnaireId"-->
+          <!--placeholder="请输入涉及code"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
       <el-form-item label="负责人" prop="personInCharge">
         <el-select clearable v-model="queryParams.personInCharge" placeholder="请选择负责人"
                    @keyup.enter.native="handleQuery">
@@ -98,9 +98,13 @@
           <span>{{ parseTime(scope.row.year, '{y}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="涉及code" align="center" prop="questionnaireId" width="100" />
+      <!--<el-table-column label="涉及code" align="center" prop="questionnaireId" width="100" />-->
+      <el-table-column label="章节" align="center" prop="chapName" width="250"/>
+      <el-table-column label="目录" align="center" prop="directory" width="100" />
+      <el-table-column label="涉及CODE" align="center" prop="code" width="100" />
+      <el-table-column label="名称" align="center" prop="name" width="350" />
       <el-table-column label="负责人" align="center" prop="personInChargeName" width="100" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="备注" align="center" prop="remarks" width="200" />
       <el-table-column label="定期会议纪要" align="center" width="120" fixed="right">
         <template slot-scope="scope">
           <el-button icon="el-icon-folder" style="color:#6e96fa;" circle @click="handleDoc(scope.row , 'meeting-record')"></el-button>
@@ -141,7 +145,7 @@
 
     <!-- 添加或修改会议对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="年份" prop="year">
           <el-date-picker clearable
                           v-model="form.year"
@@ -150,8 +154,28 @@
                           placeholder="请选择年份">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="涉及code" prop="questionnaireId">
-          <el-input v-model="form.questionnaireId" placeholder="请输入涉及code" />
+        <!--<el-form-item label="涉及code" prop="questionnaireId">-->
+          <!--<el-input v-model="form.questionnaireId" placeholder="请输入涉及code" />-->
+        <!--</el-form-item>-->
+        <el-form-item label="涉及章节" prop="chapterId" v-if="!form.id">
+          <el-select clearable v-model="form.chapterId" placeholder="请选择涉及章节" filterable @change="handleChapterChange">
+            <el-option
+              v-for="dict in chapterOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="涉及CODE" prop="questionnaireId" v-if="!form.id">
+          <el-select clearable v-model="form.questionnaireId" placeholder="请选择涉及CODE" filterable>
+            <el-option
+              v-for="dict in questionnaireOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="负责人" prop="personInCharge">
           <el-select clearable v-model="form.personInCharge" placeholder="请选择负责人">
@@ -233,7 +257,7 @@
 </template>
 
 <script>
-import { listMeeting, getMeeting, delMeeting, addMeeting, updateMeeting } from "@/api/rc/meeting";
+import { listMeeting, getMeeting, delMeeting, addMeeting, updateMeeting, listChapter, listCode } from "@/api/rc/meeting";
 import { listDept } from "@/api/system/dept";
 import { listAllUser } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
@@ -280,6 +304,8 @@ export default {
       deptOptions: [],
       // 用户列表
       userOptions: [],
+      chapterOptions: [],
+      questionnaireOptions: [],
       // 附件参数
       doc: {
         file: "",
@@ -312,8 +338,19 @@ export default {
     this.getList();
     this.getDeptList();
     this.getUserList();
+    this.getChapterList();
   },
   methods: {
+    handleChapterChange() {
+      listCode(this.form.chapterId).then(response => {
+        let data = response.data;
+        this.questionnaireOptions = [];
+        for (let i = 0; i < data.length; i++) {
+          this.questionnaireOptions.push({"dictLabel": data[i].directory + " - " + data[i].code, "dictValue": data[i].id});
+        }
+        console.log(this.questionnaireOptions)
+      });
+    },
     /** 附件按钮操作 */
     handleDoc(row , type) {
       var typeName = "";
@@ -392,12 +429,20 @@ export default {
     getList() {
       this.loading = true;
       listMeeting(this.queryParams).then(response => {
-        console.log(response)
         this.meetingList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    /** 查询章节列表 */
+    getChapterList() {
+      listChapter().then(response => {
+        let data = response.data;
+        for (let i = 0; i < data.length; i++) {
+          this.chapterOptions.push({"dictLabel": data[i].code + " - " + data[i].name, "dictValue": data[i].id});
+        }
+      });
+    },
     /** 查询装置列表 */
     getDeptList() {
       listDept().then(response => {

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

@@ -11,14 +11,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="涉及code" prop="questionnaireId">
-        <el-input
-          v-model="queryParams.questionnaireId"
-          placeholder="请输入涉及整改code"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <!--<el-form-item label="涉及code" prop="questionnaireId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.questionnaireId"-->
+          <!--placeholder="请输入涉及整改code"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
       <el-form-item label="开项级别" prop="level">
         <el-select v-model="queryParams.level" placeholder="请选择开项级别" clearable>
           <el-option
@@ -165,7 +165,7 @@
       </el-table-column>
       <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="涉及CODE" 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" width="100">
@@ -247,9 +247,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="涉及整改code" prop="questionnaireId">
-          <el-input v-model="form.questionnaireId" placeholder="请输入涉及整改code" />
-        </el-form-item>
+        <!--<el-form-item label="涉及整改code" prop="questionnaireId">-->
+          <!--<el-input v-model="form.questionnaireId" placeholder="请输入涉及整改code" />-->
+        <!--</el-form-item>-->
         <el-form-item label="存在问题描述" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
         </el-form-item>

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

@@ -166,14 +166,14 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
-          <span v-if="scope.row.openitemStatus != '2'">
+          <span v-if="scope.row.openItemStatus != '2'">
             <el-button
               size="mini"
               type="text"
               @click="handleOpenitem(scope.row)"
             >开项</el-button>
           </span>
-          <span v-if="scope.row.openitemStatus == '2'">
+          <span v-if="scope.row.openItemStatus == '2'">
             <el-button
               size="mini"
               type="text"