From 02e676c6a7090fc1d8afe046eb17b106d6698aba 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: Sun, 24 Sep 2023 21:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/layout/components/Sidebar/Item.vue | 5 +-
ruoyi-ui/src/store/modules/flowtask.js | 70 +++++++++++++++++--
.../views/project/checkDetection/index.vue | 19 ++++-
.../src/views/project/materialSeal/index.vue | 18 +++++
.../approveCheckDetectionDrawer.vue | 6 +-
.../approveCheckingDrawer.vue | 4 +-
.../approveMaterialSealDrawer.vue | 4 +-
.../projectAuditinfo/approveMeasureDrawer.vue | 4 +-
.../views/project/projectChecking/index.vue | 21 +++++-
.../projectChecking/projectCheckingDrawer.vue | 2 +-
.../views/project/projectMeasure/index.vue | 21 +++++-
.../projectMeasure/projectMeasureDrawer.vue | 2 +-
.../SurProjectCheckDetectionController.java | 2 +
.../SurProjectMaterialSealController.java | 2 +
.../SurProjectMeasureController.java | 2 +
.../impl/SurProjectAuditinfoServiceImpl.java | 16 +++++
.../project/SurProjectAuditinfoMapper.xml | 4 +-
.../SurProjectCheckDetectionMapper.xml | 32 ++++-----
.../project/SurProjectCheckingMapper.xml | 14 ++--
.../project/SurProjectMaterialSealMapper.xml | 10 ++-
.../project/SurProjectMeasureMapper.xml | 17 +++--
21 files changed, 215 insertions(+), 60 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
index ad1bec5d..d2109f5c 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
@@ -27,8 +27,9 @@ export default {
vnodes.push({(title)})
}
let name=context?.parent?.item?.name;
- if(['Todo','Task','Approve'].includes(name)){
- vnodes.push(h('span',{class:"todo_num_tips tips_"+name},1))
+ 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))
}
}
return vnodes
diff --git a/ruoyi-ui/src/store/modules/flowtask.js b/ruoyi-ui/src/store/modules/flowtask.js
index 2553cba1..17f70507 100644
--- a/ruoyi-ui/src/store/modules/flowtask.js
+++ b/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){
- approves.forEach(el=>{
- el.innerHTML=response.data.approve;
- if(response.data.approve>0){
+ if(tasks.length>0){
+ //let sum = parseInt(response.data.todo)+parseInt(response.data.approve);
+ tasks.forEach(el=>{
+ el.innerHTML=response.data.todo;
+ if(response.data.todo>0){
el.style.display="inline";
}else{
el.style.display="none";
}
});
}
- if(tasks.length>0){
- let sum = parseInt(response.data.todo)+parseInt(response.data.approve);
- tasks.forEach(el=>{
+ // if(approves.length>0){
+ // approves.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";
diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue
index d71d0d5a..79d7075f 100644
--- a/ruoyi-ui/src/views/project/checkDetection/index.vue
+++ b/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"
>
审批日志
+ 处理审批
+
@@ -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);
}
},
};
diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue
index ead29870..08033c89 100644
--- a/ruoyi-ui/src/views/project/materialSeal/index.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/index.vue
@@ -290,6 +290,7 @@
align="center"
class-name="small-padding fixed-width"
fixed="right"
+ width="150"
>
审批日志
+ 处理审批
+
@@ -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);
}
},
};
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue
index f4922dbf..5140db1c 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue
@@ -9,7 +9,7 @@
size="50%"
>
- {{ title + " 【提交审批】" }}
+ {{ title + " 【处理审批】" }}
@@ -66,7 +66,7 @@
-
+
{{ dataInfo.laboratoryName }}
@@ -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,
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue
index ced6477c..163870c7 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue
@@ -9,7 +9,7 @@
size="50%"
>
- {{ title + " 【提交审批】" }}
+ {{ title + " 【处理审批】" }}
@@ -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,
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue
index 1a0ce6ab..bcf4ffce 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue
@@ -9,7 +9,7 @@
size="50%"
>
- {{ title + " 【提交审批】" }}
+ {{ title + " 【处理审批】" }}
@@ -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,
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue
index 6529f205..69b53c75 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue
@@ -9,7 +9,7 @@
size="50%"
>
- {{ title + " 【提交审批】" }}
+ {{ title + " 【处理审批】" }}
@@ -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,
diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue
index bde6c294..83f45b6d 100644
--- a/ruoyi-ui/src/views/project/projectChecking/index.vue
+++ b/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"
>
@@ -281,6 +281,15 @@
@click="handleAuditinfo(scope.row)"
>审批日志
+ 处理审批
+
@@ -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);
}
},
};
diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
index 83824440..bd761722 100644
--- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
@@ -443,7 +443,7 @@ export default {
}
});
this.$api.publics
- .selectProjectAllUnitUser({
+ .selectProjectUnitUser({
unitType: "4",
projectId: project.id,
})
diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index d7ea11d1..aa01248c 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/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"
>
审批日志
+ 处理审批
+
@@ -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);
}
},
};
diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index 63cb27d2..537a1e0c 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -494,7 +494,7 @@ export default {
}
});
this.$api.publics
- .selectProjectAllUnitUser({
+ .selectProjectUnitUser({
unitType: "4",
projectId: project.id,
})
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java
index a52bcdde..e2d4ae6f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java
+++ b/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 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));
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMaterialSealController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMaterialSealController.java
index 1792ca83..a32d209f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMaterialSealController.java
+++ b/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 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));
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMeasureController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMeasureController.java
index 3ea488a3..b92f1f56 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMeasureController.java
+++ b/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 list = surProjectMeasureService.selectSurProjectMeasureList(surProjectMeasure);
ExcelUtil util = new ExcelUtil(SurProjectMeasure.class);
util.exportExcel(response, list, "实测实量数据");
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
index 99ac86c4..cfba331a 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
+++ b/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> approveList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity);
+ int a=0,b=0,c=0,d=0;
if(approveList!=null){
+ for(Map 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;
}
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
index 14db64a8..5c1a9e63 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
+++ b/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
+
+ and a.witness_user like concat('%', #{nowUserName}, '%')
and a.approve_status='1'
and a.approve_status in ('3','4')
and sp.id = #{businessKey}
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
index 6a31be4d..bc382ad1 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
@@ -49,14 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
index ec65ae89..76f66c53 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
+++ b/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
-
- left join sur_project_unit_info spui on spui.projectId = sp.id
and spc.is_del=0
and spc.project_id = #{projectId}
and sp.projectName like concat('%', #{projectName}, '%')
- and spc.dept_id = #{deptId}
+ and (spc.dept_id = #{deptId} or spc.supervise_user like concat('%', #{nowUserName}, '%'))
and sd.dept_name like concat('%', #{deptName}, '%')
and spc.group_dept_id = #{groupDeptId}
@@ -73,11 +71,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sp.deptId = #{projectDeptId}
- and (sp.deptId = #{nowDept} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName})
+ and sp.deptId = #{nowDept}
- and spui.unitId = #{nowDept}
+ and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )
- and (spc.create_by = #{nowUserName} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName})
+
+ 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}, '%')
+ )
+
and spc.approve_status != '4'
and spc.approve_status = '4'
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
index 32f45215..19c4ffcf 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and spme.is_del='0'
and spme.project_id = #{projectId}
- and spme.dept_id = #{deptId}
+ and (spme.dept_id = #{deptId} or spme.witness_user like concat('%', #{nowUserName}, '%'))
and spme.image_urls = #{imageUrls}
and spme.material_name like concat('%', #{materialName}, '%')
and spme.use_position like concat('%', #{usePosition}, '%')
@@ -62,9 +62,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sp.deptId = #{nowDept}
- and spui.unitId = #{nowDept}
+ and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )
- and spu.user_id = #{nowUser} and spu.is_del=0
+
+ 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}, '%')
+ )
+
and spme.approve_status != '4'
and spme.approve_status = '4'
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
index de568f46..d1b1949a 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
@@ -46,16 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"