From 5ae9dd838783a81c8e16e1b4496b4ec5151ca10f 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, 5 May 2024 21:42:21 +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 --- .../views/project/projectMeasure/index.vue | 4 +- .../project/projectStandard/standardType.js | 7 - .../statistics/statisticsProject/index.vue | 28 +++ .../views/trouble/pshProblemmodify/index.vue | 5 +- .../trouble/pshProblemmodifyDraft/index.vue | 60 ++++--- .../trouble/sspProblemmodifyDraft/index.vue | 96 ++++++----- .../controller/ProjectViewController.java | 160 ++++++++++++------ .../project/domain/vo/ProjectViewExport.java | 44 +++++ .../trouble/domain/SmzSspProblemmodify.java | 9 - .../com/yanzhu/jh/work/domain/WorkTrain.java | 9 - .../mapper/project/ProjectViewMapper.xml | 12 ++ .../trouble/SmzSspProblemmodifyMapper.xml | 69 ++++++-- .../resources/mapper/work/WorkTrainMapper.xml | 1 - 13 files changed, 352 insertions(+), 152 deletions(-) diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index 4ab419ed..183972cf 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -599,9 +599,9 @@ export default { showInfoType(dict){ if(this.form.measureType){ if(this.form.measureType=='6'){ - return dict.raw.remark == 'gjgc'; + return dict.raw.remark == 'gjgc' || dict.raw.remark == 'all'; }else{ - return !dict.raw.remark; + return !dict.raw.remark || dict.raw.remark == 'all'; } }else{ return false; diff --git a/ruoyi-ui/src/views/project/projectStandard/standardType.js b/ruoyi-ui/src/views/project/projectStandard/standardType.js index 431c282a..0bff4231 100644 --- a/ruoyi-ui/src/views/project/projectStandard/standardType.js +++ b/ruoyi-ui/src/views/project/projectStandard/standardType.js @@ -127,7 +127,6 @@ export default [ { label: "空调主机房", id: 20706 }, ], }, - { label: "建筑电气", id: 208, @@ -168,7 +167,6 @@ export default [ { label: "信息化应用系统", id: 20905 }, ], }, - { label: "建筑节能", id: 210, @@ -236,7 +234,6 @@ export default [ { label: "吊篮", id: 30204 }, ], }, - { label: "模板支撑体系", id: 303, @@ -247,7 +244,6 @@ export default [ { label: "特殊部位支撑", id: 30304 }, ], }, - { label: "道路工程", id: 304, @@ -260,7 +256,6 @@ export default [ { label: "路面施工", id: 30406 }, ], }, - { label: "管道工程", id: 305, @@ -276,7 +271,6 @@ export default [ { label: "顶管顶进", id: 30509 }, ], }, - { label: "桥梁工程", id: 306, @@ -286,7 +280,6 @@ export default [ { label: "上部结构防护施工", id: 30603 }, ], }, - { label: "特种作业", id: 307, diff --git a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue index a3a78401..5b1ab52d 100644 --- a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue +++ b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue @@ -201,6 +201,20 @@ + + + + 整改日志 @@ -156,20 +156,18 @@ @@ -359,8 +358,8 @@ import { } from "@/api/trouble/smzSspProblemmodifyDraft"; export default { - name: "SmzSspProblemmodifyDraft", - dicts: ["ssp_zlyhlx", "ssp_aqyhlx"], + name: "SmzPshProblemmodifyDraft", + dicts: ["ssp_aqyhlx","smz_problem_type"], data() { return { // 遮罩层 @@ -518,6 +517,10 @@ export default { this.$message.error("请上传隐患图片！"); return false; } + if (!row.problemType) { + this.$message.error("请选择问题类型！"); + return false; + } if (!row.dangerType) { this.$message.error("请选择隐患类型！"); return false; @@ -568,6 +571,10 @@ export default { this.$message.error("第" + indexs[i] + "行请上传隐患图片！"); return false; } + if (!row.problemType) { + this.$message.error("第" + indexs[i] + "行请选择问题类型！"); + return false; + } if (!row.dangerType) { this.$message.error("第" + indexs[i] + "行请选择隐患类型！"); return false; @@ -702,14 +709,28 @@ export default { let data = this.smzSspProblemmodifyDraftList; let row = data[indexs - 1]; for (let i = 0; i < data.length; i++) { - if (data[i].index != row.index && data[i].projectId == row.projectId) { - data[i].lordSent = row.lordSent; + if (data[i].index != row.index){ + if(!data[i].projectId){ + data[i].projectId = row.projectId; + data[i].problemArea = row.problemArea; + data[i].problemType = row.problemType; + data[i].lordSent = row.lordSent; data[i].lordSentUser = row.lordSentUser; data[i].copySend = row.copySend; data[i].copySendUser = row.copySendUser; data[i].recheckSend = row.recheckSend; data[i].recheckSendUser = row.recheckSendUser; data[i].nickedTime = row.nickedTime; + }else if(data[i].projectId == row.projectId){ + data[i].problemType = row.problemType; + data[i].lordSent = row.lordSent; + data[i].lordSentUser = row.lordSentUser; + data[i].copySend = row.copySend; + data[i].copySendUser = row.copySendUser; + data[i].recheckSend = row.recheckSend; + data[i].recheckSendUser = row.recheckSendUser; + data[i].nickedTime = row.nickedTime; + } } } this.smzSspProblemmodifyDraftList = data; @@ -740,6 +761,7 @@ export default { createUserDeptName: this.$store.getters.dept.deptName, createTime: this.$dt(new Date()).format("YYYY-MM-DD HH:mm:ss"), isDel: 0, + problemType:'1', }; this.smzSspProblemmodifyDraftList.push(row); this.changeProject(row.projectId, row); diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue index f0ec40e1..2369d951 100644 --- a/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue +++ b/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue @@ -110,7 +110,7 @@ @@ -156,30 +156,26 @@ @@ -360,7 +356,7 @@ import { export default { name: "SmzSspProblemmodifyDraft", - dicts: ["ssp_zlyhlx", "ssp_aqyhlx"], + dicts: ["ssp_zlyhlx", "smz_problem_type"], data() { return { // 遮罩层 @@ -409,7 +405,7 @@ export default { projectDeptOptions: [], projectIds: [], projectUnitUsers: [], - userPhoneNumber:"", + userPhoneNumber: "", }; }, created() { @@ -471,7 +467,7 @@ export default { jobTypeName: "集团公司", }); } - this.projectUnitUsers.push({ projectId: proj, data: list, fjdata:d.data }); + this.projectUnitUsers.push({ projectId: proj, data: list, fjdata: d.data }); }); }); this.smzSspProblemmodifyDraftList = response.rows; @@ -518,6 +514,10 @@ export default { this.$message.error("请上传隐患图片！"); return false; } + if (!row.problemType) { + this.$message.error("请选择问题类型！"); + return false; + } if (!row.dangerType) { this.$message.error("请选择隐患类型！"); return false; @@ -568,6 +568,10 @@ export default { this.$message.error("第" + indexs[i] + "行请上传隐患图片！"); return false; } + if (!row.problemType) { + this.$message.error("第" + indexs[i] + "行请选择问题类型！"); + return false; + } if (!row.dangerType) { this.$message.error("第" + indexs[i] + "行请选择隐患类型！"); return false; @@ -702,14 +706,28 @@ export default { let data = this.smzSspProblemmodifyDraftList; let row = data[indexs - 1]; for (let i = 0; i < data.length; i++) { - if (data[i].index != row.index && data[i].projectId == row.projectId) { - data[i].lordSent = row.lordSent; - data[i].lordSentUser = row.lordSentUser; - data[i].copySend = row.copySend; - data[i].copySendUser = row.copySendUser; - data[i].recheckSend = row.recheckSend; - data[i].recheckSendUser = row.recheckSendUser; - data[i].nickedTime = row.nickedTime; + if (data[i].index != row.index) { + if (!data[i].projectId) { + data[i].projectId = row.projectId; + data[i].problemArea = row.problemArea; + data[i].problemType = row.problemType; + data[i].lordSent = row.lordSent; + data[i].lordSentUser = row.lordSentUser; + data[i].copySend = row.copySend; + data[i].copySendUser = row.copySendUser; + data[i].recheckSend = row.recheckSend; + data[i].recheckSendUser = row.recheckSendUser; + data[i].nickedTime = row.nickedTime; + } else if(data[i].projectId == row.projectId){ + data[i].problemType = row.problemType; + data[i].lordSent = row.lordSent; + data[i].lordSentUser = row.lordSentUser; + data[i].copySend = row.copySend; + data[i].copySendUser = row.copySendUser; + data[i].recheckSend = row.recheckSend; + data[i].recheckSendUser = row.recheckSendUser; + data[i].nickedTime = row.nickedTime; + } } } this.smzSspProblemmodifyDraftList = data; @@ -720,7 +738,8 @@ export default { id: null, projectId: this.projectOptions.length == 1 ? this.projectOptions[0].id : null, infoType: "1", - problemArea: this.projectOptions.length == 1 ? this.projectOptions[0].projectName : null, + problemArea: + this.projectOptions.length == 1 ? this.projectOptions[0].projectName : null, workParts: null, changeInfo: null, lordSent: null, @@ -739,6 +758,7 @@ export default { createUserDeptName: this.$store.getters.dept.deptName, createTime: this.$dt(new Date()).format("YYYY-MM-DD HH:mm:ss"), isDel: 0, + problemType: "1", }; this.smzSspProblemmodifyDraftList.push(row); this.changeProject(row.projectId, row); @@ -771,7 +791,7 @@ export default { jobTypeName: "集团公司", }); } - this.projectUnitUsers.push({ projectId: val, data: list,fjdata:d.data }); + this.projectUnitUsers.push({ projectId: val, data: list, fjdata: d.data }); }); } for (let i = 0; i < this.projectOptions.length; i++) { 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 6bec7d5f..65f78c96 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 @@ -193,18 +193,18 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 10, 17));//单元格合并 - tempCell = tempRow.createCell(18); - tempCell.setCellValue("质量管理"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(19); tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 10, 19));//单元格合并 + tempCell = tempRow.createCell(20); - tempCell.setCellValue(""); + tempCell.setCellValue("质量管理"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(21); @@ -223,10 +223,8 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 18, 24));//单元格合并 - tempCell = tempRow.createCell(25); - tempCell.setCellValue("视频管理"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(26); @@ -237,21 +235,39 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 25, 27));//单元格合并 - tempCell = tempRow.createCell(28); - tempCell.setCellValue("工程管理"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 20, 28));//单元格合并 + tempCell = tempRow.createCell(29); - tempCell.setCellValue(""); + tempCell.setCellValue("视频管理"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(30); tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 28, 30));//单元格合并 + tempCell = tempRow.createCell(31); + tempCell.setCellValue(""); + tempCell.setCellStyle(headerStyle); + + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 29, 31));//单元格合并 + + tempCell = tempRow.createCell(32); + tempCell.setCellValue("工程管理"); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(33); + tempCell.setCellValue(""); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(34); + tempCell.setCellValue(""); + tempCell.setCellStyle(headerStyle); + + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 32, 34));//单元格合并 //合计行 sheet.setColumnWidth(0, 400 * 20 + 323); @@ -285,6 +301,10 @@ public class ProjectViewController extends BaseBuildNodeController{ sheet.setColumnWidth(28, 150 * 20 + 323); sheet.setColumnWidth(29, 150 * 20 + 323); sheet.setColumnWidth(30, 150 * 20 + 323); + 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);// 设置行高 @@ -352,71 +372,87 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 12, 14));//单元格合并 - tempCell = tempRow.createCell(15); - tempCell.setCellValue("特种人员"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(16); - tempCell.setCellValue("应急演练"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 12, 16));//单元格合并 + tempCell = tempRow.createCell(17); - tempCell.setCellValue("教育培训"); + tempCell.setCellValue("特种人员"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(18); - tempCell.setCellValue("质量隐患排查"); + tempCell.setCellValue("应急演练"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(19); - tempCell.setCellValue(""); + tempCell.setCellValue("教育培训"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(20); + tempCell.setCellValue("质量隐患排查"); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(21); tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); - sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 18, 20));//单元格合并 - - tempCell = tempRow.createCell(21); - tempCell.setCellValue("材料取样复试"); - tempCell.setCellStyle(headerStyle); - tempCell = tempRow.createCell(22); - tempCell.setCellValue("材料封样"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(23); - tempCell.setCellValue("实测实量"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(24); - tempCell.setCellValue("举牌验收"); + tempCell.setCellValue(""); tempCell.setCellStyle(headerStyle); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 20, 24));//单元格合并 + tempCell = tempRow.createCell(25); - tempCell.setCellValue("视频监控"); + tempCell.setCellValue("材料取样复试"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(26); - tempCell.setCellValue("AI监控"); + tempCell.setCellValue("材料封样"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(27); - tempCell.setCellValue("项目全景"); + tempCell.setCellValue("实测实量"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(28); - tempCell.setCellValue("项目标准化"); + tempCell.setCellValue("举牌验收"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(29); - tempCell.setCellValue("审批进行中"); + tempCell.setCellValue("视频监控"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(30); + tempCell.setCellValue("AI监控"); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(31); + tempCell.setCellValue("项目全景"); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(32); + tempCell.setCellValue("项目标准化"); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(33); + tempCell.setCellValue("审批进行中"); + tempCell.setCellStyle(headerStyle); + + tempCell = tempRow.createCell(34); tempCell.setCellValue("审批已完成"); tempCell.setCellStyle(headerStyle); @@ -433,12 +469,16 @@ public class ProjectViewController extends BaseBuildNodeController{ headArrays.add("环境预警"); headArrays.add(""); headArrays.add(""); + headArrays.add("集团公司"); + headArrays.add("子公司"); headArrays.add("甲方经理"); headArrays.add("监理单位"); headArrays.add("总包单位"); headArrays.add(""); headArrays.add(""); headArrays.add(""); + headArrays.add("集团公司"); + headArrays.add("子公司"); headArrays.add("甲方经理"); headArrays.add("监理单位"); headArrays.add("总包单位"); @@ -463,7 +503,7 @@ public class ProjectViewController extends BaseBuildNodeController{ if(i<2){ sheet.addMergedRegion(new CellRangeAddress(rowNum-3, rowNum - 1, i, i));//单元格合并 } - if((i>3 && i<6) || (i>9 && i<12) || (i>14 && i<18) || i>20){ + if((i>3 && i<6) || (i>9 && i<12) || (i>16 && i<20) || i>24){ sheet.addMergedRegion(new CellRangeAddress(rowNum-2, rowNum - 1, i, i));//单元格合并 } } @@ -523,78 +563,94 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(12); - tempCell.setCellValue(view.getAqyhpc_jfdb()); + tempCell.setCellValue(view.getAqyhpc_jtgs()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(13); - tempCell.setCellValue(view.getAqyhpc_jldw()); + tempCell.setCellValue(view.getAqyhpc_zrzt()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(14); - tempCell.setCellValue(view.getAqyhpc_zbdw()); + tempCell.setCellValue(view.getAqyhpc_jfdb()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(15); - tempCell.setCellValue(view.getTzry()); + tempCell.setCellValue(view.getAqyhpc_jldw()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(16); - tempCell.setCellValue(view.getYjyl()); + tempCell.setCellValue(view.getAqyhpc_zbdw()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(17); - tempCell.setCellValue(view.getZxpx()); + tempCell.setCellValue(view.getTzry()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(18); - tempCell.setCellValue(view.getZlyhpc_jfdb()); + tempCell.setCellValue(view.getYjyl()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(19); - tempCell.setCellValue(view.getZlyhpc_jldw()); + tempCell.setCellValue(view.getZxpx()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(20); - tempCell.setCellValue(view.getZlyhpc_zbdw()); + tempCell.setCellValue(view.getZlyhpc_jtgs()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(21); - tempCell.setCellValue(view.getClqyfs()); + tempCell.setCellValue(view.getZlyhpc_zrzt()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(22); - tempCell.setCellValue(view.getClfy()); + tempCell.setCellValue(view.getZlyhpc_jfdb()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(23); - tempCell.setCellValue(view.getCscl()); + tempCell.setCellValue(view.getZlyhpc_jldw()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(24); - tempCell.setCellValue(view.getJpys()); + tempCell.setCellValue(view.getZlyhpc_zbdw()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(25); - tempCell.setCellValue(view.getSsjk().equals("0")?"未接入":"已接入"); + tempCell.setCellValue(view.getClqyfs()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(26); - tempCell.setCellValue(view.getAijk().equals("0")?"未接入":"已接入"); + tempCell.setCellValue(view.getClfy()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(27); - tempCell.setCellValue(view.getYssys()); + tempCell.setCellValue(view.getCscl()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(28); - tempCell.setCellValue(view.getBzh()); + tempCell.setCellValue(view.getJpys()); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(29); - tempCell.setCellValue(view.getGcsq()); + tempCell.setCellValue(view.getSsjk().equals("0")?"未接入":"已接入"); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(30); + tempCell.setCellValue(view.getAijk().equals("0")?"未接入":"已接入"); + tempCell.setCellStyle(contentStyle); + + tempCell = tempRow.createCell(31); + tempCell.setCellValue(view.getYssys()); + tempCell.setCellStyle(contentStyle); + + tempCell = tempRow.createCell(32); + 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 728689d3..25944e96 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 @@ -25,6 +25,12 @@ public class ProjectViewExport implements Serializable { @Excel(name = "一切险", width = 20,align = HorizontalAlignment.CENTER, dictType = "sur_project_insurance_state") private String yqx; + @Excel(name = "安全隐患-集团公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String aqyhpc_jtgs; + + @Excel(name = "安全隐患-子公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String aqyhpc_zrzt; + @Excel(name = "安全隐患-甲方经理", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) private String aqyhpc_jfdb; @@ -43,6 +49,12 @@ public class ProjectViewExport implements Serializable { @Excel(name = "教育培训", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) private String zxpx; + @Excel(name = "质量隐患-集团公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String zlyhpc_jtgs; + + @Excel(name = "质量隐患-子公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String zlyhpc_zrzt; + @Excel(name = "质量隐患-甲方经理", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) private String zlyhpc_jfdb; @@ -359,4 +371,36 @@ public class ProjectViewExport implements Serializable { public void setAqyjs(String aqyjs) { this.aqyjs = aqyjs; } + + public String getAqyhpc_jtgs() { + return aqyhpc_jtgs; + } + + public void setAqyhpc_jtgs(String aqyhpc_jtgs) { + this.aqyhpc_jtgs = aqyhpc_jtgs; + } + + public String getAqyhpc_zrzt() { + return aqyhpc_zrzt; + } + + public void setAqyhpc_zrzt(String aqyhpc_zrzt) { + this.aqyhpc_zrzt = aqyhpc_zrzt; + } + + public String getZlyhpc_jtgs() { + return zlyhpc_jtgs; + } + + public void setZlyhpc_jtgs(String zlyhpc_jtgs) { + this.zlyhpc_jtgs = zlyhpc_jtgs; + } + + public String getZlyhpc_zrzt() { + return zlyhpc_zrzt; + } + + public void setZlyhpc_zrzt(String zlyhpc_zrzt) { + this.zlyhpc_zrzt = zlyhpc_zrzt; + } } 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 95c6ff1b..75fb454d 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 @@ -131,7 +131,6 @@ public class SmzSspProblemmodify extends BaseEntity private Integer roleType; private String dangerTypeName; private String deptName;//检查单位 - private String vDel; private String flag;//整改超时标识 private String dangerLabel; @@ -419,14 +418,6 @@ public class SmzSspProblemmodify extends BaseEntity this.roleType = roleType; } - public String getvDel() { - return vDel; - } - - public void setvDel(String vDel) { - this.vDel = vDel; - } - public String getDangerTypeName() { return dangerTypeName; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java index abbbf92c..abab07ab 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java @@ -89,7 +89,6 @@ public class WorkTrain extends BaseEntity private String trainDeptIds; private String trainNatureName; - private String vDel; private Long deptId;//子公司查询使用 private String dataTypeName; @@ -200,14 +199,6 @@ public class WorkTrain extends BaseEntity this.projectName = projectName; } - public String getvDel() { - return vDel; - } - - public void setvDel(String vDel) { - this.vDel = vDel; - } - public String getTrainDeptIds() { return trainDeptIds; } diff --git a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml index 43499b3f..7ff726e2 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml @@ -7,6 +7,12 @@