diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJzxzkhshController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
similarity index 58%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJzxzkhshController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
index 9023346e5..e45ffcf54 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJzxzkhshController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
@@ -16,8 +16,8 @@ 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.jxzxkhgl.domain.TsbzJzxzkhsh;
-import com.ruoyi.jxzxkhgl.service.ITsbzJzxzkhshService;
+import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhsh;
+import com.ruoyi.jxzxkhgl.service.ITsbzJxzxkhshService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -28,70 +28,70 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2020-08-29
  */
 @RestController
-@RequestMapping("/jxzxkhgl/jzxzkhsh")
-public class TsbzJzxzkhshController extends BaseController {
+@RequestMapping("/jxzxkhgl/jxzxkhsh")
+public class TsbzJxzxkhshController extends BaseController {
     @Autowired
-    private ITsbzJzxzkhshService tsbzJzxzkhshService;
+    private ITsbzJxzxkhshService tsbzJxzxkhshService;
 
     /**
      * 查询考核审核过程列表
      */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jzxzkhsh:list')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TsbzJzxzkhsh tsbzJzxzkhsh) {
+    public TableDataInfo list(TsbzJxzxkhsh tsbzJxzxkhsh) {
         startPage();
-        List<TsbzJzxzkhsh> list = tsbzJzxzkhshService.selectTsbzJzxzkhshList(tsbzJzxzkhsh);
+        List<TsbzJxzxkhsh> list = tsbzJxzxkhshService.selectTsbzJzxzkhshList(tsbzJxzxkhsh);
         return getDataTable(list);
     }
 
     /**
      * 导出考核审核过程列表
      */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jzxzkhsh:export')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:export')")
     @Log(title = "考核审核过程", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TsbzJzxzkhsh tsbzJzxzkhsh) {
-        List<TsbzJzxzkhsh> list = tsbzJzxzkhshService.selectTsbzJzxzkhshList(tsbzJzxzkhsh);
-        ExcelUtil<TsbzJzxzkhsh> util = new ExcelUtil<TsbzJzxzkhsh>(TsbzJzxzkhsh.class);
-        return util.exportExcel(list, "jzxzkhsh");
+    public AjaxResult export(TsbzJxzxkhsh tsbzJxzxkhsh) {
+        List<TsbzJxzxkhsh> list = tsbzJxzxkhshService.selectTsbzJzxzkhshList(tsbzJxzxkhsh);
+        ExcelUtil<TsbzJxzxkhsh> util = new ExcelUtil<TsbzJxzxkhsh>(TsbzJxzxkhsh.class);
+        return util.exportExcel(list, "jxzxkhsh");
     }
 
     /**
      * 获取考核审核过程详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jzxzkhsh:query')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tsbzJzxzkhshService.selectTsbzJzxzkhshById(id));
+        return AjaxResult.success(tsbzJxzxkhshService.selectTsbzJzxzkhshById(id));
     }
 
     /**
      * 新增考核审核过程
      */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jzxzkhsh:add')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:add')")
     @Log(title = "考核审核过程", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TsbzJzxzkhsh tsbzJzxzkhsh) {
-        return toAjax(tsbzJzxzkhshService.insertTsbzJzxzkhsh(tsbzJzxzkhsh));
+    public AjaxResult add(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) {
+        return toAjax(tsbzJxzxkhshService.insertTsbzJzxzkhsh(tsbzJxzxkhsh));
     }
 
     /**
      * 修改考核审核过程
      */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jzxzkhsh:edit')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:edit')")
     @Log(title = "考核审核过程", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TsbzJzxzkhsh tsbzJzxzkhsh) {
-        return toAjax(tsbzJzxzkhshService.updateTsbzJzxzkhsh(tsbzJzxzkhsh));
+    public AjaxResult edit(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) {
+        return toAjax(tsbzJxzxkhshService.updateTsbzJzxzkhsh(tsbzJxzxkhsh));
     }
 
     /**
      * 删除考核审核过程
      */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jzxzkhsh:remove')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:remove')")
     @Log(title = "考核审核过程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(tsbzJzxzkhshService.deleteTsbzJzxzkhshByIds(ids));
+        return toAjax(tsbzJxzxkhshService.deleteTsbzJzxzkhshByIds(ids));
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJzxzkhsh.java b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJxzxkhsh.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJzxzkhsh.java
rename to ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJxzxkhsh.java
index 71c112ca3..b810285cd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJzxzkhsh.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJxzxkhsh.java
@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2020-08-29
  */
-public class TsbzJzxzkhsh extends BaseEntity {
+public class TsbzJxzxkhsh extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJzxzkhshMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJxzxkhshMapper.java
similarity index 64%
rename from ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJzxzkhshMapper.java
rename to ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJxzxkhshMapper.java
index fd8d2a25f..bb4e73548 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJzxzkhshMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJxzxkhshMapper.java
@@ -2,7 +2,7 @@ package com.ruoyi.jxzxkhgl.mapper;
 
 import java.util.List;
 
-import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
+import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhsh;
 
 /**
  * 考核审核过程Mapper接口
@@ -10,38 +10,38 @@ import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
  * @author ruoyi
  * @date 2020-08-29
  */
-public interface TsbzJzxzkhshMapper {
+public interface TsbzJxzxkhshMapper {
     /**
      * 查询考核审核过程
      *
      * @param id 考核审核过程ID
      * @return 考核审核过程
      */
-    public TsbzJzxzkhsh selectTsbzJzxzkhshById(Long id);
+    public TsbzJxzxkhsh selectTsbzJzxzkhshById(Long id);
 
     /**
      * 查询考核审核过程列表
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 考核审核过程集合
      */
-    public List<TsbzJzxzkhsh> selectTsbzJzxzkhshList(TsbzJzxzkhsh tsbzJzxzkhsh);
+    public List<TsbzJxzxkhsh> selectTsbzJzxzkhshList(TsbzJxzxkhsh tsbzJxzxkhsh);
 
     /**
      * 新增考核审核过程
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 结果
      */
-    public int insertTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
+    public int insertTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
 
     /**
      * 修改考核审核过程
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 结果
      */
-    public int updateTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
+    public int updateTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
 
     /**
      * 删除考核审核过程
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJzxzkhshService.java b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJxzxkhshService.java
similarity index 64%
rename from ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJzxzkhshService.java
rename to ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJxzxkhshService.java
index fd21afad9..ee5b1d497 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJzxzkhshService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJxzxkhshService.java
@@ -2,7 +2,7 @@ package com.ruoyi.jxzxkhgl.service;
 
 import java.util.List;
 
-import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
+import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhsh;
 
 /**
  * 考核审核过程Service接口
@@ -10,38 +10,38 @@ import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
  * @author ruoyi
  * @date 2020-08-29
  */
-public interface ITsbzJzxzkhshService {
+public interface ITsbzJxzxkhshService {
     /**
      * 查询考核审核过程
      *
      * @param id 考核审核过程ID
      * @return 考核审核过程
      */
-    public TsbzJzxzkhsh selectTsbzJzxzkhshById(Long id);
+    public TsbzJxzxkhsh selectTsbzJzxzkhshById(Long id);
 
     /**
      * 查询考核审核过程列表
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 考核审核过程集合
      */
-    public List<TsbzJzxzkhsh> selectTsbzJzxzkhshList(TsbzJzxzkhsh tsbzJzxzkhsh);
+    public List<TsbzJxzxkhsh> selectTsbzJzxzkhshList(TsbzJxzxkhsh tsbzJxzxkhsh);
 
     /**
      * 新增考核审核过程
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 结果
      */
-    public int insertTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
+    public int insertTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
 
     /**
      * 修改考核审核过程
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 结果
      */
-    public int updateTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
+    public int updateTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
 
     /**
      * 批量删除考核审核过程
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJzxzkhshServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJxzxkhshServiceImpl.java
similarity index 51%
rename from ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJzxzkhshServiceImpl.java
rename to ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJxzxkhshServiceImpl.java
index 055011745..27222e1bb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJzxzkhshServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJxzxkhshServiceImpl.java
@@ -5,9 +5,9 @@ import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.jxzxkhgl.mapper.TsbzJzxzkhshMapper;
-import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
-import com.ruoyi.jxzxkhgl.service.ITsbzJzxzkhshService;
+import com.ruoyi.jxzxkhgl.mapper.TsbzJxzxkhshMapper;
+import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhsh;
+import com.ruoyi.jxzxkhgl.service.ITsbzJxzxkhshService;
 
 /**
  * 考核审核过程Service业务层处理
@@ -16,9 +16,9 @@ import com.ruoyi.jxzxkhgl.service.ITsbzJzxzkhshService;
  * @date 2020-08-29
  */
 @Service
-public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
+public class TsbzJxzxkhshServiceImpl implements ITsbzJxzxkhshService {
     @Autowired
-    private TsbzJzxzkhshMapper tsbzJzxzkhshMapper;
+    private TsbzJxzxkhshMapper tsbzJxzxkhshMapper;
 
     /**
      * 查询考核审核过程
@@ -27,42 +27,42 @@ public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
      * @return 考核审核过程
      */
     @Override
-    public TsbzJzxzkhsh selectTsbzJzxzkhshById(Long id) {
-        return tsbzJzxzkhshMapper.selectTsbzJzxzkhshById(id);
+    public TsbzJxzxkhsh selectTsbzJzxzkhshById(Long id) {
+        return tsbzJxzxkhshMapper.selectTsbzJzxzkhshById(id);
     }
 
     /**
      * 查询考核审核过程列表
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 考核审核过程
      */
     @Override
-    public List<TsbzJzxzkhsh> selectTsbzJzxzkhshList(TsbzJzxzkhsh tsbzJzxzkhsh) {
-        return tsbzJzxzkhshMapper.selectTsbzJzxzkhshList(tsbzJzxzkhsh);
+    public List<TsbzJxzxkhsh> selectTsbzJzxzkhshList(TsbzJxzxkhsh tsbzJxzxkhsh) {
+        return tsbzJxzxkhshMapper.selectTsbzJzxzkhshList(tsbzJxzxkhsh);
     }
 
     /**
      * 新增考核审核过程
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 结果
      */
     @Override
-    public int insertTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh) {
-        tsbzJzxzkhsh.setCreateTime(DateUtils.getNowDate());
-        return tsbzJzxzkhshMapper.insertTsbzJzxzkhsh(tsbzJzxzkhsh);
+    public int insertTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh) {
+        tsbzJxzxkhsh.setCreateTime(DateUtils.getNowDate());
+        return tsbzJxzxkhshMapper.insertTsbzJzxzkhsh(tsbzJxzxkhsh);
     }
 
     /**
      * 修改考核审核过程
      *
-     * @param tsbzJzxzkhsh 考核审核过程
+     * @param tsbzJxzxkhsh 考核审核过程
      * @return 结果
      */
     @Override
-    public int updateTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh) {
-        return tsbzJzxzkhshMapper.updateTsbzJzxzkhsh(tsbzJzxzkhsh);
+    public int updateTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh) {
+        return tsbzJxzxkhshMapper.updateTsbzJzxzkhsh(tsbzJxzxkhsh);
     }
 
     /**
@@ -73,7 +73,7 @@ public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
      */
     @Override
     public int deleteTsbzJzxzkhshByIds(Long[] ids) {
-        return tsbzJzxzkhshMapper.deleteTsbzJzxzkhshByIds(ids);
+        return tsbzJxzxkhshMapper.deleteTsbzJzxzkhshByIds(ids);
     }
 
     /**
@@ -84,6 +84,6 @@ public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
      */
     @Override
     public int deleteTsbzJzxzkhshById(Long id) {
-        return tsbzJzxzkhshMapper.deleteTsbzJzxzkhshById(id);
+        return tsbzJxzxkhshMapper.deleteTsbzJzxzkhshById(id);
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJzxzkhshMapper.xml b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
similarity index 63%
rename from ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJzxzkhshMapper.xml
rename to ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
index 1bdc64e63..01b60b50a 100644
--- a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJzxzkhshMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.jxzxkhgl.mapper.TsbzJzxzkhshMapper">
+<mapper namespace="com.ruoyi.jxzxkhgl.mapper.TsbzJxzxkhshMapper">
 
-    <resultMap type="TsbzJzxzkhsh" id="TsbzJzxzkhshResult">
+    <resultMap type="TsbzJxzxkhsh" id="TsbzJxzxkhshResult">
         <result property="id" column="id"/>
         <result property="faid" column="faid"/>
         <result property="jsid" column="jsid"/>
@@ -19,33 +19,36 @@
         <result property="createTime" column="create_time"/>
     </resultMap>
 
-    <sql id="selectTsbzJzxzkhshVo">
-        select id, faid, jsid, status, xjshr, xjshyj, xjshjy, qjshr, qjshyj, qjshjy, createuseird, create_time from tsbz_jzxzkhsh
+    <sql id="selectTsbzJxzxkhshVo">
+        select d.* from tsbz_jxzxmd a
+left join tsbz_jxjsjbxx b on b.id=a.jsid
+left join sys_dept c on b.prdwid=c.schoolid
+left join tsbz_jxzxkhsh d on a.jsid=d.jsid
     </sql>
 
-    <select id="selectTsbzJzxzkhshList" parameterType="TsbzJzxzkhsh" resultMap="TsbzJzxzkhshResult">
-        <include refid="selectTsbzJzxzkhshVo"/>
+    <select id="selectTsbzJxzxkhshList" parameterType="TsbzJxzxkhsh" resultMap="TsbzJxzxkhshResult">
+        <include refid="selectTsbzJxzxkhshVo"/>
         <where>
-            <if test="faid != null ">and faid = #{faid}</if>
-            <if test="jsid != null ">and jsid = #{jsid}</if>
-            <if test="status != null  and status != ''">and status = #{status}</if>
-            <if test="xjshr != null ">and xjshr = #{xjshr}</if>
-            <if test="xjshyj != null  and xjshyj != ''">and xjshyj = #{xjshyj}</if>
-            <if test="xjshjy != null  and xjshjy != ''">and xjshjy = #{xjshjy}</if>
-            <if test="qjshr != null ">and qjshr = #{qjshr}</if>
-            <if test="qjshyj != null  and qjshyj != ''">and qjshyj = #{qjshyj}</if>
-            <if test="qjshjy != null  and qjshjy != ''">and qjshjy = #{qjshjy}</if>
-            <if test="createuseird != null ">and createuseird = #{createuseird}</if>
+            <if test="faid != null ">and d.faid = #{faid}</if>
+            <if test="jsid != null ">and d.jsid = #{jsid}</if>
+            <if test="status != null  and status != ''">and d.status = #{status}</if>
+            <if test="xjshr != null ">and d.xjshr = #{xjshr}</if>
+            <if test="xjshyj != null  and xjshyj != ''">and d.xjshyj = #{xjshyj}</if>
+            <if test="xjshjy != null  and xjshjy != ''">and d.xjshjy = #{xjshjy}</if>
+            <if test="qjshr != null ">and d.qjshr = #{qjshr}</if>
+            <if test="qjshyj != null  and qjshyj != ''">and d.qjshyj = #{qjshyj}</if>
+            <if test="qjshjy != null  and qjshjy != ''">and d.qjshjy = #{qjshjy}</if>
+            <if test="createuseird != null ">and d.createuseird = #{createuseird}</if>
         </where>
     </select>
 
-    <select id="selectTsbzJzxzkhshById" parameterType="Long" resultMap="TsbzJzxzkhshResult">
-        <include refid="selectTsbzJzxzkhshVo"/>
-        where id = #{id}
+    <select id="selectTsbzJxzxkhshById" parameterType="Long" resultMap="TsbzJxzxkhshResult">
+        <include refid="selectTsbzJxzxkhshVo"/>
+        where d.id = #{id}
     </select>
 
-    <insert id="insertTsbzJzxzkhsh" parameterType="TsbzJzxzkhsh" useGeneratedKeys="true" keyProperty="id">
-        insert into tsbz_jzxzkhsh
+    <insert id="insertTsbzJxzxkhsh" parameterType="TsbzJxzxkhsh" useGeneratedKeys="true" keyProperty="id">
+        insert into tsbz_jxzxkhsh
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="faid != null">faid,</if>
             <if test="jsid != null">jsid,</if>
@@ -74,8 +77,8 @@
         </trim>
     </insert>
 
-    <update id="updateTsbzJzxzkhsh" parameterType="TsbzJzxzkhsh">
-        update tsbz_jzxzkhsh
+    <update id="updateTsbzJxzxkhsh" parameterType="TsbzJxzxkhsh">
+        update tsbz_jxzxkhsh
         <trim prefix="SET" suffixOverrides=",">
             <if test="faid != null">faid = #{faid},</if>
             <if test="jsid != null">jsid = #{jsid},</if>
@@ -92,12 +95,12 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteTsbzJzxzkhshById" parameterType="Long">
-        delete from tsbz_jzxzkhsh where id = #{id}
+    <delete id="deleteTsbzJxzxkhshById" parameterType="Long">
+        delete from tsbz_jxzxkhsh where id = #{id}
     </delete>
 
-    <delete id="deleteTsbzJzxzkhshByIds" parameterType="String">
-        delete from tsbz_jzxzkhsh where id in
+    <delete id="deleteTsbzJxzxkhshByIds" parameterType="String">
+        delete from tsbz_jxzxkhsh where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/ruoyi-ui/src/api/jxzxkhgl/jzxzkhsh.js b/ruoyi-ui/src/api/jxzxkhgl/jxzxkhsh.js
similarity index 78%
rename from ruoyi-ui/src/api/jxzxkhgl/jzxzkhsh.js
rename to ruoyi-ui/src/api/jxzxkhgl/jxzxkhsh.js
index 7c7f24c9d..2e3759238 100644
--- a/ruoyi-ui/src/api/jxzxkhgl/jzxzkhsh.js
+++ b/ruoyi-ui/src/api/jxzxkhgl/jxzxkhsh.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询考核审核过程列表
 export function listJzxzkhsh(query) {
     return request({
-        url: '/jxzxkhgl/jzxzkhsh/list',
+        url: '/jxzxkhgl/jxzxkhsh/list',
         method: 'get',
         params: query
     })
@@ -12,7 +12,7 @@ export function listJzxzkhsh(query) {
 // 查询考核审核过程详细
 export function getJzxzkhsh(id) {
     return request({
-        url: '/jxzxkhgl/jzxzkhsh/' + id,
+        url: '/jxzxkhgl/jxzxkhsh/' + id,
         method: 'get'
     })
 }
@@ -20,7 +20,7 @@ export function getJzxzkhsh(id) {
 // 新增考核审核过程
 export function addJzxzkhsh(data) {
     return request({
-        url: '/jxzxkhgl/jzxzkhsh',
+        url: '/jxzxkhgl/jxzxkhsh',
         method: 'post',
         data: data
     })
@@ -29,7 +29,7 @@ export function addJzxzkhsh(data) {
 // 修改考核审核过程
 export function updateJzxzkhsh(data) {
     return request({
-        url: '/jxzxkhgl/jzxzkhsh',
+        url: '/jxzxkhgl/jxzxkhsh',
         method: 'put',
         data: data
     })
@@ -38,7 +38,7 @@ export function updateJzxzkhsh(data) {
 // 删除考核审核过程
 export function delJzxzkhsh(id) {
     return request({
-        url: '/jxzxkhgl/jzxzkhsh/' + id,
+        url: '/jxzxkhgl/jxzxkhsh/' + id,
         method: 'delete'
     })
 }
@@ -46,7 +46,7 @@ export function delJzxzkhsh(id) {
 // 导出考核审核过程
 export function exportJzxzkhsh(query) {
     return request({
-        url: '/jxzxkhgl/jzxzkhsh/export',
+        url: '/jxzxkhgl/jxzxkhsh/export',
         method: 'get',
         params: query
     })
diff --git a/ruoyi-ui/src/views/jxzxkhgl/jzxzkhsh/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
similarity index 97%
rename from ruoyi-ui/src/views/jxzxkhgl/jzxzkhsh/index.vue
rename to ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
index 8203e2065..bcb7683d0 100644
--- a/ruoyi-ui/src/views/jxzxkhgl/jzxzkhsh/index.vue
+++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
@@ -89,7 +89,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:add']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -99,7 +99,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:edit']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -109,7 +109,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:remove']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -118,7 +118,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:export']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:export']"
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -144,14 +144,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['jxzxkhgl:jzxzkhsh:edit']"
+            v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['jxzxkhgl:jzxzkhsh:remove']"
+            v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -229,7 +229,7 @@
 </template>
 
 <script>
-import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jzxzkhsh";
+import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jxzxkhsh";
 
 export default {
   name: "Jzxzkhsh",
diff --git a/ruoyi-ui/src/views/jxzxkhgl/jzxzqjsh/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
similarity index 97%
rename from ruoyi-ui/src/views/jxzxkhgl/jzxzqjsh/index.vue
rename to ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
index 8203e2065..bcb7683d0 100644
--- a/ruoyi-ui/src/views/jxzxkhgl/jzxzqjsh/index.vue
+++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
@@ -89,7 +89,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:add']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -99,7 +99,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:edit']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -109,7 +109,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:remove']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -118,7 +118,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['jxzxkhgl:jzxzkhsh:export']"
+          v-hasPermi="['jxzxkhgl:jxzxkhsh:export']"
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -144,14 +144,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['jxzxkhgl:jzxzkhsh:edit']"
+            v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['jxzxkhgl:jzxzkhsh:remove']"
+            v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -229,7 +229,7 @@
 </template>
 
 <script>
-import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jzxzkhsh";
+import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jxzxkhsh";
 
 export default {
   name: "Jzxzkhsh",