From 5763cd28557a3ed721a657fc89db786b3f06a21d 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: Thu, 2 Nov 2023 23:04:28 +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 --- .../project/domain/vo/ProjectViewExport.java | 66 +++++++++++++++++++ .../mapper/project/ProjectViewMapper.xml | 10 ++- 2 files changed, 74 insertions(+), 2 deletions(-) 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 d38704c1..55d1f8b0 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 @@ -64,6 +64,24 @@ public class ProjectViewExport implements Serializable { @Excel(name = "举牌验收", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) private String jpys; + @Excel(name = "劳务实名", width = 20,align = HorizontalAlignment.CENTER, dictType = "sys_common_devState") + private String lwsm; + + @Excel(name = "标准化", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String bzh; + + @Excel(name = "实时监控", width = 20,align = HorizontalAlignment.CENTER, dictType = "sys_common_devState") + private String ssjk; + + @Excel(name = "AI监控", width = 20,align = HorizontalAlignment.CENTER, dictType = "sys_common_devState") + private String aijk; + + @Excel(name = "工程审批进行中", width = 20,align = HorizontalAlignment.CENTER) + private String gcsq; + + @Excel(name = "工程审批已完成", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) + private String gcsp; + public String getProjectName() { return projectName; } @@ -215,4 +233,52 @@ public class ProjectViewExport implements Serializable { public void setUnitId(Long unitId) { this.unitId = unitId; } + + public String getLwsm() { + return lwsm; + } + + public void setLwsm(String lwsm) { + this.lwsm = lwsm; + } + + public String getBzh() { + return bzh; + } + + public void setBzh(String bzh) { + this.bzh = bzh; + } + + public String getSsjk() { + return ssjk; + } + + public void setSsjk(String ssjk) { + this.ssjk = ssjk; + } + + public String getAijk() { + return aijk; + } + + public void setAijk(String aijk) { + this.aijk = aijk; + } + + 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/resources/mapper/project/ProjectViewMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml index a96b176a..a83d6724 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml @@ -33,7 +33,13 @@ (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_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_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, + (select count(1) from dev_ai_project_config a where a.project_id = sp.id and a.dept_id = pui.unitId and a.is_del=0)as aijk, + (select count(1) from sur_project_attendance_cfg a where a.project_id = sp.id and a.sub_dept_id = pui.unitId and a.state=0)as lwsm, + (select count(1) from vw_flow_all a where a.businessKey = sp.id and a.startDeptName = pui.unitName and a.finishTime is null)as gcsq, + (select count(1) from vw_flow_all a where a.businessKey = sp.id and a.startDeptName = pui.unitName and a.finishTime is not null)as gcsp, + (select count(1) from sur_project_standard a where a.project_id = sp.id and a.dept_id = pui.unitId and a.is_del=0)as bzh from sur_project sp left JOIN sur_project_unit_info pui on sp.id=pui.projectId and pui.unitType=2 where pui.del_flag=0 @@ -43,5 +49,5 @@ and sp.projectNature = #{projectNature} ORDER by sp.projectSort - + \ No newline at end of file