From e546f71cce824d5fa011091f5ec15a69123f1cd9 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, 26 Nov 2023 11:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/statistics/statisticsProject/index.js | 9 + .../statistics/statisticsProject/index.vue | 1 + .../statistics/statisticsProjectJl/index.vue | 203 +++++++++++++++++ .../controller/ProjectViewController.java | 36 +++ .../domain/vo/ProjectViewJlExport.java | 207 ++++++++++++++++++ .../jh/project/mapper/ProjectViewMapper.java | 8 + .../project/service/IProjectViewService.java | 8 + .../service/impl/ProjectViewServiceImpl.java | 11 + .../mapper/project/ProjectViewMapper.xml | 33 +++ 9 files changed, 516 insertions(+) create mode 100644 ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewJlExport.java diff --git a/ruoyi-ui/src/api/statistics/statisticsProject/index.js b/ruoyi-ui/src/api/statistics/statisticsProject/index.js index 3be4be66..a67a3816 100644 --- a/ruoyi-ui/src/api/statistics/statisticsProject/index.js +++ b/ruoyi-ui/src/api/statistics/statisticsProject/index.js @@ -16,4 +16,13 @@ export function exportView(query) { method: 'get', params: query }) +} + +// 监理单位项目数据汇总 +export function selectStatisticsJlProjectList(query) { + return request({ + url: '/statistics/project/selectStatisticsJlProjectList', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue index 3f1a10f1..868635b1 100644 --- a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue +++ b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue @@ -79,6 +79,7 @@ plain icon="el-icon-download" size="mini" + v-hasPermi="['statistics:project:export']" @click="handleExport" >导出 diff --git a/ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue b/ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue new file mode 100644 index 00000000..a682be44 --- /dev/null +++ b/ruoyi-ui/src/views/statistics/statisticsProjectJl/index.vue @@ -0,0 +1,203 @@ + + + + \ No newline at end of file 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 4a8c6880..730c7436 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 @@ -11,12 +11,14 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.vo.ProjectViewExport; +import com.yanzhu.jh.project.domain.vo.ProjectViewJlExport; import com.yanzhu.jh.project.service.IProjectViewService; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -47,6 +49,7 @@ public class ProjectViewController extends BaseBuildNodeController{ @Autowired IProjectViewService projectViewService; + @PreAuthorize("@ss.hasPermi('statistics:project:list')") @GetMapping("/selectStatisticsProjectList") public TableDataInfo selectStatisticsProjectList(SurProject surProject) { @@ -58,6 +61,8 @@ public class ProjectViewController extends BaseBuildNodeController{ return getDataTable(list); } + @PreAuthorize("@ss.hasPermi('statistics:project:export')") + @Log(title = "项目数据汇总", businessType = BusinessType.EXPORT) @PostMapping("/exportView") public void exportView(HttpServletResponse response, @RequestBody SurProject surProject) { @@ -612,5 +617,36 @@ public class ProjectViewController extends BaseBuildNodeController{ } } + /** + * 监理单位项目数据汇总 + */ + @PreAuthorize("@ss.hasPermi('statistics:project:list')") + @GetMapping("/selectStatisticsJlProjectList") + public TableDataInfo selectStatisticsJlProjectList(SurProject surProject) + { + surProject.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProject.getNowRole())){ + surProject.setDeptId(sysDeptService.getZGSDeptId(getDeptId())); + } + List list = projectViewService.selectStatisticsJlProjectList(surProject); + return getDataTable(list); + } + + /** + * 监理单位项目数据汇总 + */ + @PreAuthorize("@ss.hasPermi('statistics:project:export')") + @Log(title = "监理数据汇总", businessType = BusinessType.EXPORT) + @PostMapping("/exportviewJl") + public void exportviewJl(HttpServletResponse response, SurProject surProject) + { + surProject.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProject.getNowRole())){ + surProject.setDeptId(sysDeptService.getZGSDeptId(getDeptId())); + } + List list = projectViewService.selectStatisticsJlProjectList(surProject); + ExcelUtil util = new ExcelUtil(ProjectViewJlExport.class); + util.exportExcel(response, list, "监理数据汇总"); + } } 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 new file mode 100644 index 00000000..acea2958 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewJlExport.java @@ -0,0 +1,207 @@ +package com.yanzhu.jh.project.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import org.apache.poi.ss.usermodel.HorizontalAlignment; + +import java.io.Serializable; + +public class ProjectViewJlExport implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long projectId; + + private Long unitId; + + @Excel(name = "项目名称", width = 30,align = HorizontalAlignment.LEFT) + private String projectName; + + @Excel(name = "监理单位", width = 30,align = HorizontalAlignment.LEFT) + private String unitName; + + @Excel(name = "安全隐患-监理单位", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String aqyhpc_jldw; + + @Excel(name = "应急演练", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String yjyl; + + @Excel(name = "专项培训", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String zxpx; + + @Excel(name = "质量隐患-监理单位", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String zlyhpc_jldw; + + @Excel(name = "取样复试审批中", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String clqyfs; + + @Excel(name = "取样复试已审批", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String clqyfswc; + + @Excel(name = "材料封样审批中", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String clfy; + + @Excel(name = "材料封样已审批", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String clfywc; + + @Excel(name = "实测实量审批中", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String cscl; + + @Excel(name = "实测实量已审批", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String csclwc; + + @Excel(name = "举牌验收审批中", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String jpys; + + @Excel(name = "举牌验收已审批", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String jpyswc; + + @Excel(name = "工程申请审批中", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String gcsq; + + @Excel(name = "工程申请已审批", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String gcsp; + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public String getAqyhpc_jldw() { + return aqyhpc_jldw; + } + + public void setAqyhpc_jldw(String aqyhpc_jldw) { + this.aqyhpc_jldw = aqyhpc_jldw; + } + + public String getYjyl() { + return yjyl; + } + + public void setYjyl(String yjyl) { + this.yjyl = yjyl; + } + + public String getZxpx() { + return zxpx; + } + + public void setZxpx(String zxpx) { + this.zxpx = zxpx; + } + + public String getZlyhpc_jldw() { + return zlyhpc_jldw; + } + + public void setZlyhpc_jldw(String zlyhpc_jldw) { + this.zlyhpc_jldw = zlyhpc_jldw; + } + + public String getClqyfs() { + return clqyfs; + } + + public void setClqyfs(String clqyfs) { + this.clqyfs = clqyfs; + } + + public String getClfy() { + return clfy; + } + + public void setClfy(String clfy) { + this.clfy = clfy; + } + + public String getCscl() { + return cscl; + } + + public void setCscl(String cscl) { + this.cscl = cscl; + } + + public String getJpys() { + return jpys; + } + + public void setJpys(String jpys) { + this.jpys = jpys; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getUnitId() { + return unitId; + } + + public void setUnitId(Long unitId) { + this.unitId = unitId; + } + + public String getClqyfswc() { + return clqyfswc; + } + + public void setClqyfswc(String clqyfswc) { + this.clqyfswc = clqyfswc; + } + + public String getClfywc() { + return clfywc; + } + + public void setClfywc(String clfywc) { + this.clfywc = clfywc; + } + + public String getCsclwc() { + return csclwc; + } + + public void setCsclwc(String csclwc) { + this.csclwc = csclwc; + } + + public String getJpyswc() { + return jpyswc; + } + + public void setJpyswc(String jpyswc) { + this.jpyswc = jpyswc; + } + + public String getGcsq() { + return gcsq; + } + + public void setGcsq(String gcsq) { + this.gcsq = gcsq; + } + + public String getGcsp() { + return gcsp; + } + + public void setGcsp(String gcsp) { + this.gcsp = gcsp; + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/ProjectViewMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/ProjectViewMapper.java index ba66d4d4..be64c376 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/ProjectViewMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/ProjectViewMapper.java @@ -2,6 +2,7 @@ package com.yanzhu.jh.project.mapper; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.vo.ProjectViewExport; +import com.yanzhu.jh.project.domain.vo.ProjectViewJlExport; import java.util.List; @@ -20,4 +21,11 @@ public interface ProjectViewMapper { */ public List selectStatisticsProjectList(SurProject surProject); + /** + * 监理单位项目数据汇总 + * @param surProject + * @return + */ + public List selectStatisticsJlProjectList(SurProject surProject); + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IProjectViewService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IProjectViewService.java index 8fbc016b..1a9d69fe 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IProjectViewService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IProjectViewService.java @@ -2,6 +2,7 @@ package com.yanzhu.jh.project.service; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.vo.ProjectViewExport; +import com.yanzhu.jh.project.domain.vo.ProjectViewJlExport; import java.util.List; @@ -19,4 +20,11 @@ public interface IProjectViewService { * @return */ public List selectStatisticsProjectList(SurProject surProject); + + /** + * 监理单位项目数据汇总 + * @param surProject + * @return + */ + public List selectStatisticsJlProjectList(SurProject surProject); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/ProjectViewServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/ProjectViewServiceImpl.java index b1b2b9ff..50d65194 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/ProjectViewServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/ProjectViewServiceImpl.java @@ -2,6 +2,7 @@ package com.yanzhu.jh.project.service.impl; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.vo.ProjectViewExport; +import com.yanzhu.jh.project.domain.vo.ProjectViewJlExport; import com.yanzhu.jh.project.mapper.ProjectViewMapper; import com.yanzhu.jh.project.service.IProjectViewService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,4 +31,14 @@ public class ProjectViewServiceImpl implements IProjectViewService { public List selectStatisticsProjectList(SurProject surProject) { return projectViewMapper.selectStatisticsProjectList(surProject); } + + /** + * 监理单位项目数据汇总 + * @param surProject + * @return + */ + @Override + public List selectStatisticsJlProjectList(SurProject surProject) { + return projectViewMapper.selectStatisticsJlProjectList(surProject); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml index bd3c7070..725960e9 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml @@ -58,4 +58,37 @@ and sp.projectNature = #{projectNature} ORDER by sp.projectSort + + + + \ No newline at end of file