diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue index d1475829..9eb6c7a3 100644 --- a/ruoyi-ui/src/views/project/checkDetection/index.vue +++ b/ruoyi-ui/src/views/project/checkDetection/index.vue @@ -196,7 +196,7 @@ v-hasPermi="['project:checkDetection:approve']" @click="handleAudit(scope.row)">处理审批 修改 - 删除 @@ -486,9 +486,14 @@ export default { }, projectOptions:[], depts:[], + isAdmin: false, }; }, created() { + let myMinRoles = this.$store.getters.roles; + if (myMinRoles.includes("admin") || myMinRoles.includes("super")) { + this.isAdmin = true; + } this.getList(); this.$api.publics.getMyProjectList({}).then((response) => { this.projectOptions = response.rows; diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue index 484b1d40..53dfbbd1 100644 --- a/ruoyi-ui/src/views/project/materialSeal/index.vue +++ b/ruoyi-ui/src/views/project/materialSeal/index.vue @@ -182,7 +182,7 @@ v-hasPermi="['project:materialSeal:approve']" @click="handleAudit(scope.row)">处理审批 修改 - 删除 @@ -355,9 +355,14 @@ export default { isOnly: false, projectOptions:[], depts:[], + isAdmin: false, }; }, created() { + let myMinRoles = this.$store.getters.roles; + if (myMinRoles.includes("admin") || myMinRoles.includes("super")) { + this.isAdmin = true; + } this.getList(); this.$api.publics.getMyProjectList({}).then((response) => { this.projectOptions = response.rows; diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue index 20ec28b6..3607fb8b 100644 --- a/ruoyi-ui/src/views/project/projectChecking/index.vue +++ b/ruoyi-ui/src/views/project/projectChecking/index.vue @@ -216,7 +216,7 @@ v-hasPermi="['project:projectChecking:approve']" @click="handleAudit(scope.row)">处理审批 修改 - 删除 @@ -405,9 +405,14 @@ export default { previewList: [], projectOptions:[], depts:[], + isAdmin: false, }; }, created() { + let myMinRoles = this.$store.getters.roles; + if (myMinRoles.includes("admin") || myMinRoles.includes("super")) { + this.isAdmin = true; + } this.getList(); this.$api.publics.getMyProjectList({}).then((response) => { this.projectOptions = response.rows; diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index f20fd1c0..7e5a0c17 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -191,7 +191,7 @@ v-hasPermi="['project:projectMeasure:approve']" @click="handleAudit(scope.row)">处理审批 修改 - 删除 @@ -374,9 +374,14 @@ export default { previewList: [], projectOptions:[], depts:[], + isAdmin: false, }; }, created() { + let myMinRoles = this.$store.getters.roles; + if (myMinRoles.includes("admin") || myMinRoles.includes("super")) { + this.isAdmin = true; + } this.getList(); this.$api.publics.getMyProjectList({}).then((response) => { this.projectOptions = response.rows; diff --git a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue index 56ad0916..cbe6dd70 100644 --- a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue +++ b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue @@ -318,6 +318,13 @@ width="90" show-overflow-tooltip /> + diff --git a/ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue b/ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue index b6ab05fe..c0a634e6 100644 --- a/ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue +++ b/ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue @@ -117,6 +117,8 @@ + + diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java index 482d3d97..33bc0fa2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java @@ -115,7 +115,7 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellStyle(titleStyle); //合计行 - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, 30));//单元格合并 + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, 34));//单元格合并 tempRow = sheet.createRow(rowNum++); tempRow.setHeight((short) 400);// 设置行高 @@ -235,7 +235,7 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 19, 27));//单元格合并 + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 19, 28));//单元格合并 tempCell = tempRow.createCell(28); tempCell.setCellValue("视频管理"); @@ -249,7 +249,7 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 28, 30));//单元格合并 + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 29, 31));//单元格合并 tempCell = tempRow.createCell(31); tempCell.setCellValue("工程管理"); @@ -263,7 +263,7 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 31, 33));//单元格合并 + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 32, 34));//单元格合并 //合计行 sheet.setColumnWidth(0, 400 * 20 + 323); @@ -300,6 +300,7 @@ public class ProjectViewController extends BaseBuildNodeController{ sheet.setColumnWidth(31, 150 * 20 + 323); sheet.setColumnWidth(32, 150 * 20 + 323); sheet.setColumnWidth(33, 150 * 20 + 323); + sheet.setColumnWidth(34, 150 * 20 + 323); tempRow = sheet.createRow(rowNum++); tempRow.setHeight((short) 400);// 设置行高 @@ -424,26 +425,30 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(28); - tempCell.setCellValue("视频监控"); + tempCell.setCellValue("工程功能检验"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(29); - tempCell.setCellValue("AI监控"); + tempCell.setCellValue("视频监控"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(30); - tempCell.setCellValue("项目全景"); + tempCell.setCellValue("AI监控"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(31); - tempCell.setCellValue("项目标准化"); + tempCell.setCellValue("项目全景"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(32); - tempCell.setCellValue("审批进行中"); + tempCell.setCellValue("项目标准化"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(33); + tempCell.setCellValue("审批进行中"); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(34); tempCell.setCellValue("审批已完成"); tempCell.setCellStyle(headerStyle); @@ -482,6 +487,7 @@ public class ProjectViewController extends BaseBuildNodeController{ headArrays.add(""); headArrays.add(""); headArrays.add(""); + headArrays.add(""); tempRow = sheet.createRow(rowNum++); tempRow.setHeight((short) 400);// 设置行高 @@ -617,26 +623,30 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(28); - tempCell.setCellValue(view.getSsjk().equals("0")?"未接入":"已接入"); + tempCell.setCellValue(view.getGcgnjy()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(29); - tempCell.setCellValue(view.getAijk().equals("0")?"未接入":"已接入"); + tempCell.setCellValue(view.getSsjk().equals("0")?"未接入":"已接入"); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(30); - tempCell.setCellValue(view.getYssys()); + tempCell.setCellValue(view.getAijk().equals("0")?"未接入":"已接入"); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(31); - tempCell.setCellValue(view.getBzh()); + tempCell.setCellValue(view.getYssys()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(32); - tempCell.setCellValue(view.getGcsq()); + tempCell.setCellValue(view.getBzh()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(33); + tempCell.setCellValue(view.getGcsq()); + tempCell.setCellStyle(contentStyle); + + tempCell = tempRow.createCell(34); tempCell.setCellValue(view.getGcsp()); tempCell.setCellStyle(contentStyle); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewExport.java index 25944e96..40de8768 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewExport.java @@ -76,6 +76,9 @@ public class ProjectViewExport implements Serializable { @Excel(name = "举牌验收", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) private String jpys; + @Excel(name = "工程功能检验", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String gcgnjy; + @Excel(name = "劳务实名", width = 20,align = HorizontalAlignment.CENTER, dictType = "sys_common_devState") private String lwsm; @@ -403,4 +406,12 @@ public class ProjectViewExport implements Serializable { public void setZlyhpc_zrzt(String zlyhpc_zrzt) { this.zlyhpc_zrzt = zlyhpc_zrzt; } + + public String getGcgnjy() { + return gcgnjy; + } + + public void setGcgnjy(String gcgnjy) { + this.gcgnjy = gcgnjy; + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewJlExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewJlExport.java index 87dba91d..decd5e0e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewJlExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewJlExport.java @@ -55,6 +55,12 @@ public class ProjectViewJlExport implements Serializable { @Excel(name = "举牌验收已审批", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) private String jpyswc; + @Excel(name = "工程功能审批中", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String gcgn; + + @Excel(name = "工程功能已审批", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String gcgnwc; + @Excel(name = "工程申请审批中", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) private String gcsq; @@ -204,4 +210,20 @@ public class ProjectViewJlExport implements Serializable { public void setGcsp(String gcsp) { this.gcsp = gcsp; } + + public String getGcgn() { + return gcgn; + } + + public void setGcgn(String gcgn) { + this.gcgn = gcgn; + } + + public String getGcgnwc() { + return gcgnwc; + } + + public void setGcgnwc(String gcgnwc) { + this.gcgnwc = gcgnwc; + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml index 7ff726e2..d67c437c 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml @@ -44,6 +44,7 @@ (select count(1) from sur_project_checking a where a.project_id = sp.id and a.dept_id=pui.unitId and a.is_del=0)as jpys, (select count(1) from sur_project_measure a where a.project_id = sp.id and a.dept_id=pui.unitId and a.is_del=0)as cscl, (select count(1) from sur_project_material_seal a where a.project_id = sp.id and a.dept_id=pui.unitId and a.is_del=0)as clfy, + (select count(1) from sur_project_fun_verify a where a.project_id = sp.id and a.dept_id=pui.unitId and a.is_del=0)as gcgnjy, (select count(1) from sur_project_insurance a where a.project_id = sp.id and a.dept_id=pui.unitId and a.is_del=0 and a.insurance_type=1)as yqx, (select count(1) from sur_project_insurance a where a.project_id = sp.id and a.dept_id=pui.unitId and a.is_del=0 and a.insurance_type=2)as azx, (select count(1) from sur_project_video_config a where a.project_id = sp.id and a.dept_id = pui.unitId and a.is_del=0)as ssjk, @@ -90,6 +91,8 @@ (select count(1) from sur_project_measure a where a.project_id = sp.id and a.is_del=0 and approve_status=4)as csclwc, (select count(1) from sur_project_material_seal a where a.project_id = sp.id and a.is_del=0 and approve_status=1)as clfy, (select count(1) from sur_project_material_seal a where a.project_id = sp.id and a.is_del=0 and approve_status=4)as clfywc, + (select count(1) from sur_project_fun_verify a where a.project_id = sp.id and a.is_del=0 and approve_status=1)as gcgn, + (select count(1) from sur_project_fun_verify a where a.project_id = sp.id and a.is_del=0 and approve_status=4)as gcgnwc, (select count(DISTINCT a.procInsId) from vw_flow_await a where a.businessKey = sp.id and a.taskName like '%监理%')as gcsq, (select count(DISTINCT a.procInsId) from vw_flow_finished a where a.businessKey = sp.id and a.taskName like '%监理%')as gcsp from sur_project sp