diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
index 844f455e..216b2f90 100644
--- a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
@@ -16,10 +16,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门名称" prop="deptName">
+      <el-form-item label="总包单位" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
+          placeholder="请输入总包单位名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -134,7 +134,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
+      <el-table-column label="总包单位" align="center" prop="deptName" />
       <el-table-column label="保险类型" align="center" prop="insuranceTypeName" />
       <el-table-column label="保险状态" align="center" prop="insuranceState">
         <template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
index 789a0a67..5a6c62d6 100644
--- a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
@@ -16,6 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="总包单位" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入总包单位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="人员姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -211,6 +219,18 @@
             ></el-image>
           </template>
         </el-table-column>
+        <el-table-column
+            label="提交时间"
+            align="center"
+            prop="createTime"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                parseTime(scope.row.createTime, "{y}-{m}-{d}")
+              }}</span>
+            </template>
+          </el-table-column>
         <el-table-column
           label="备注"
           align="center"
diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue b/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
index 2123d167..268e2b01 100644
--- a/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
@@ -168,6 +168,18 @@
               ></el-image>
             </template>
           </el-table-column>
+          <el-table-column
+            label="提交时间"
+            align="center"
+            prop="createTime"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                parseTime(scope.row.createTime, "{y}-{m}-{d}")
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             label="操作"
             align="center"
@@ -277,9 +289,6 @@
               v-model="files"
             />
           </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注" />
-          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index d29a67d1..ed659171 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -16,6 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="总包单位" prop="trainNatureName">
+        <el-input
+          v-model="queryParams.trainNatureName"
+          placeholder="请输入总包单位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="演练类型" prop="dataType">
         <el-select
           v-model="queryParams.dataType"
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index 866dbdf9..f50054dd 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -16,6 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="总包单位" prop="trainNatureName">
+        <el-input
+          v-model="queryParams.trainNatureName"
+          placeholder="请输入总包单位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="培训类型" prop="dataType">
         <el-select
           v-model="queryParams.dataType"
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
index 2923fd52..f4b53d25 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
@@ -178,12 +178,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND azx.insurance_type = 2 and azx.is_del=0
         LEFT JOIN sur_project_insurance yqx ON yqx.project_id = sp.id
         AND yqx.insurance_type = 1 and yqx.is_del=0
-        where sp.isDel=0 and sp.isDel=0 and sp.progressVisible=0
+        where sp.isDel=0
         <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
         <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="projectId != null "> and sp.id = #{projectId}</if>
         <if test="prjIds !=null and prjIds.size()>0">
-            and sp.id  in
+            and sp.id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml
index 5b33cb01..a4f1b2b8 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml
@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
             <if test="name != null  and name != ''"> and spwp.name like concat('%', #{name}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="isCredential != null  and isCredential != ''"> and spwp.is_credential = #{isCredential}</if>
             <if test="phoneNumber != null  and phoneNumber != ''"> and spwp.phone_number like concat('%', #{phoneNumber}, '%')</if>
             <if test="credentialNumber != null  and credentialNumber != ''"> and spwp.credential_number like concat('%', #{credentialNumber}, '%')</if>
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
index e71572b1..03020caf 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
         <if test="deptId != null"> left join work_train_dept wtd2 on wtd2.train_id = wt.id and wtd2.is_main ='Y'</if>
         <where>
-            and sp.isDel=0 and sp.progressVisible=0
+            and sp.isDel=0
             <if test="proType != null  and proType != ''"> and sp.projectType = #{proType}</if>
             <if test="projectId != null"> and wt.project_id = #{projectId}</if>
             <if test="deptId != null"> and wtd2.dept_id = #{deptId}</if>
@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainType != null  and trainType != ''"> and train_type = #{trainType}</if>
             <if test="trainTitle != null  and trainTitle != ''"> and train_title like concat('%', #{trainTitle}, '%')</if>
             <if test="trainNature != null  and trainNature != ''"> and wt.train_nature = #{trainNature}</if>
+            <if test="trainNatureName != null  and trainNatureName != ''"> and wtd.is_main = 'Y' and sd.dept_name like concat('%', #{trainNatureName}, '%')</if>
             <if test="isDel != null "> and wt.is_del = #{isDel}</if>
             <if test="params.beginMarksTime != null and params.beginMarksTime != '' and params.endMarksTime != null and params.endMarksTime != ''"> and wt.begin_date between #{params.beginMarksTime} and #{params.endMarksTime}</if>
             <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and wt.create_time between #{params.beginTime} and #{params.endTime}</if>
@@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 select gr.train_nature as gr_type ,max(gr.id) as maxid from work_train gr
                 left join sur_project sp on sp.id = gr.project_id
                 <where>
-                    and gr.is_del=0  and sp.isDel=0 and sp.progressVisible=0
+                    and gr.is_del=0 and sp.isDel=0
                     <if test="deptId != null"> and sp.deptId = #{deptId}</if>
                     <if test="trainType != null  and trainType != ''"> and gr.train_type = #{trainType}</if>
                 </where>
@@ -111,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test='trainType != null  and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
         <if test='trainType != null  and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
         where
-             wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0
+             wt.is_del=0 and sp.isDel=0
             <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
             <if test="trainType != null and trainType != ''"> and wt.train_type = #{trainType}</if>
             <if test="projectId != null"> and wt.project_id = #{projectId}</if>
@@ -271,7 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              (
                  SELECT COUNT(1) cnt,data_type
                  FROM work_train wt left join sur_project sp on sp.id = wt.project_id
-                 where sp.isDel=0 and sp.progressVisible=0
+                 where sp.isDel=0
                 <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
                 <if test="projectId != null"> and sp.id = #{projectId}</if>
                 <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@@ -294,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test='trainType != null  and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
         <if test='trainType != null  and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
         where
-            wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0
+            wt.is_del=0 and sp.isDel=0
             <if test="dataType != null and dataType != 0 "> and wt.data_type = #{dataType}</if>
             <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
             <if test="trainType != null  and trainType != ''"> and wt.train_type = #{trainType}</if>