From 4f74fb35f7908a9b78053fbdf5a184696ed5ef22 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 14 Sep 2023 00:58:30 +0800
Subject: [PATCH] update code

---
 ruoyi-ui/src/api/trouble/sspProblemmodify.js  |   4 +-
 .../src/views/project/surProject/index.vue    |  72 ++-------
 .../views/trouble/pshProblemmodify/index.vue  |  39 +++--
 .../views/trouble/sspProblemmodify/index.vue  |  36 +++--
 ruoyi-ui/vue.config.js                        |   4 +-
 .../controller/ProblemmodifyController.java   |   2 +-
 .../SmzSspProblemmodifyController.java        |  20 ++-
 .../trouble/domain/SmzSspProblemmodify.java   |  45 +++++-
 .../domain/vo/SmzSspProblemmodifyExport.java  | 153 ++++++++++++++++++
 .../where/SmzSspProblemmodifyWhere.java       |  13 ++
 .../mapper/SmzSspProblemmodifyMapper.java     |   2 +
 .../service/ISmzSspProblemmodifyService.java  |   2 +
 .../impl/SmzSspProblemmodifyServiceImpl.java  |   5 +
 .../trouble/SmzSspProblemmodifyMapper.xml     |  86 ++++++++++
 14 files changed, 383 insertions(+), 100 deletions(-)
 create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java

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/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/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-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..0db3a5a4
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
@@ -0,0 +1,153 @@
+package com.yanzhu.jh.trouble.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify;
+
+import java.util.Date;
+
+public class SmzSspProblemmodifyExport {
+    @Excel(name = "项目名称")
+    private String problemArea;
+
+    @Excel(name = "总包单位")
+    private String deptName;
+
+    @Excel(name = "隐患类型")
+    private String dangerType;
+    @Excel(name = "问题描述")
+    private String workParts;
+
+    @Excel(name = "整改要求")
+    private String changeInfo;
+    @Excel(name = "整改截至时间", width = 30, dateFormat = "yyyy-MM-dd HH:ss")
+    private Date nickedTime;
+    @Excel(name = "隐患整改人")
+    private String lordSent;
+
+    @Excel(name = "流程状态")
+    private String checkState;
+
+    @Excel(name = "复检人")
+    private String recheckSend;
+    @Excel(name = "抄送人")
+    private String copySend;
+
+    @Excel(name = "提交用户")
+    private String createBy;
+
+    @Excel(name = "提交时间", width = 30, 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();
+        return d;
+    }
+
+    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 bec7b0c5..65640993 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 715e3f54..8bc62c57 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
@@ -119,4 +119,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 a32ec6d3..2432bd04 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/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 86fbb131..d1545f16 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">
@@ -520,4 +539,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