提交代码

ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -27,7 +27,8 @@ export default {
         vnodes.push(<span slot='title'>{(title)}</span>)
       }
       let name=context?.parent?.item?.name;
-      if(['Todo','Task','Approve'].includes(name)){                
+      if(['Todo','Task','Approve','Project','CheckDetection','ProjectMeasure','MaterialSeal','ProjectChecking'].includes(name)){     
+        console.log(name);           
         vnodes.push(h('span',{class:"todo_num_tips tips_"+name},1))
       }
     }

ruoyi-ui/src/store/modules/flowtask.js

@@ -20,6 +20,11 @@ const flowtask = {
             let todos=document.querySelectorAll(".tips_Todo");
             let approves=document.querySelectorAll(".tips_Approve");
             let tasks=document.querySelectorAll(".tips_Task");
+            let checkDetections=document.querySelectorAll(".tips_CheckDetection");
+            let projectMeasures=document.querySelectorAll(".tips_ProjectMeasure");
+            let projectCheckings=document.querySelectorAll(".tips_ProjectChecking");
+            let materialSeals=document.querySelectorAll(".tips_MaterialSeal");
+            let surProjects=document.querySelectorAll(".tips_Project");
             //commit('SET_AWAIT_TASK',response.total)
             if(todos.length>0){
               todos.forEach(el=>{
@@ -31,19 +36,70 @@ const flowtask = {
                 }
               });
             }
-            if(approves.length>0){
+            if(tasks.length>0){
-              approves.forEach(el=>{
+              //let sum = parseInt(response.data.todo)+parseInt(response.data.approve);
-                el.innerHTML=response.data.approve;
+              tasks.forEach(el=>{
-                if(response.data.approve>0){
+                el.innerHTML=response.data.todo;
+                if(response.data.todo>0){
                   el.style.display="inline";
                 }else{
                   el.style.display="none";
                 }
               });
             }
-            if(tasks.length>0){
+            // if(approves.length>0){
-              let sum = parseInt(response.data.todo)+parseInt(response.data.approve);
+            //   approves.forEach(el=>{
-              tasks.forEach(el=>{
+            //     el.innerHTML=response.data.approve;
+            //     if(response.data.approve>0){
+            //       el.style.display="inline";
+            //     }else{
+            //       el.style.display="none";
+            //     }
+            //   });
+            // }
+            if(checkDetections.length>0){
+              checkDetections.forEach(el=>{
+                el.innerHTML=response.data.approveQYFS;
+                if(response.data.approveQYFS>0){
+                  el.style.display="inline";
+                }else{
+                  el.style.display="none";
+                }
+              });
+            }
+            if(projectMeasures.length>0){
+              projectMeasures.forEach(el=>{
+                el.innerHTML=response.data.approveSCSL;
+                if(response.data.approveSCSL>0){
+                  el.style.display="inline";
+                }else{
+                  el.style.display="none";
+                }
+              });
+            }
+            if(projectCheckings.length>0){
+              projectCheckings.forEach(el=>{
+                el.innerHTML=response.data.approveJPYS;
+                if(response.data.approveJPYS>0){
+                  el.style.display="inline";
+                }else{
+                  el.style.display="none";
+                }
+              });
+            }
+            if(materialSeals.length>0){
+              materialSeals.forEach(el=>{
+                el.innerHTML=response.data.approveCLFY;
+                if(response.data.approveCLFY>0){
+                  el.style.display="inline";
+                }else{
+                  el.style.display="none";
+                }
+              });
+            }
+            if(surProjects.length>0){
+              let sum = parseInt(response.data.approveQYFS)+parseInt(response.data.approveSCSL)+parseInt(response.data.approveJPYS)+parseInt(response.data.approveCLFY);
+              surProjects.forEach(el=>{
                 el.innerHTML=sum;
                 if(sum>0){
                   el.style.display="inline";

ruoyi-ui/src/views/project/checkDetection/index.vue

@@ -294,7 +294,7 @@
         align="center"
         fixed="right"
         class-name="small-padding fixed-width"
-        width="120"
+        width="150"
       >
         <template slot-scope="scope">
           <el-button
@@ -315,6 +315,15 @@
             @click="handleAuditinfo(scope.row)"
             >审批日志</el-button
           >
+          <el-button
+            v-if="scope.row.approveStatus == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-finished"
+            v-hasPermi="['project:checkDetection:approve']"
+            @click="handleAudit(scope.row)"
+            >处理审批</el-button
+          >
           <el-button
             v-if="scope.row.checkState == '1'"
             size="mini"
@@ -532,6 +541,7 @@
       </div>
     </el-dialog>
     <indexDrawer ref="indexDrawer"/>
+    <approveCheckDetectionDrawer ref="approveCheckDetectionDrawer" :closeCallBack="getList"/>
   </div>
 </template>
 
@@ -546,11 +556,13 @@ import {
   updateCheckDetectionResult,
 } from "@/api/project/checkDetection";
 import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
+import approveCheckDetectionDrawer from "../projectAuditinfo/approveCheckDetectionDrawer.vue";
 
 export default {
   name: "CheckDetection",
   components: {
     indexDrawer,
+    approveCheckDetectionDrawer,
   },
   dicts: ["sys_yes_no","project_check_status", "project_checking_result", "check_detection_check_type"],
   data() {
@@ -850,6 +862,11 @@ export default {
       row.title="材料取样复试";
       row.logType="1";
       this.$refs.indexDrawer.show(row);
+    },
+    /** 处理审批 */
+    handleAudit(row){
+      row.typeName="材料封样";
+      this.$refs.approveCheckDetectionDrawer.show(row);
     }
   },
 };

ruoyi-ui/src/views/project/materialSeal/index.vue

@@ -290,6 +290,7 @@
         align="center"
         class-name="small-padding fixed-width"
         fixed="right"
+        width="150"
       >
         <template slot-scope="scope">
           <el-button
@@ -300,6 +301,15 @@
             @click="handleAuditinfo(scope.row)"
             >审批日志</el-button
           >
+          <el-button
+            v-if="scope.row.approveStatus == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-finished"
+            v-hasPermi="['project:materialSeal:approve']"
+            @click="handleAudit(scope.row)"
+            >处理审批</el-button
+          >
           <el-button
             v-if="scope.row.approveStatus!='4'"
             size="mini"
@@ -429,6 +439,7 @@
     </el-dialog>
     <el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="previewList" />
     <indexDrawer ref="indexDrawer"></indexDrawer>
+    <approveMaterialSealDrawer ref="approveMaterialSealDrawer" :closeCallBack="getList"/>
   </div>
 </template>
 
@@ -443,12 +454,14 @@ import {
 } from "@/api/project/materialSeal";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
+import approveMaterialSealDrawer from "../projectAuditinfo/approveMaterialSealDrawer.vue";
 
 export default {
   name: "MaterialSeal",
   components: {
     indexDrawer,
     ElImageViewer,
+    approveMaterialSealDrawer,
   },
   dicts: ["sys_common_isdel","project_check_status","project_checking_result"],
   data() {
@@ -758,6 +771,11 @@ export default {
       row.title="材料封样";
       row.logType="4";
       this.$refs.indexDrawer.show(row);
+    },
+    /** 处理审批 */
+    handleAudit(row){
+      row.typeName="材料封样";
+      this.$refs.approveMaterialSealDrawer.show(row);
     }
   },
 };

ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue

@@ -9,7 +9,7 @@
         size="50%"
       >
         <template slot="title">
-          <div>{{ title + " 【提交审批】" }}</div>
+          <div>{{ title + " 【处理审批】" }}</div>
         </template>
         <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
             <el-form-item label="项目名称">
@@ -66,7 +66,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-form-item label="实验室名称">
+            <el-form-item label="实验室名">
                 <span>{{ dataInfo.laboratoryName }}</span>
             </el-form-item>
             <el-form-item label="送检时间">
@@ -132,7 +132,7 @@
             type: Function,
         },
     },
-    dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
+    dicts: ["project_checking_result", "check_detection_check_type"],
     data() {
       return {
         showViewer: false,

ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue

@@ -9,7 +9,7 @@
         size="50%"
       >
         <template slot="title">
-          <div>{{ title + " 【提交审批】" }}</div>
+          <div>{{ title + " 【处理审批】" }}</div>
         </template>
         <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
             <el-form-item label="项目名称">
@@ -110,7 +110,7 @@
             type: Function,
         },
     },
-    dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
+    dicts: ["project_checking_result"],
     data() {
       return {
         showViewer: false,

ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue

@@ -9,7 +9,7 @@
         size="50%"
       >
         <template slot="title">
-          <div>{{ title + " 【提交审批】" }}</div>
+          <div>{{ title + " 【处理审批】" }}</div>
         </template>
         <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
             <el-form-item label="项目名称">
@@ -126,7 +126,7 @@
             type: Function,
         },
     },
-    dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
+    dicts: ["project_checking_result"],
     data() {
       return {
         showViewer: false,

ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue

@@ -9,7 +9,7 @@
         size="50%"
       >
         <template slot="title">
-          <div>{{ title + " 【提交审批】" }}</div>
+          <div>{{ title + " 【处理审批】" }}</div>
         </template>
         <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
             <el-form-item label="项目名称">
@@ -134,7 +134,7 @@
             type: Function,
         },
     },
-    dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
+    dicts: ["project_measure_type", "project_checking_result", "project_measure_info_type"],
     data() {
       return {
         showViewer: false,

ruoyi-ui/src/views/project/projectChecking/index.vue

@@ -260,7 +260,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="120"
+        width="150"
         fixed="right"
       >
         <template slot-scope="scope">
@@ -281,6 +281,15 @@
             @click="handleAuditinfo(scope.row)"
             >审批日志</el-button
           >
+          <el-button
+            v-if="scope.row.approveStatus == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-finished"
+            v-hasPermi="['project:projectChecking:approve']"
+            @click="handleAudit(scope.row)"
+            >处理审批</el-button
+          >
           <el-button
           v-if="scope.row.approveStatus!='4'"
             size="mini"
@@ -406,6 +415,7 @@
     </el-dialog>
     <el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="previewList" />
     <index-drawer ref="indexDrawer"></index-drawer>
+    <approveCheckingDrawer ref="approveCheckingDrawer" :closeCallBack="getList"/>
   </div>
 </template>
 
@@ -420,12 +430,14 @@ import {
 } from "@/api/project/projectChecking";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
+import approveCheckingDrawer from "../projectAuditinfo/approveCheckingDrawer.vue";
 
 export default {
   name: "ProjectChecking",
   components: {
     indexDrawer,
     ElImageViewer,
+    approveCheckingDrawer,
   },
   dicts: ["sys_common_isdel","project_check_status", "project_checking_result"],
   data() {
@@ -613,7 +625,7 @@ export default {
         this.title = "修改项目验收";
       });
       this.$api.publics
-        .selectProjectAllUnitUser({
+        .selectProjectUnitUser({
           unitType: "4",
           projectId: row.projectId,
         })
@@ -698,6 +710,11 @@ export default {
       row.title="举牌验收";
       row.logType="3";
       this.$refs.indexDrawer.show(row);
+    },
+    /** 处理审批 */
+    handleAudit(row){
+      row.typeName="举牌验收";
+      this.$refs.approveCheckingDrawer.show(row);
     }
   },
 };

ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue

@@ -443,7 +443,7 @@ export default {
           }
         });
       this.$api.publics
-        .selectProjectAllUnitUser({
+        .selectProjectUnitUser({
           unitType: "4",
           projectId: project.id,
         })

ruoyi-ui/src/views/project/projectMeasure/index.vue

@@ -291,7 +291,7 @@
         align="center"
         class-name="small-padding fixed-width"
         fixed="right"
-        width="130"
+        width="150"
       >
         <template slot-scope="scope">
           <el-button
@@ -311,6 +311,15 @@
             @click="handleAuditinfo(scope.row)"
             >审批日志</el-button
           >
+          <el-button
+            v-if="scope.row.approveStatus == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-finished"
+            v-hasPermi="['project:projectMeasure:approve']"
+            @click="handleAudit(scope.row)"
+            >处理审批</el-button
+          >
           <el-button
           v-if="scope.row.approveStatus != '4'"
             size="mini"
@@ -475,6 +484,7 @@
     </el-dialog>
     <el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="previewList" />
     <indexDrawer ref="indexDrawer"></indexDrawer>
+    <approveMeasureDrawer ref="approveMeasureDrawer" :closeCallBack="getList"/>
   </div>
 </template>
 
@@ -489,12 +499,14 @@ import {
 } from "@/api/project/projectMeasure";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
+import approveMeasureDrawer from "../projectAuditinfo/approveMeasureDrawer.vue";
 
 export default {
   name: "ProjectMeasure",
   components: {
     indexDrawer,
     ElImageViewer,
+    approveMeasureDrawer,
   },
   dicts: [
     "project_check_status",
@@ -696,7 +708,7 @@ export default {
         this.title = "修改实测实量";
       });
       this.$api.publics
-        .selectProjectAllUnitUser({
+        .selectProjectUnitUser({
           unitType: "4",
           projectId: row.projectId,
         })
@@ -781,6 +793,11 @@ export default {
       row.title="实测实量";
       row.logType="2";
       this.$refs.indexDrawer.show(row);
+    },
+    /** 处理审批 */
+    handleAudit(row){
+      row.typeName="实测实量";
+      this.$refs.approveMeasureDrawer.show(row);
     }
   },
 };

ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue

@@ -494,7 +494,7 @@ export default {
           }
         });
       this.$api.publics
-        .selectProjectAllUnitUser({
+        .selectProjectUnitUser({
           unitType: "4",
           projectId: project.id,
         })

yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java

@@ -56,6 +56,7 @@ public class SurProjectCheckDetectionController extends BaseController
             surProjectCheckDetection.setNowDept(Convert.toStr(getDeptId()));
         }
         surProjectCheckDetection.setNowUser(Convert.toStr(getUserId()));
+        surProjectCheckDetection.setNowUserName(getUsername());
         List<SurProjectCheckDetection> list = surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection);
         return getDataTable(list);
     }
@@ -73,6 +74,7 @@ public class SurProjectCheckDetectionController extends BaseController
             surProjectCheckDetection.setNowDept(Convert.toStr(getDeptId()));
         }
         surProjectCheckDetection.setNowUser(Convert.toStr(getUserId()));
+        surProjectCheckDetection.setNowUserName(getUsername());
         return success(surProjectCheckDetectionService.findGroupCountByApprove(surProjectCheckDetection));
     }
 

yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMaterialSealController.java

@@ -56,6 +56,7 @@ public class SurProjectMaterialSealController extends BaseController
             surProjectMaterialSeal.setNowDept(Convert.toStr(getDeptId()));
         }
         surProjectMaterialSeal.setNowUser(Convert.toStr(getUserId()));
+        surProjectMaterialSeal.setNowUserName(getUsername());
         List<SurProjectMaterialSeal> list = surProjectMaterialSealService.selectSurProjectMaterialSealList(surProjectMaterialSeal);
         return getDataTable(list);
     }
@@ -74,6 +75,7 @@ public class SurProjectMaterialSealController extends BaseController
             surProjectMaterialSeal.setNowDept(Convert.toStr(getDeptId()));
         }
         surProjectMaterialSeal.setNowUser(Convert.toStr(getUserId()));
+        surProjectMaterialSeal.setNowUserName(getUsername());
         return success(surProjectMaterialSealService.findGroupCountByApprove(surProjectMaterialSeal));
     }
 

yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMeasureController.java

@@ -74,6 +74,7 @@ public class SurProjectMeasureController extends BaseController
             surProjectMeasure.setNowDept(Convert.toStr(getDeptId()));
         }
         surProjectMeasure.setNowUser(Convert.toStr(getUserId()));
+        surProjectMeasure.setNowUserName(getUsername());
         return success(surProjectMeasureService.findGroupCountByApprove(surProjectMeasure));
     }
 
@@ -92,6 +93,7 @@ public class SurProjectMeasureController extends BaseController
             surProjectMeasure.setNowDept(Convert.toStr(getDeptId()));
         }
         surProjectMeasure.setNowUser(Convert.toStr(getUserId()));
+        surProjectMeasure.setNowUserName(getUsername());
         List<SurProjectMeasure> list = surProjectMeasureService.selectSurProjectMeasureList(surProjectMeasure);
         ExcelUtil<SurProjectMeasure> util = new ExcelUtil<SurProjectMeasure>(SurProjectMeasure.class);
         util.exportExcel(response, list, "实测实量数据");

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java

@@ -143,11 +143,27 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
             dataMap.put("todo",0);
         }
         List<Map<String, Object>> approveList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity);
+        int a=0,b=0,c=0,d=0;
         if(approveList!=null){
+            for(Map<String, Object> map:approveList){
+                if(PublicStateEnum.AUDIT_TYPE_QYFS.getCode().equals(map.get("type"))){
+                    a++;
+                }else if(PublicStateEnum.AUDIT_TYPE_SCSL.getCode().equals(map.get("type"))){
+                    b++;
+                }else if(PublicStateEnum.AUDIT_TYPE_JPYS.getCode().equals(map.get("type"))){
+                    c++;
+                }else if(PublicStateEnum.AUDIT_TYPE_CLFY.getCode().equals(map.get("type"))){
+                    d++;
+                }
+            }
             dataMap.put("approve",approveList.size());
         }else{
             dataMap.put("approve",0);
         }
+        dataMap.put("approveQYFS",a);
+        dataMap.put("approveSCSL",b);
+        dataMap.put("approveJPYS",c);
+        dataMap.put("approveCLFY",d);
         return dataMap;
     }
 

yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml

@@ -66,7 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sur_project sp on sp.id = a.project_id
         left JOIN sys_user u on a.create_by = u.user_name
         left JOIN sys_dept d on d.dept_id = u.dept_id
-        where a.witness_user like concat('%', #{nowUserName}, '%')
+        where 1=1
+        <!--管理员放开查询条件-->
+        <if test='nowRole != "1" and nowRole != "2"'> and a.witness_user like concat('%', #{nowUserName}, '%')</if>
         <if test='activeName == "await"'> and a.approve_status='1'</if>
         <if test='activeName == "finished"'> and a.approve_status in ('3','4')</if>
         <if test="businessKey != null  and businessKey != ''"> and sp.id = #{businessKey}</if>

yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml

@@ -49,14 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSurProjectCheckDetectionList" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
         <include refid="selectSurProjectCheckDetectionVo"/>
-        <!--监理单位/总包公司/分包单位-->
-        <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 == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
         <where>
             and spcd.is_del='0'
             <if test="projectId != null "> and spcd.project_id = #{projectId}</if>
-            <if test="deptId != null "> and spcd.dept_id = #{deptId}</if>
+            <if test="deptId != null "> and (spcd.dept_id = #{deptId} or (spcd.witness_user like concat('%', #{nowUserName}, '%') and spcd.approve_status is not null))</if>
             <if test="checkType != null  and checkType != ''"> and spcd.check_type = #{checkType}</if>
             <if test="approveStatus != null  and approveStatus != ''"> and spcd.approve_status = #{approveStatus}</if>
             <if test="materialName != null  and materialName != ''"> and spcd.material_name like concat('%', #{materialName}, '%')</if>
@@ -72,25 +68,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
             <!--子部门数据-->
-            <if test='nowRole == "4"'> and (sp.deptId = #{nowDept} or spcd.witness_user=#{nowUserName})</if>
+            <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
             <!--监理单位/总包公司/分包单位查询当前关联数据-->
-            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and (spui.unitId = #{nowDept} or spcd.witness_user=#{nowUserName})</if>
+            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )</if>
             <!--普通用户查询项目人员-->
-            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spcd.witness_user=#{nowUserName})</if>
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'>
+                and (sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
+                or (spcd.witness_user like concat('%', #{nowUserName}, '%') and spcd.approve_status is not null)
+                )
+            </if>
             <if test='activeName == "jxz"'> and (spcd.approve_status != '4' or spcd.approve_status is null)</if>
             <if test='activeName == "ywc"'> and spcd.approve_status = '4'</if>
         </where>
-        order by spcd.check_time desc
+        order by spcd.approve_status, spcd.check_time desc
     </select>
 
     <select id="queryGroupCount" parameterType="SurProjectCheckDetection" resultType="map">
         select spcd.check_state, count(1) as total 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
-        <!--监理单位/总包公司/分包单位-->
-        <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 == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
         <where>
             and spcd.is_del='0'
             <if test="projectId != null "> and spcd.project_id = #{projectId}</if>
@@ -109,11 +105,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
             <!--子部门数据-->
-            <if test='nowRole == "4"'> and (sp.deptId = #{nowDept} or spcd.witness_user=#{nowUserName})</if>
+            <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
             <!--监理单位/总包公司/分包单位查询当前关联数据-->
-            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and (spui.unitId = #{nowDept} or spcd.witness_user=#{nowUserName})</if>
+            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )</if>
             <!--普通用户查询项目人员-->
-            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spcd.witness_user=#{nowUserName})</if>
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'>
+                and (sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
+                    or spcd.witness_user like concat('%', #{nowUserName}, '%')
+                )
+            </if>
             GROUP BY check_state
         </where>
     </select>

yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml

@@ -46,14 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name from sur_project_checking spc
         left join sur_project sp on spc.project_id = sp.id
         left join sys_dept sd on sd.dept_id = spc.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>
         <where>
             and spc.is_del=0
             <if test="projectId != null "> and spc.project_id = #{projectId}</if>
             <if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
             <if test="deptId != null ">
-                and spc.dept_id = #{deptId}
+                and (spc.dept_id = #{deptId} or spc.supervise_user like concat('%', #{nowUserName}, '%'))
             </if>
             <if test="deptName != null and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="groupDeptId != null "> and spc.group_dept_id = #{groupDeptId}</if>
@@ -73,11 +71,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
             <!--子部门数据-->
-            <if test='nowRole == "4"'> and (sp.deptId = #{nowDept} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName})</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 == "5" or nowRole == "6" or nowRole == "7"'> and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )</if>
             <!--普通用户查询项目人员-->
-            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and (spc.create_by = #{nowUserName} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName})</if>
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'>
+                and (sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
+                or spc.supervise_user like concat('%', #{nowUserName}, '%')
+                )
+            </if>
             <if test='activeName == "jxz"'> and spc.approve_status != '4'</if>
             <if test='activeName == "ywc"'> and spc.approve_status = '4'</if>
         </where>

yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             and spme.is_del='0'
             <if test="projectId != null "> and spme.project_id = #{projectId}</if>
-            <if test="deptId != null "> and spme.dept_id = #{deptId}</if>
+            <if test="deptId != null "> and (spme.dept_id = #{deptId} or spme.witness_user like concat('%', #{nowUserName}, '%'))</if>
             <if test="imageUrls != null  and imageUrls != ''"> and spme.image_urls = #{imageUrls}</if>
             <if test="materialName != null  and materialName != ''"> and spme.material_name like concat('%', #{materialName}, '%')</if>
             <if test="usePosition != null  and usePosition != ''"> and spme.use_position like concat('%', #{usePosition}, '%')</if>
@@ -62,9 +62,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!--子部门数据-->
             <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 == "5" or nowRole == "6" or nowRole == "7"'> and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )</if>
             <!--普通用户查询项目人员-->
-            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.user_id = #{nowUser} and spu.is_del=0</if>
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'>
+                and (sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
+                or spme.witness_user like concat('%', #{nowUserName}, '%')
+                )
+            </if>
             <if test='activeName == "jxz"'> and spme.approve_status != '4'</if>
             <if test='activeName == "ywc"'> and spme.approve_status = '4'</if>
         </where>

yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml

@@ -46,16 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSurProjectMeasureList" parameterType="SurProjectMeasure" resultMap="SurProjectMeasureResult">
         <include refid="selectSurProjectMeasureVo"/>
-        <!--监理单位/总包公司/分包单位-->
-        <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 == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
         <where>
             and spm.is_del='0'
             <if test="projectId != null "> and spm.project_id = #{projectId}</if>
             <if test="deptId != null ">
-                <if test="nowUserName == null or nowUserName == ''">and spm.dept_id = #{deptId}</if>
+                and (spm.dept_id = #{deptId} or spm.supervise_user like concat('%', #{nowUserName}, '%'))
-                <if test="nowUserName != null and nowUserName != ''">and (spm.dept_id = #{deptId} or spm.quality_user=#{nowUserName} or spm.supervise_user=#{nowUserName})</if>
             </if>
             <if test="measureType != null  and measureType != ''"> and spm.measure_type = #{measureType}</if>
             <if test="measurePosition != null  and measurePosition != ''"> and spm.measure_position like concat('%', #{measurePosition}, '%')</if>
@@ -70,11 +65,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
             <!--子部门数据-->
-            <if test='nowRole == "4"'> and (sp.deptId = #{nowDept} or spm.quality_user=#{nowUserName} or spm.supervise_user=#{nowUserName})</if>
+            <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
             <!--监理单位/总包公司/分包单位查询当前关联数据-->
-            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and (spui.unitId = #{nowDept} or spm.quality_user=#{nowUserName} or spm.supervise_user=#{nowUserName})</if>
+            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )</if>
             <!--普通用户查询项目人员-->
-            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spm.quality_user=#{nowUserName} or spm.supervise_user=#{nowUserName})</if>
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'>
+                and (sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
+                or spm.supervise_user like concat('%', #{nowUserName}, '%')
+                )
+            </if>
             <if test='activeName == "jxz"'> and spm.approve_status != '4'</if>
             <if test='activeName == "ywc"'> and spm.approve_status = '4'</if>
         </where>