diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
index 58a4bc6f..3ef59ad8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -53,6 +53,9 @@ public @interface Excel
      */
     public int scale() default -1;
 
+    public boolean isLink() default false;
+
+    public String linkText() default "";
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 12a63688..235a4dae 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -27,45 +27,15 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
-import org.apache.poi.hssf.usermodel.HSSFPictureData;
-import org.apache.poi.hssf.usermodel.HSSFShape;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.common.usermodel.HyperlinkType;
+import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFPicture;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.xssf.usermodel.*;
 import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1016,6 +986,7 @@ public class ExcelUtil<T>
             {
                 // 创建cell
                 cell = row.createCell(column);
+
                 if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
                 {
                     CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
@@ -1059,7 +1030,20 @@ public class ExcelUtil<T>
                     // 设置列类型
                     setCellVo(value, attr, cell);
                 }
+                if(attr.isLink()){
+                    CreationHelper createHelper= row.getSheet().getWorkbook().getCreationHelper();
+                    XSSFHyperlink link = (XSSFHyperlink) createHelper.createHyperlink(HyperlinkType.URL);
+                    link.setAddress((String) value);
+                    cell.setHyperlink(link);
+                    if( StringUtils.isNotEmpty (attr.linkText())){
+                        cell.setCellValue(attr.linkText());
+                    }else{
+                        cell.setCellValue(value.toString());
+                    }
+
+                }
                 addStatisticsData(column, Convert.toStr(value), attr);
+
             }
         }
         catch (Exception e)
diff --git a/ruoyi-ui/src/api/trouble/sspProblemmodify.js b/ruoyi-ui/src/api/trouble/sspProblemmodify.js
index 6b578e63..0a65cfa6 100644
--- a/ruoyi-ui/src/api/trouble/sspProblemmodify.js
+++ b/ruoyi-ui/src/api/trouble/sspProblemmodify.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 查询质量整改列表
-export function listSspProblemmodify(query) {
+export function listSspProblemmodify(query) {  
   return request({
     url: '/trouble/sspProblemmodify/list',
     method: 'get',
@@ -10,7 +10,7 @@ export function listSspProblemmodify(query) {
 }
 
 // 查询质量整改统计
-export function findGroupCount(query) {
+export function findGroupCount(query) {  
   return request({
     url: '/trouble/sspProblemmodify/findGroupCount',
     method: 'get',
diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue
index 4eac72d0..385bbca8 100644
--- a/ruoyi-ui/src/views/project/surProject/index.vue
+++ b/ruoyi-ui/src/views/project/surProject/index.vue
@@ -613,16 +613,6 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="总投资" prop="totalInvestment">
-              <el-input v-model="form.totalInvestment" placeholder="请输入总投资">
-                <i slot="suffix">万元</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="8">
             <el-form-item label="建筑面积" prop="floorArea">
               <el-input v-model="form.floorArea" placeholder="请输入建筑面积">
@@ -630,13 +620,11 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="开累产值" prop="totalOutputValue">
-              <el-input v-model="form.totalOutputValue" placeholder="请输入开累产值">
-                <i slot="suffix">万元</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
+        </el-row>
+
+        <el-row>
+         
+         
           <el-col :span="8">
             <el-form-item label="计划完成时间" prop="plannedCompletionTime">
               <el-date-picker
@@ -648,8 +636,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="计划开工时间" prop="scheduledStartTime">
               <el-date-picker
@@ -670,6 +656,10 @@
               >
               </el-date-picker> </el-form-item
           ></el-col>
+        </el-row>
+        <el-row>
+          
+         
           <el-col :span="8"
             ><el-form-item label="实际完工时间" prop="actualCompletionTime">
               <el-date-picker
@@ -680,31 +670,6 @@
               >
               </el-date-picker> </el-form-item
           ></el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8"
-            ><el-form-item label="合同总额" prop="contractAmount">
-              <el-input v-model="form.contractAmount" placeholder="请输入合同总额">
-                <i slot="suffix">万元</i>
-              </el-input>
-            </el-form-item></el-col
-          >
-          <el-col :span="8">
-            <el-form-item label="付款金额" prop="paidAmount">
-              <el-input v-model="form.paidAmount" placeholder="请输入付款金额">
-                <i slot="suffix">万元</i>
-              </el-input>
-            </el-form-item></el-col
-          >
-          <el-col :span="8">
-            <el-form-item label="挂账金额" prop="onAccountAmount">
-              <el-input v-model="form.onAccountAmount" placeholder="请输入挂账金额">
-                <i slot="suffix">万元</i>
-              </el-input>
-            </el-form-item></el-col
-          >
-        </el-row>
-        <el-row>
           <el-col :span="8"
             ><el-form-item label="形象进度" prop="projectSchedule">
               <el-select
@@ -721,23 +686,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="重要等级" prop="weightType">
-              <el-select
-                v-model="form.weightType"
-                placeholder="请选择重要等级"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="dict in dict.type.sur_project_weight"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select> </el-form-item
-          ></el-col>
-          <el-col :span="8"></el-col>
-        </el-row>
+
+        </el-row>        
         <!-- <el-row>
           <el-col :span="8"
             ><el-form-item label="劳务人员数" prop="servicePersonnel">
diff --git a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
index 14d8039e..e37138d8 100644
--- a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
+++ b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
@@ -16,13 +16,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="提交用户" prop="createUser">
-        <el-input
-          v-model="queryParams.createUser"
-          placeholder="请输入提交用户手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="分类" prop="createUser">
+        <el-select v-model="queryParams.roleTypes" multiple placeholder="请选择分类" clearable collapse-tags>
+          <el-option
+            v-for="dict in roleTypeOpts"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="隐患描述" prop="workParts">
         <el-input
@@ -76,6 +78,7 @@
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button   icon="el-icon-download" size="mini" v-hasPermi="['trouble:sspProblemmodify:export']" @click="handleExport">导出</el-button>
       </el-form-item>
     </el-form>
 
@@ -464,7 +467,8 @@ export default {
         createUser: null,
         createTime: null,
         updateUser: null,
-        updateTime: null,
+        updateTime: null, 
+        roleTypes:[],       
         projectDeptId: null,
       },
       depts: null,
@@ -485,6 +489,13 @@ export default {
         ycl: "整改完成（0）",
         zgcs: "整改超时（0）",
       },
+      roleTypeOpts:[
+      {label:'集团',value:3}
+      ,{label:'子公司',value:4}
+      ,{label:'甲方代表',value:5}
+      ,{label:'监理单位',value:6}
+      ,{label:'总包单位',value:7}]
+      
     };
   },
   created() {
@@ -526,14 +537,15 @@ export default {
         if (response && response.data) {
           let sum = 0;
           this.tabs.dzg = "待整改（0）";
-          if (response.data.check0) {
-            sum += response.data.check0;
-            this.tabs.dzg = "待整改（" + response.data.check0 + "）";
+          let chk03=(response.data.check0)+(response.data.check3)
+          if (chk03) {
+            sum += chk03;
+            this.tabs.dzg = "待整改（" + chk03 + "）";
           }
           this.tabs.dqr = "待复检（0）";
           if (response.data.check1) {
             sum += response.data.check1;
-            this.tabs.dqr = "待复检（" + response.data.check1 + "）";
+            this.tabs.dqr = "待复检（" + response.data.check1+ "）";
           }
           this.tabs.ycl = "整改完成（0）";
           if (response.data.check4) {
@@ -596,6 +608,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.roleTypes=[];
       this.daterangeMarksTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
@@ -672,7 +685,7 @@ export default {
         {
           ...this.queryParams,
         },
-        `sspProblemmodify_${new Date().getTime()}.xlsx`
+        `安全整改_${new Date().getTime()}.xlsx`
       );
     },
   },
diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
index e07ac1e9..ccd0856a 100644
--- a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
+++ b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
@@ -16,13 +16,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="提交用户" prop="createUser">
-        <el-input
-          v-model="queryParams.createUser"
-          placeholder="请输入提交用户手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="分类" prop="createUser">
+        <el-select v-model="queryParams.roleTypes" multiple placeholder="请选择分类" clearable collapse-tags>
+          <el-option
+            v-for="dict in roleTypeOpts"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="隐患描述" prop="workParts">
         <el-input
@@ -76,6 +78,7 @@
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button   icon="el-icon-download" size="mini" v-hasPermi="['trouble:sspProblemmodify:export']" @click="handleExport">导出</el-button>
       </el-form-item>
     </el-form>
 
@@ -459,6 +462,7 @@ export default {
         createTime: null,
         updateUser: null,
         updateTime: null,
+        roleTypes:[],     
         projectDeptId: null,
       },
       depts: null,
@@ -479,6 +483,12 @@ export default {
         ycl: "整改完成（0）",
         zgcs: "整改超时（0）",
       },
+      roleTypeOpts:[
+      {label:'集团',value:3}
+      ,{label:'子公司',value:4}
+      ,{label:'甲方代表',value:5}
+      ,{label:'监理单位',value:6}
+      ,{label:'总包单位',value:7}]
     };
   },
   created() {
@@ -520,9 +530,10 @@ export default {
         if (response && response.data) {
           let sum = 0;
           this.tabs.dzg = "待整改（0）";
-          if (response.data.check0) {
-            sum += response.data.check0;
-            this.tabs.dzg = "待整改（" + response.data.check0 + "）";
+          let chk03=(response.data.check0)+(response.data.check3)
+          if (chk03) {
+            sum += chk03;
+            this.tabs.dzg = "待整改（" + chk03 + "）";
           }
           this.tabs.dqr = "待复检（0）";
           if (response.data.check1) {
@@ -579,7 +590,7 @@ export default {
         createUser: null,
         createTime: null,
         updateUser: null,
-        updateTime: null,
+        updateTime: null, 
       };
       this.resetForm("form");
     },
@@ -590,6 +601,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.roleTypes=[];
       this.daterangeMarksTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
@@ -666,7 +678,7 @@ export default {
         {
           ...this.queryParams,
         },
-        `sspProblemmodify_${new Date().getTime()}.xlsx`
+        `质量整改_${new Date().getTime()}.xlsx`
       );
     },
   },
diff --git a/ruoyi-ui/src/views/work/workFile/index.vue b/ruoyi-ui/src/views/work/workFile/index.vue
index c736e2e0..ec9c83a0 100644
--- a/ruoyi-ui/src/views/work/workFile/index.vue
+++ b/ruoyi-ui/src/views/work/workFile/index.vue
@@ -10,7 +10,7 @@
         />
       </el-form-item>
       <el-form-item label="文件归属" prop="fileBelong">
-        <el-select v-model="queryParams.fileBelong" placeholder="请选择文件归属" clearable>
+        <el-select v-model="queryParams.fileBelong" placeholder="请选择文件归属" clearable @change="doFileBelongChange">
           <el-option
             v-for="dict in dict.type.work_file_belong"
             :key="dict.value"
@@ -19,14 +19,15 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="文件状态" prop="isDel">
-        <el-select v-model="queryParams.isDel" placeholder="请选择文件归属" clearable>
+      <el-form-item label="子公司" v-show="queryParams.fileBelong==3">
+        <el-select v-model="queryParams.deptId" placeholder="请选择子公司" clearable>
+          <el-option label="产发集团" :value="0"></el-option>
           <el-option
-            v-for="dict in dict.type.sys_common_isdel"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+            v-for="dict in depts"
+            :key="dict.deptId"
+            :label="dict.deptName"
+            :value="dict.deptId"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="上传时间">
@@ -97,7 +98,8 @@
       <el-table-column label="主键" align="center" prop="id" v-if="false"/>
       <el-table-column label="文件归属" align="center" width="80" prop="fileBelong">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.work_file_belong" :value="scope.row.fileBelong"/>
+          <dict-tag :options="dict.type.work_file_belong" :value="scope.row.fileBelong" v-if="scope.row.fileBelong<3"/>
+          <span v-else>{{ scope.row.deptName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="文件名称" align="left" prop="fileName" show-overflow-tooltip width="300"/>
@@ -170,6 +172,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="子公司" v-if="form.fileBelong==3"  prop="deptId">
+        <el-select v-model="form.deptId" placeholder="请选择子公司" clearable>         
+          <el-option
+            v-for="dict in depts"
+            :key="dict.deptId"
+            :label="dict.deptName"
+            :value="dict.deptId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
         <el-form-item label="上传文件" prop="fileData">
           <FileUpload @input="fileInput"/>
         </el-form-item>
@@ -217,7 +229,8 @@ export default {
         pageSize: 10,
         fileBelong: null,
         fileName: null,
-        isDel:null
+        isDel:null,
+        deptId:0,
       },
       // 表单参数
       form: {},
@@ -226,6 +239,9 @@ export default {
         fileBelong: [
           { required: true, message: "请选择文件归属", trigger: "blur" }
         ],
+        deptId:[
+         { required: true, message: "请选择子公司", trigger: "blur" }
+        ],
         remark: [
           { required: false},
           { max: 200,message: "最多输入200字符" }
@@ -233,13 +249,20 @@ export default {
       },
       // 传达时间时间范围
       daterangeMarksTime: [],
-      fileList: []
+      fileList: [],
+      depts: [],
     };
   },
   created() {
     this.getList();
+    this.$api.publics.getZgsDeptList().then((d) => {
+      this.depts = d?.data || [];
+    });
   },
   methods: {
+    doFileBelongChange(){
+      this.queryParams.deptId=0;
+    },
     /** 查询文件传达列表 */
     getList() {
       this.loading = true;
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index f348640d..8e9aa86a 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -41,8 +41,8 @@ module.exports = {
         }
       },   
       '/jhapi':{
-        target: `http://62.234.3.186/jhapi/`,
-        //target: `http://127.0.0.1:8090/jhapi/`,
+        //target: `http://62.234.3.186/jhapi/`,
+        target: `http://127.0.0.1:8090/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java
index 9316c630..7ee76317 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java
@@ -25,9 +25,10 @@ public class BgWorkFileController extends BaseController {
      * @return
      */
     @GetMapping("/getWorkFileList")
-    public TableDataInfo getWorkFileList(String fileBelong){
+    public TableDataInfo getWorkFileList(String fileBelong,long deptId){
         WorkFile workFile = new WorkFile();
         workFile.setFileBelong(fileBelong);
+        workFile.setDeptId(deptId);
         return getDataTable(workFileService.selectWorkFileListLimit20(workFile));
     }
 
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
index 6b236b8b..ccfe0a5d 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
@@ -176,6 +176,6 @@ public class ProblemmodifyController extends BaseController {
 
     @PostMapping("/listSspProblemmodify")
     public AjaxResult listSspProblemmodify(@RequestBody SmzSspProblemmodifyWhere where){
-        return  AjaxResult.success(smzSspProblemmodifyService.selectSmzSspProblemmodifyList(where));
+        return  AjaxResult.success(smzSspProblemmodifyService.selectSmzSspProblemmodifyListAndUnitName(where));
     }
 }
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java
index 7ab341c3..3b617494 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java
@@ -28,7 +28,7 @@ public class ProjectCheckDetectionController {
      * @param where checkType送检类型 deptId部门编号  projectId项目编号
      * @return
      */
-    @PostMapping("groupByCheckType")
+    @PostMapping("/groupByCheckType")
     public AjaxResult groupByCheckType(@RequestBody SurProjectCheckDetection where){
         String key="bgscreen_checkDetection_groupMeasureInfo_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId();
         Object obj=redisCache.getCacheObject(key);
@@ -39,4 +39,15 @@ public class ProjectCheckDetectionController {
         redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
+    @PostMapping("/getList")
+    public AjaxResult getList(@RequestBody SurProjectCheckDetection where){
+        String key="bgscreen_getList_groupMeasureInfo_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId();
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return AjaxResult.success(obj);
+        }
+        List<SurProjectCheckDetection> list=checkDetectionService.getList(where);
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return AjaxResult.success(list);
+    }
 }
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java
index 1699a5f1..34b018c2 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java
@@ -26,15 +26,26 @@ public class ProjectMeasureController {
      * @param where  measureType 测量类型  deptId部门编号  projectId项目编号
      * @return
      */
-    @PostMapping("groupMeasureInfo")
+    @PostMapping("/groupMeasureInfo")
     public AjaxResult groupMeasureInfo(@RequestBody SurProjectMeasure where){
         String key="bgscreen_measure_groupMeasureInfo_"+where.getMeasureType()+"_"+where.getDeptId()+"_"+where.getProjectId();
-        //Object obj=redisCache.getCacheObject(key);
-       // if(obj!=null){
-         //   return AjaxResult.success(obj);
-       // }
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return AjaxResult.success(obj);
+        }
         List<SurProjectMeasure> list=measureService.groupMeasureInfo(where);
-        //redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return AjaxResult.success(list);
+    }
+    @PostMapping("/getList")
+    public AjaxResult getList(@RequestBody SurProjectMeasure where){
+        String key="bgscreen_measure_getList_"+where.getMeasureType()+"_"+where.getDeptId()+"_"+where.getProjectId();
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return AjaxResult.success(obj);
+        }
+        List<SurProjectMeasure> list=measureService.getList(where);
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
index 83452e48..b1d949b7 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
@@ -97,7 +97,26 @@ public class SurProjectCheckDetection extends BaseEntity
     private String projectName;
     private String deptName;
 
-    public void setId(Long id) 
+    private String createByName;
+    private String updateByName;
+
+    public String getCreateByName() {
+        return createByName;
+    }
+
+    public void setCreateByName(String createByName) {
+        this.createByName = createByName;
+    }
+
+    public String getUpdateByName() {
+        return updateByName;
+    }
+
+    public void setUpdateByName(String updateByName) {
+        this.updateByName = updateByName;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java
index 1c1986c1..f8d4dca3 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java
@@ -89,8 +89,26 @@ public class SurProjectMeasure extends BaseEntity
     private String deptName;
     private String measureTypeName;
     private String measureInfoName;
+    private String createByName;
+    private String updateByName;
 
-    public void setId(Long id) 
+    public String getCreateByName() {
+        return createByName;
+    }
+
+    public void setCreateByName(String createByName) {
+        this.createByName = createByName;
+    }
+
+    public String getUpdateByName() {
+        return updateByName;
+    }
+
+    public void setUpdateByName(String updateByName) {
+        this.updateByName = updateByName;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java
index 1f550763..f36b2aae 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java
@@ -85,4 +85,5 @@ public interface SurProjectCheckDetectionMapper
      */
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
 
+    public  List<SurProjectCheckDetection> getList(SurProjectCheckDetection where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java
index 1b1ea64f..dcaa234f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java
@@ -70,4 +70,6 @@ public interface SurProjectMeasureMapper
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
 
     public List<SurProjectMeasure> groupMeasureInfo(SurProjectMeasure where);
+
+    public List<SurProjectMeasure> getList(SurProjectMeasure where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
index ef026150..998a1194 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
@@ -84,4 +84,6 @@ public interface ISurProjectCheckDetectionService
      * @return 结果
      */
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
+
+    public List<SurProjectCheckDetection> getList(SurProjectCheckDetection where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java
index 5209d3ff..c8303c6a 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java
@@ -70,4 +70,6 @@ public interface ISurProjectMeasureService
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
 
     public  List<SurProjectMeasure> groupMeasureInfo(SurProjectMeasure where);
+
+    public  List<SurProjectMeasure> getList(SurProjectMeasure where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
index e28f386a..04738202 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
@@ -145,4 +145,9 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId){
         return surProjectCheckDetectionMapper.findGroupCountByProjectId(projectId);
     }
+
+    @Override
+    public List<SurProjectCheckDetection> getList(SurProjectCheckDetection where) {
+        return surProjectCheckDetectionMapper.getList(where);
+    }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java
index 53454035..9bb7ae2b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java
@@ -118,4 +118,9 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService
     public List<SurProjectMeasure> groupMeasureInfo(SurProjectMeasure where) {
         return surProjectMeasureMapper.groupMeasureInfo(where);
     }
+
+    @Override
+    public List<SurProjectMeasure> getList(SurProjectMeasure where) {
+        return surProjectMeasureMapper.getList(where);
+    }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java
index bc1dc121..3e31cb76 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java
@@ -1,12 +1,16 @@
 package com.yanzhu.jh.trouble.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.SysRoleEnum;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo;
+import com.yanzhu.jh.trouble.domain.vo.SmzSspProblemmodifyExport;
 import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere;
 import com.yanzhu.jh.trouble.service.ISmzSspAuditinfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -47,6 +51,8 @@ public class SmzSspProblemmodifyController extends BaseController
     @Autowired
     private ISmzSspProblemmodifyService smzSspProblemmodifyService;
 
+
+
     /**
      * 查询质量整改列表
      */
@@ -98,9 +104,17 @@ public class SmzSspProblemmodifyController extends BaseController
             smzSspProblemmodify.setNowDept(Convert.toStr(getDeptId()));
         }
         smzSspProblemmodify.setNowUser(getLoginUser().getUsername());
-        List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSmzSspProblemmodifyList(smzSspProblemmodify);
-        ExcelUtil<SmzSspProblemmodify> util = new ExcelUtil<SmzSspProblemmodify>(SmzSspProblemmodify.class);
-        util.exportExcel(response, list, "质量整改数据");
+        List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSmzSspProblemmodifyListAndUnitName(smzSspProblemmodify);
+        List<SmzSspProblemmodifyExport> exportList=new ArrayList<>();
+        for(SmzSspProblemmodify it :list){
+            exportList.add(SmzSspProblemmodifyExport.newItem(it));
+        }
+        ExcelUtil<SmzSspProblemmodifyExport> util = new ExcelUtil<SmzSspProblemmodifyExport>(SmzSspProblemmodifyExport.class);
+        String name="质量整改数据";
+        if(smzSspProblemmodify.getInfoType()==0){
+            name="安全整改数据";
+        }
+        util.exportExcel(response, exportList, name);
     }
 
     /**
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java
index ff6095ce..04cb3a6e 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java
@@ -1,7 +1,10 @@
 package com.yanzhu.jh.trouble.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yanzhu.jh.project.domain.SurProjectUnitInfo;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -21,15 +24,15 @@ public class SmzSspProblemmodify extends BaseEntity
     private Long id;
 
     /** 项目id */
-    @Excel(name = "项目id")
+
     private Long projectId;
 
     /** 信息类型 */
-    @Excel(name = "信息类型")
+
     private Long infoType;
 
     /** 拍摄位置 */
-    @Excel(name = "拍摄位置")
+    @Excel(name = "项目名称")
     private String problemArea;
 
     /** 问题描述 */
@@ -41,11 +44,11 @@ public class SmzSspProblemmodify extends BaseEntity
     private String changeInfo;
 
     /** 主送人姓名 */
-    @Excel(name = "主送人姓名")
+    @Excel(name = "整改人")
     private String lordSent;
 
     /** 主送人手机号 */
-    @Excel(name = "主送人手机号")
+    @Excel(name = "整改人手机号")
     private String lordSentUser;
 
     /** 抄送人姓名 */
@@ -135,7 +138,37 @@ public class SmzSspProblemmodify extends BaseEntity
     private String vDel;
     private String flag;//整改超时标识
 
-    public void setId(Long id) 
+    private String dangerLabel;
+    private String chkLabel;
+
+    public String getDangerLabel() {
+        return dangerLabel;
+    }
+
+    public void setDangerLabel(String dangerLabel) {
+        this.dangerLabel = dangerLabel;
+    }
+
+    public String getChkLabel() {
+        return chkLabel;
+    }
+
+    public void setChkLabel(String chkLabel) {
+        this.chkLabel = chkLabel;
+    }
+
+    //sur_project_unit_info
+    private List<SurProjectUnitInfo> unitInfos;
+
+    public List<SurProjectUnitInfo> getUnitInfos() {
+        return unitInfos;
+    }
+
+    public void setUnitInfos(List<SurProjectUnitInfo> unitInfos) {
+        this.unitInfos = unitInfos;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
new file mode 100644
index 00000000..d75a9880
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
@@ -0,0 +1,165 @@
+package com.yanzhu.jh.trouble.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import java.util.Date;
+
+public class SmzSspProblemmodifyExport {
+    @Excel(name = "项目名称",align= HorizontalAlignment.LEFT,width =30 )
+    private String problemArea;
+
+    @Excel(name = "总包单位",align= HorizontalAlignment.LEFT,width =30)
+    private String deptName;
+    @Excel(name = "隐患图片",isLink = true,color = IndexedColors.BLUE,linkText="查看图片")
+    private String marksPicture;
+    @Excel(name = "隐患类型" ,align= HorizontalAlignment.CENTER,width =24)
+    private String dangerType;
+    @Excel(name = "问题描述" ,align= HorizontalAlignment.LEFT,width =32)
+    private String workParts;
+
+    @Excel(name = "整改要求" ,align= HorizontalAlignment.LEFT,width =30)
+    private String changeInfo;
+    @Excel(name = "整改截至时间", width = 20, dateFormat = "yyyy-MM-dd HH:ss")
+    private Date nickedTime;
+    @Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =30)
+    private String lordSent;
+
+    @Excel(name = "流程状态")
+    private String checkState;
+
+    @Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =30)
+    private String recheckSend;
+    @Excel(name = "抄送人",align= HorizontalAlignment.LEFT,width =30)
+    private String copySend;
+
+    @Excel(name = "提交用户",align= HorizontalAlignment.LEFT,width =30)
+    private String createBy;
+
+    @Excel(name = "提交时间", width = 20, dateFormat = "yyyy-MM-dd HH:ss")
+    private Date createTime;
+
+    public static SmzSspProblemmodifyExport newItem(SmzSspProblemmodify it) {
+        SmzSspProblemmodifyExport d=new SmzSspProblemmodifyExport();
+        d.problemArea=it.getProblemArea();
+        d.deptName=it.getDeptName();
+        d.dangerType=it.getDangerLabel();
+        d.workParts=it.getWorkParts();
+        d.changeInfo=it.getChangeInfo();
+        d.nickedTime=it.getNickedTime();
+        d.lordSent=it.getLordSent()+" "+it.getLordSentUser();
+        d.checkState=it.getChkLabel();
+        d.recheckSend=it.getRecheckSend()+" "+it.getRecheckSendUser();
+        d.copySend=it.getCopySend()+" "+it.getCopySendUser();
+        d.createBy=it.getCreateBy()+" "+it.getCreateUser();
+        d.createTime=it.getCreateTime();
+        d.marksPicture="http://62.234.3.186"+it.getMarksPicture();
+        return d;
+    }
+
+    public String getMarksPicture() {
+        return marksPicture;
+    }
+
+    public void setMarksPicture(String marksPicture) {
+        this.marksPicture = marksPicture;
+    }
+
+    public String getProblemArea() {
+        return problemArea;
+    }
+
+    public void setProblemArea(String problemArea) {
+        this.problemArea = problemArea;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getDangerType() {
+        return dangerType;
+    }
+
+    public void setDangerType(String dangerType) {
+        this.dangerType = dangerType;
+    }
+
+    public String getWorkParts() {
+        return workParts;
+    }
+
+    public void setWorkParts(String workParts) {
+        this.workParts = workParts;
+    }
+
+    public String getChangeInfo() {
+        return changeInfo;
+    }
+
+    public void setChangeInfo(String changeInfo) {
+        this.changeInfo = changeInfo;
+    }
+
+    public Date getNickedTime() {
+        return nickedTime;
+    }
+
+    public void setNickedTime(Date nickedTime) {
+        this.nickedTime = nickedTime;
+    }
+
+    public String getLordSent() {
+        return lordSent;
+    }
+
+    public void setLordSent(String lordSent) {
+        this.lordSent = lordSent;
+    }
+
+    public String getCheckState() {
+        return checkState;
+    }
+
+    public void setCheckState(String checkState) {
+        this.checkState = checkState;
+    }
+
+    public String getRecheckSend() {
+        return recheckSend;
+    }
+
+    public void setRecheckSend(String recheckSend) {
+        this.recheckSend = recheckSend;
+    }
+
+    public String getCopySend() {
+        return copySend;
+    }
+
+    public void setCopySend(String copySend) {
+        this.copySend = copySend;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/where/SmzSspProblemmodifyWhere.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/where/SmzSspProblemmodifyWhere.java
index 8192af48..91ca23ed 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/where/SmzSspProblemmodifyWhere.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/where/SmzSspProblemmodifyWhere.java
@@ -3,6 +3,7 @@ package com.yanzhu.jh.trouble.domain.where;
 import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify;
 
 import java.util.Date;
+import java.util.List;
 
 public class SmzSspProblemmodifyWhere extends SmzSspProblemmodify {
     public Date getStartDate() {
@@ -33,4 +34,16 @@ public class SmzSspProblemmodifyWhere extends SmzSspProblemmodify {
     public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
+
+
+    public List<Long> getRoleTypes() {
+        return roleTypes;
+    }
+
+    public void setRoleTypes(List<Long> roleTypes) {
+        this.roleTypes = roleTypes;
+    }
+
+    private List<Long> roleTypes;
+
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java
index 33e4e4a0..fe9da14a 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java
@@ -38,6 +38,8 @@ public interface SmzSspProblemmodifyMapper
      */
     public List<SmzSspProblemmodify> selectSmzSspProblemmodifyList(SmzSspProblemmodifyWhere smzSspProblemmodify);
 
+
+    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyListAndUnitName(SmzSspProblemmodifyWhere smzSspProblemmodify);
     /**
      * 查询质量整改列表
      *
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java
index e6c91500..6de8db79 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java
@@ -127,4 +127,6 @@ public interface ISmzSspProblemmodifyService
     public List<SmzSspProblemmodify> groupByInfotypeCheckState(SmzSspProblemmodifyWhere where);
 
     public Long countTimeout(SmzSspProblemmodifyWhere where);
+
+    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyListAndUnitName(SmzSspProblemmodifyWhere where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java
index 43a6c1dc..86f1e3c7 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java
@@ -231,6 +231,11 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
         return (long) smzSspProblemmodifyMapper.countTimeout(where);
     }
 
+    @Override
+    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyListAndUnitName(SmzSspProblemmodifyWhere where) {
+        return smzSspProblemmodifyMapper.selectSmzSspProblemmodifyListAndUnitName(where);
+    }
+
     /**
      * 新增随手拍文件信息信息
      *
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java
index 6de38eff..75fdba91 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java
@@ -58,6 +58,26 @@ public class WorkFile extends BaseEntity
     private Long readNum;
 
     //文件列表
+
+    private Long deptId;
+    private String deptName;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     private List<Map<String,Object>> fileList;
 
     public void setId(Long id)
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkFileServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkFileServiceImpl.java
index 4dae5cb7..7295c2e3 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkFileServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkFileServiceImpl.java
@@ -80,6 +80,7 @@ public class WorkFileServiceImpl implements IWorkFileService
         if(fileList!=null && fileList.size()>0){
             for(Map<String,Object> fileMap:fileList){
                 WorkFile lastingModel = new WorkFile();
+                lastingModel.setDeptId(workFile.getDeptId());
                 lastingModel.setFileBelong(workFile.getFileBelong());
                 lastingModel.setFileType(FileUtils.getFileLastNameUpCase(Convert.toStr(fileMap.get("original"))));
                 lastingModel.setFileName(Convert.toStr(fileMap.get("original")));
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
index 73faba42..8eaf00ad 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
@@ -32,13 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="createByName" column="create_by_name"/>
+        <result property="updateByName" column="update_by_name"/>
     </resultMap>
 
     <sql id="selectSurProjectCheckDetectionVo">
-        select spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label as check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark from sur_project_check_detection spcd
-        left join sur_project sp on spcd.project_id = sp.id
-        left join sys_dept sd on sd.dept_id = spcd.dept_id
-        left join sys_dict_data sdd on sdd.dict_type = 'check_detection_check_type' and sdd.dict_value = spcd.check_type
+        SELECT spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label AS check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark ,u1.nick_name create_by_name,u2.nick_name update_by_name
+        FROM sur_project_check_detection spcd
+         LEFT JOIN sur_project sp ON spcd.project_id = sp.id
+         LEFT JOIN sys_dept sd ON sd.dept_id = spcd.dept_id
+         LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'check_detection_check_type' AND sdd.dict_value = spcd.check_type
+         LEFT JOIN sys_user u1 ON spcd.create_by=u1.phonenumber
+         LEFT JOIN sys_user u2 ON spcd.update_by=u2.phonenumber
     </sql>
 
     <select id="selectSurProjectCheckDetectionList" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
@@ -264,4 +269,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
 
     </select>
+
+    <select id="getList" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
+        <include refid="selectSurProjectCheckDetectionVo"/>
+        WHERE spcd.is_del=0
+       <if test="checkType!=null and checkType>0">AND spcd.check_type= #{checkType}</if>
+        <if test="deptId !=null and deptId > 0 ">
+            and spcd.project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
+        </if>
+        <if test="projectId !=null and projectId > 0 ">
+            and  spcd.project_id=#{projectId}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
index 79816e03..17005b36 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
@@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="measureTypeName"    column="measure_type_name"    />
         <result property="measureInfoName"    column="measure_info_name"    />
+        <result property="createByName" column="create_by_name"/>
+        <result property="updateByName" column="update_by_name"/>
     </resultMap>
 
     <sql id="selectSurProjectMeasureVo">
@@ -196,4 +198,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) b
         ON a.dict_value=b.measure_info
     </select>
+    <select id="getList"  parameterType="SurProjectMeasure" resultMap="SurProjectMeasureResult">
+        SELECT spm.id, spm.project_id, spm.dept_id, spm.main_image, spm.image_urls, spm.measure_type, sdd1.dict_label AS measure_type_name, spm.measure_position, spm.measure_info, sdd2.dict_label AS measure_info_name, spm.measure_time, spm.measure_point_position, spm.measure_result, spm.measure_files, spm.quality_user, spm.quality_user_name, spm.supervise_user, spm.supervise_user_name, spm.is_del, spm.create_by, spm.create_time, spm.update_by, spm.update_time, spm.remark, sp.projectName, sd.dept_name ,u1.nick_name create_by_name,u2.nick_name update_by_name
+        FROM sur_project_measure spm
+         LEFT JOIN sur_project sp ON spm.project_id = sp.id
+         LEFT JOIN sys_dept sd ON sd.dept_id = spm.dept_id
+         LEFT JOIN sys_dict_data sdd1 ON sdd1.dict_type = 'project_measure_type' AND sdd1.dict_value = spm.measure_type
+         LEFT JOIN sys_dict_data sdd2 ON sdd2.dict_type = 'project_measure_info_type' AND sdd2.dict_value = spm.measure_info
+         LEFT JOIN sys_user u1 ON spm.create_by=u1.phonenumber
+         LEFT JOIN sys_user u2 ON spm.update_by=u2.phonenumber
+
+        WHERE IF(spm.is_del IS NULL,0,spm.is_del)=0
+        <if test='measureType !=null and measureType !="0"'>
+            and spm.measure_type = #{measureType}
+        </if>
+        <if test="deptId !=null and deptId >0">
+            AND  spm.project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
+        </if>
+        <if test="projectId !=null and projectId >0">
+            AND  spm.project_id=#{projectId}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 3c14516b..5a637beb 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -43,6 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="deptName"/>
         <result property="createUserName" column="createUserName"/>
         <result property="flag" column="flag"/>
+        <result property="chkLabel" column="chkLabel"></result>
+        <result property="dangerLabel" column="dangerLabel"></result>
+        <collection property="unitInfos" ofType="SurProjectUnitInfo">
+            <id column="unitId" property="id"></id>
+            <result property="unitName" column="unitName"></result>
+        </collection>
     </resultMap>
 
     <sql id="selectSmzSspProblemmodifyVo">
@@ -98,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeName == "dqr"'> and ssp.checkState in (1)</if>
             <if test='activeName == "ycl"'> and ssp.checkState = 4 </if>
             <if test='activeName == "zgcs"'> and (date(NOW())<![CDATA[ > ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) <![CDATA[ > ]]> date(ssp.nickedTime))) </if>
+            <if test="roleTypes!=null">
+                and roleType in
+                <foreach collection="roleTypes" item="item" index="index" open="(" close=")" separator=",">${item}</foreach>
+            </if>
         </where>
         order by createTime desc
     </select>
@@ -212,6 +222,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
         <!--普通整改人是我，复检人是我，抄送人是我，提交人是我的数据-->
         <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and (ssp.lordSentUser = #{nowUser} or ssp.copySendUser like concat('%', #{nowUser}, '%') or ssp.recheckSendUser = #{nowUser} or ssp.createUser = #{nowUser} )</if>
+        <if test="roleTypes!=null">
+            and roleType in
+            <foreach collection="roleTypes" item="item" index="index" open="(" close=")" separator=",">${item}</foreach>
+        </if>
         GROUP BY checkState
     </select>
 
@@ -238,6 +252,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
         <!--普通整改人是我，复检人是我，抄送人是我，提交人是我的数据-->
         <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and (ssp.lordSentUser = #{nowUser} or ssp.copySendUser like concat('%', #{nowUser}, '%') or ssp.recheckSendUser = #{nowUser} or ssp.createUser = #{nowUser} )</if>
+        <if test="roleTypes!=null">
+                and roleType in
+            <foreach collection="roleTypes" item="item" index="index" open="(" close=")" separator=",">${item}</foreach>
+        </if>
+
     </select>
     
     <select id="selectSmzSspProblemmodifyById" parameterType="Long" resultMap="SmzSspProblemmodifyResult">
@@ -533,4 +552,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+
+    <select id="selectSmzSspProblemmodifyListAndUnitName" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
+        select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type,
+        ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.createBy
+        ,sp.dept_Name deptName,ssp.dangerLabel,ssp.chkLabel
+        from (
+        SELECT c.*,a.dict_label dangerLabel,b.dict_label chkLabel FROM
+        vw_smz_ssp_problemmodify_audit c,sys_dict_data a,sys_dict_data b WHERE c.danger_Type=a.dict_value AND a.dict_type='ssp_aqyhlx'
+        AND c.checkState=b.dict_value AND b.dict_type='smz_ssp_checkstate'
+        ) ssp
+        left join (
+        SELECT p.dept_Name,p.dept_id,u.phonenumber
+        FROM sys_user u,sur_project_userinfo p WHERE u.user_id=p.user_id AND p.dept_type=2
+        ) sp on ssp.lordSentUser = sp.phonenumber
+        <!--监理单位/总包公司/分包单位-->
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
+        <where>
+            and ssp.isDel=0
+            <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
+            <if test="infoType != null "> and ssp.infoType = #{infoType}</if>
+            <if test="roleType != null and roleType >0 "> and ssp.roleType = #{roleType}</if>
+            <if test="problemArea != null  and problemArea != ''"> and ssp.problemArea like concat('%', #{problemArea}, '%')</if>
+            <if test="workParts != null  and workParts != ''"> and ssp.workParts like concat('%', #{workParts}, '%')</if>
+            <if test="changeInfo != null  and changeInfo != ''"> and ssp.changeInfo like concat('%', #{changeInfo}, '%')</if>
+            <if test="lordSent != null  and lordSent != ''"> and ssp.lordSent = #{lordSent}</if>
+            <if test="lordSentUser != null  and lordSentUser != ''"> and ssp.lordSentUser = #{lordSentUser}</if>
+            <if test="copySend != null  and copySend != ''"> and ssp.copySend = #{copySend}</if>
+            <if test="copySendUser != null  and copySendUser != ''"> and ssp.copySendUser = #{copySendUser}</if>
+            <if test="checkState != null "> and ssp.checkState = #{checkState}</if>
+            <if test="nickedArea != null  and nickedArea != ''"> and nickedArea = #{nickedArea}</if>
+            <if test="nickedTime != null "> and ssp.nickedTime = #{nickedTime}</if>
+            <if test="problemType != null "> and ssp.problemType = #{problemType}</if>
+            <if test="projectType != null  and projectType != ''"> and ssp.projectType = #{projectType}</if>
+            <if test="processName != null  and processName != ''"> and ssp.processName like concat('%', #{processName}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and ssp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="nickedInfo != null  and nickedInfo != ''"> and ssp.nickedInfo = #{nickedInfo}</if>
+            <if test="checkUser != null  and checkUser != ''"> and ssp.checkUser = #{checkUser}</if>
+            <if test="checkUserPhone != null  and checkUserPhone != ''"> and ssp.checkUserPhone = #{checkUserPhone}</if>
+            <if test="isDel != null "> and ssp.isDel = #{isDel}</if>
+            <if test="startDate!=null">and DATE(ssp.createtime)>=DATE(#{startDate})</if>
+            <if test="endDate!=null">and DATE(ssp.createtime) &lt;= DATE(#{endDate})</if>
+            <if test="createUser != null  and createUser != ''"> and ssp.createUser like concat('%', #{createUser}, '%')</if>
+            <if test="createTime != null "> and ssp.createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and ssp.updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and ssp.updateTime = #{updateTime}</if>
+            <if test="dangerType != null  and dangerType != ''"> and ssp.danger_type = #{dangerType}</if>
+            <if test="params.beginMarksTime != null and params.beginMarksTime != '' and params.endMarksTime != null and params.endMarksTime != ''"> and ssp.createTime between #{params.beginMarksTime} and #{params.endMarksTime}</if>
+            <!-- 查询条件-项目部门 -->
+            <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
+            <!--子部门数据-->
+            <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
+            <!--监理单位/总包公司/分包单位查询当前关联数据-->
+            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
+            <!--普通整改人是我，复检人是我，抄送人是我，提交人是我的数据-->
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and (ssp.lordSentUser = #{nowUser} or ssp.copySendUser like concat('%', #{nowUser}, '%') or ssp.recheckSendUser = #{nowUser} or ssp.createUser = #{nowUser} )</if>
+            <if test='activeName == "dzg"'> and ssp.checkState in (0,3)</if>
+            <if test='activeName == "dqr"'> and ssp.checkState in (1)</if>
+            <if test='activeName == "ycl"'> and ssp.checkState = 4 </if>
+            <if test='activeName == "zgcs"'> and (date(NOW())<![CDATA[ > ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) <![CDATA[ > ]]> date(ssp.nickedTime))) </if>
+            <if test="roleTypes!=null">
+                and roleType in
+                <foreach collection="roleTypes" item="item" index="index" open="(" close=")" separator=",">${item}</foreach>
+            </if>
+        </where>
+        order by createTime desc
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml
index a64c6287..1e04fd4a 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml
@@ -20,10 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="deptId"   column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
     </resultMap>
 
     <sql id="selectWorkFileVo">
-        select id, file_belong, file_type, file_name, file_path, file_md5, file_size, is_del, download_num, read_num, create_by, create_time, update_by, update_time, remark from work_file
+        select id, file_belong, file_type, file_name, file_path, file_md5, file_size, is_del, download_num, read_num, create_by, create_time, update_by, update_time, remark,dept_id,dept_name
+        from ( SELECT a.*,b.dept_name
+               FROM work_file a LEFT JOIN sys_dept b ON a.dept_id=b.dept_id ) work_file
     </sql>
 
     <select id="selectWorkFileList" parameterType="WorkFile" resultMap="WorkFileResult">
@@ -31,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="fileBelong != null  and fileBelong != ''"> and file_belong = #{fileBelong}</if>
+            <if test="deptId != null  and deptId>0"> and dept_id = #{deptId}</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="params.beginMarksTime != null and params.beginMarksTime != '' and params.endMarksTime != null and params.endMarksTime != ''"> and create_time between #{params.beginMarksTime} and #{params.endMarksTime}</if>
         </where>
@@ -42,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             and is_del = 0
             <if test="fileBelong != null  and fileBelong != ''"> and file_belong = #{fileBelong}</if>
+            <if test="deptId!=null and deptId>0">and dept_id =#{deptId}</if>
         </where>
         order by create_time desc
         Limit 20
@@ -69,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fileBelong != null">#{fileBelong},</if>
@@ -85,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -105,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where id = #{id}
     </update>