-fix bug

master/src/main/java/com/ruoyi/project/apply/controller/TApplySafetychangeController.java

@@ -15,7 +15,6 @@ import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.apply.domain.TApplyOfflinevalve;
 import com.ruoyi.project.apply.domain.TApplySafetychange;
 import com.ruoyi.project.apply.service.ITApplySafetychangeService;
 import com.ruoyi.project.approve.damain.DevTask;
@@ -75,6 +74,14 @@ public class TApplySafetychangeController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/listChangeDescribe")
+    public AjaxResult listChangeDescribe(TApplySafetychange tApplySafetychange) {
+        List<TApplySafetychange> list = tApplySafetychangeService.selectTApplySafetychangeList(tApplySafetychange);
+        return AjaxResult.success(list);
+    }
+
+
+
     /**
      * 导出组织保护措施状态变更申请列表
      */

master/src/main/java/com/ruoyi/project/apply/domain/TApplyOfflinevalve.java

@@ -179,6 +179,16 @@ public class TApplyOfflinevalve extends BaseEntity
      */
     private String apNo;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public String getProcessId() {
         return processId;
     }

master/src/main/java/com/ruoyi/project/apply/domain/TApplySafetychange.java

@@ -198,6 +198,16 @@ public class TApplySafetychange extends BaseEntity
      */
     private String apNo;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public String getProcessId() {
         return processId;
     }

master/src/main/java/com/ruoyi/project/apply/mapper/TApplySafetychangeMapper.java

@@ -1,20 +1,21 @@
 package com.ruoyi.project.apply.mapper;
 
-import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.apply.domain.TApplySafetychange;
 
+import java.util.List;
+
 /**
  * 组织保护措施状态变更申请Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-02-09
  */
-public interface TApplySafetychangeMapper 
+public interface TApplySafetychangeMapper
 {
     /**
      * 查询组织保护措施状态变更申请
-     * 
+     *
      * @param id 组织保护措施状态变更申请ID
      * @return 组织保护措施状态变更申请
      */
@@ -22,16 +23,19 @@ public interface TApplySafetychangeMapper
 
     /**
      * 查询组织保护措施状态变更申请列表
-     * 
+     *
      * @param tApplySafetychange 组织保护措施状态变更申请
      * @return 组织保护措施状态变更申请集合
      */
     @DataScope(deptAlias = "d")
     public List<TApplySafetychange> selectTApplySafetychangeList(TApplySafetychange tApplySafetychange);
 
+    @DataScope(deptAlias = "d")
+    public List<TApplySafetychange> selectChangeDescribe(TApplySafetychange tApplySafetychange);
+
     /**
      * 新增组织保护措施状态变更申请
-     * 
+     *
      * @param tApplySafetychange 组织保护措施状态变更申请
      * @return 结果
      */
@@ -39,7 +43,7 @@ public interface TApplySafetychangeMapper
 
     /**
      * 修改组织保护措施状态变更申请
-     * 
+     *
      * @param tApplySafetychange 组织保护措施状态变更申请
      * @return 结果
      */
@@ -47,7 +51,7 @@ public interface TApplySafetychangeMapper
 
     /**
      * 删除组织保护措施状态变更申请
-     * 
+     *
      * @param id 组织保护措施状态变更申请ID
      * @return 结果
      */
@@ -55,7 +59,7 @@ public interface TApplySafetychangeMapper
 
     /**
      * 批量删除组织保护措施状态变更申请
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/apply/service/ITApplySafetychangeService.java

@@ -1,19 +1,20 @@
 package com.ruoyi.project.apply.service;
 
-import java.util.List;
 import com.ruoyi.project.apply.domain.TApplySafetychange;
 
+import java.util.List;
+
 /**
  * 组织保护措施状态变更申请Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-02-09
  */
-public interface ITApplySafetychangeService 
+public interface ITApplySafetychangeService
 {
     /**
      * 查询组织保护措施状态变更申请
-     * 
+     *
      * @param id 组织保护措施状态变更申请ID
      * @return 组织保护措施状态变更申请
      */
@@ -21,15 +22,16 @@ public interface ITApplySafetychangeService
 
     /**
      * 查询组织保护措施状态变更申请列表
-     * 
+     *
      * @param tApplySafetychange 组织保护措施状态变更申请
      * @return 组织保护措施状态变更申请集合
      */
     public List<TApplySafetychange> selectTApplySafetychangeList(TApplySafetychange tApplySafetychange);
+    public List<TApplySafetychange> selectChangeDescribe(TApplySafetychange tApplySafetychange);
 
     /**
      * 新增组织保护措施状态变更申请
-     * 
+     *
      * @param tApplySafetychange 组织保护措施状态变更申请
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface ITApplySafetychangeService
 
     /**
      * 修改组织保护措施状态变更申请
-     * 
+     *
      * @param tApplySafetychange 组织保护措施状态变更申请
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface ITApplySafetychangeService
 
     /**
      * 批量删除组织保护措施状态变更申请
-     * 
+     *
      * @param ids 需要删除的组织保护措施状态变更申请ID
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface ITApplySafetychangeService
 
     /**
      * 删除组织保护措施状态变更申请信息
-     * 
+     *
      * @param id 组织保护措施状态变更申请ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/apply/service/impl/TApplySafetychangeServiceImpl.java

@@ -1,11 +1,12 @@
 package com.ruoyi.project.apply.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.apply.mapper.TApplySafetychangeMapper;
 import com.ruoyi.project.apply.domain.TApplySafetychange;
+import com.ruoyi.project.apply.mapper.TApplySafetychangeMapper;
 import com.ruoyi.project.apply.service.ITApplySafetychangeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 组织保护措施状态变更申请Service业务层处理
@@ -43,6 +44,12 @@ public class TApplySafetychangeServiceImpl implements ITApplySafetychangeService
         return tApplySafetychangeMapper.selectTApplySafetychangeList(tApplySafetychange);
     }
 
+    @Override
+    public List<TApplySafetychange> selectChangeDescribe(TApplySafetychange tApplySafetychange)
+    {
+        return tApplySafetychangeMapper.selectChangeDescribe(tApplySafetychange);
+    }
+
     /**
      * 新增组织保护措施状态变更申请
      *

master/src/main/java/com/ruoyi/project/reliability/controller/TSafetyvavleController.java

@@ -302,6 +302,6 @@ public class TSafetyvavleController extends BaseController
 
     @GetMapping("/allSafetyvavle")
     public AjaxResult allSafetyvavle() {
-        return AjaxResult.success(tSafetyvavleService.selectList(new TSafetyvavle()));
+        return AjaxResult.success(tSafetyvavleService.selectTSafetyvavleList(new TSafetyvavle()));
     }
 }

master/src/main/resources/mybatis/apply/TApplySafetychangeMapper.xml

@@ -103,6 +103,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by createdate desc
     </select>
 
+    <select id="selectChangeDescribe" parameterType="TApplySafetychange" resultMap="TApplySafetychangeResult">
+        <include refid="selectTApplySafetychangeVo"/>
+        <where>
+
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by createdate desc
+    </select>
+
     <select id="selectTApplySafetychangeById" parameterType="Long" resultMap="TApplySafetychangeResult">
         <include refid="selectTApplySafetychangeVo"/>
         where id = #{id}

ui/src/api/apply/safetychange.js

@@ -8,6 +8,13 @@ export function listSafetychange(query) {
     params: query
   })
 }
+export function listChangeDescribe(query) {
+  return request({
+    url: '/apply/safetychange//listChangeDescribe',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询组织保护措施状态变更申请详细
 export function getSafetychange(id) {

ui/src/views/apply/safetychange/index.vue

@@ -409,6 +409,7 @@ export default {
       labelStyle: {'width': '200px'},
       executorList: [],
       safaerList: [],
+      changeDescribeList: [],
       statusFlag: '',
       approveStatusFlag: '',
       status: {0: "未完成", 1: "已完成"},