From 355db937056cdddbd9cd289ace0f9670f4347325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 23 Jul 2024 00:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/project/projectMeasure/index.vue    |  4 ++--
 .../project/projectMeasure/projectMeasureDrawer.vue    |  4 ++--
 .../controller/SmzSspProblemmodifyDraftController.java |  7 ++++---
 .../yanzhu/jh/trouble/domain/SmzSspProblemmodify.java  |  4 ++--
 .../mapper/trouble/SmzSspProblemmodifyMapper.xml       | 10 +++++-----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index 5e337480..5eca9eaa 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue
@@ -299,11 +299,11 @@
       >
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.measureFiles != null"
+            v-if="scope.row.measureFiles"
             size="mini"
             type="text"
             icon="el-icon-paperclip"
-            @click="handledownload(scope.row)"
+            @click="handleDownload(scope.row)"
             v-hasPermi="['project:projectMeasure:list']"
             >下载附件</el-button
           >
diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index 552962bd..c8e50f0c 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -102,8 +102,8 @@
       </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.measureFiles != null" size="mini" type="text" icon="el-icon-paperclip"
-              @click="handledownload(scope.row)" v-hasPermi="['project:projectMeasure:list']">下载附件</el-button>
+            <el-button v-if="scope.row.measureFiles" size="mini" type="text" icon="el-icon-paperclip"
+              @click="handleDownload(scope.row)" v-hasPermi="['project:projectMeasure:list']">下载附件</el-button>
             <el-button v-if="scope.row.approveStatus != null" size="mini" type="text" icon="el-icon-tickets"
               @click="handleAuditinfo(scope.row)">审批日志</el-button>
             <el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-edit"
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java
index 62d2f35d..4e415635 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java
@@ -50,12 +50,13 @@ public class SmzSspProblemmodifyDraftController extends BaseController
     public TableDataInfo list(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft)
     {
         startPage();
-        smzSspProblemmodifyDraft.setNowRole(Convert.toStr(getUserFirstRole()));
+        /*Long fileRole = getUserFirstRole();
+        smzSspProblemmodifyDraft.setNowRole(Convert.toStr(fileRole));
         if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodifyDraft.getNowRole())){
             smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
-        }else{
+        }else if(fileRole>4L){
             smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(getDeptId()));
-        }
+        }*/
         smzSspProblemmodifyDraft.setNowUserName(getLoginUser().getUsername());
         List<SmzSspProblemmodifyDraft> list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft);
         return getDataTable(list);
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 d0cc9add..5c20f7c9 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
@@ -66,8 +66,8 @@ public class SmzSspProblemmodify extends BaseEntity
     private String nickedArea;
 
     /** 留痕时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "整改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "整改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date nickedTime;
 
     /** 工程类型 */
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index e90b4bb5..183fb1e6 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user fju on fju.phonenumber = ssp.recheckSendUser
         left join sys_dept fjd on fjd.dept_id = fju.dept_id
         <!--监理单位/总包公司/分包单位-->
-        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
         <where>
             and ssp.isDel=0
             <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test='infoType == "0" '> left join sys_dict_data sdd on sdd.dict_type = 'ssp_aqyhlx' and sdd.dict_value = ssp.danger_type</if>
         <if test='infoType == "1" '> left join sys_dict_data sdd on sdd.dict_type = 'ssp_zlyhlx' and sdd.dict_value = ssp.danger_type</if>
         <!--监理单位/总包公司/分包单位-->
-        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
         <where>
             and ssp.isDel=0
             <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
@@ -224,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sur_project sp on ssp.projectId = sp.id
         LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber
         <!--监理单位/总包公司/分包单位-->
-        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
         WHERE ssp.isDel=0
         <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
         <if test="infoType !=null">and infoType=#{infoType}</if>
@@ -256,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sur_project sp on ssp.projectId = sp.id
         LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber
         <!--监理单位/总包公司/分包单位-->
-        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
         WHERE ssp.isDel=0
         <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
         and (date(NOW())<![CDATA[ > ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) <![CDATA[ > ]]> date(ssp.nickedTime)))
@@ -808,7 +808,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user fju on fju.phonenumber = ssp.recheckSendUser
         left join sys_dept fjd on fjd.dept_id = fju.dept_id
         <!--监理单位/总包公司/分包单位-->
-        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = ssp.projectId</if>
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = ssp.projectId and spui.del_flag=0</if>
         <where>
             and ssp.isDel=0
             <if test="projectId != null "> and ssp.projectId = #{projectId}</if>