From 808bd00b1440ea2ec5132b639b0a029faa18c693 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, 25 Apr 2024 22:22:16 +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 --- .../task/myProcess/detail/detailDrawer.vue | 11 +- .../task/myProcess/editTaskDrawer.vue | 2 +- .../task/myProcess/initTaskDrawer.vue | 2 +- .../task/todo/detail/approveDrawer.vue | 21 +- .../statistics/statisticsProject/index.vue | 753 +++++++++++------- .../controller/ProjectViewController.java | 14 +- .../project/domain/vo/ProjectViewExport.java | 14 +- .../mapper/project/ProjectViewMapper.xml | 2 +- 8 files changed, 495 insertions(+), 324 deletions(-) diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue index 1bb1aa55..fe58166c 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue @@ -111,12 +111,11 @@
- {{ file.substring(file.lastIndexOf("/") + 1) }}{{ file.substring(file.lastIndexOf("/") + 1) }}
@@ -475,6 +474,10 @@ export default { height: 100%; float: left; padding-left: 20px; + + .el-link .el-link--inner{ + word-break: break-all !important; + } } } .containers { diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue index 9ac15124..113f3998 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue @@ -53,7 +53,7 @@ diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue index 78bd1cbf..c134bafc 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue @@ -53,7 +53,7 @@ diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue index 2c2d39c8..c1b6cd5d 100644 --- a/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue @@ -116,12 +116,11 @@
- {{ file.substring(file.lastIndexOf("/") + 1) }}{{ file.substring(file.lastIndexOf("/") + 1) }}
@@ -255,7 +254,7 @@ export default { returnTaskList: [], // 回退列表数据 returnTask: false, returnTaskBtn: false, - fileTypes:['pdf','png','jpg','jpeg'], + fileTypes: ["pdf", "png", "jpg", "jpeg"], }; }, computed: {}, @@ -619,9 +618,11 @@ export default { }, handledownload(url) { let fileType = url.split("."); - if(this.fileTypes.indexOf(fileType[fileType.length-1].toLocaleLowerCase())>-1){ - window.open(process.env.VUE_APP_BASE_API+url); - }else{ + if ( + this.fileTypes.indexOf(fileType[fileType.length - 1].toLocaleLowerCase()) > -1 + ) { + window.open(process.env.VUE_APP_BASE_API + url); + } else { this.$download.resource(url); } }, @@ -671,6 +672,10 @@ export default { height: 100%; float: left; padding-left: 20px; + + .el-link .el-link--inner{ + word-break: break-all !important; + } } } .containers { diff --git a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue index 54f43a2e..a3a78401 100644 --- a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue +++ b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue @@ -1,78 +1,78 @@ - - - \ No newline at end of file + /** 导出按钮操作 */ + handleExport() { + this.loading = true; + this.queryParams.params = {}; + if (null != this.daterangeTime && "" != this.daterangeTime) { + this.queryParams.params["beginTime"] = this.daterangeTime[0]; + this.queryParams.params["endTime"] = this.daterangeTime[1]; + } + let url = process.env.VUE_APP_BASE_API + "/statistics/project/exportView"; + axios({ + method: "post", + url: url, + data: this.queryParams, + responseType: "blob", + headers: { Authorization: "Bearer " + getToken() }, + }).then((res) => { + this.loading = false; + let timeStamp = new Date().getTime(); + const blob = new Blob([res.data], { + type: "application/vnd.ms-excel;charset=utf-8", + }); + this.saveAs(blob, decodeURIComponent("项目汇总数据_" + timeStamp + ".xlsx")); + }); + }, + saveAs(text, name, opts) { + saveAs(text, name, opts); + }, + }, +}; + 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 0527ba4f..ac1b15ab 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 @@ -14,24 +14,22 @@ 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.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; 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; import javax.servlet.http.HttpServletResponse; import java.io.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.math.BigDecimal; import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; @@ -309,7 +307,7 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(5); - tempCell.setCellValue("环境检测"); + tempCell.setCellValue("劳资预警"); tempCell.setCellStyle(headerStyle); tempCell = tempRow.createCell(6); @@ -493,7 +491,7 @@ public class ProjectViewController extends BaseBuildNodeController{ tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(5); - tempCell.setCellValue(view.getHjjc().equals("0")?"未接入":"已接入"); + tempCell.setCellValue(Convert.toStr(view.getLzyjs(),"0")); tempCell.setCellStyle(contentStyle); tempCell = tempRow.createCell(6); 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 29b586e7..728689d3 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 @@ -86,8 +86,10 @@ public class ProjectViewExport implements Serializable { private String gcsp; private String jdyj; - - private String hjjc; + + @Excel(name = "劳资预警", width = 20,align = HorizontalAlignment.CENTER) + private String lzyjs; + private String hjyjs; private String zlyjs; private String aqyjs; @@ -326,12 +328,12 @@ public class ProjectViewExport implements Serializable { this.jdyj = jdyj; } - public String getHjjc() { - return hjjc; + public String getLzyjs() { + return lzyjs; } - public void setHjjc(String hjjc) { - this.hjjc = hjjc; + public void setLzyjs(String lzyjs) { + this.lzyjs = lzyjs; } public String getHjyjs() { diff --git a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml index 1c34ddbf..5a9ab655 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml @@ -43,7 +43,7 @@ (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, (select count(1) from sur_project_photography a where a.project_id = sp.id and a.is_del=0)as yssys, - '0' as hjjc, + (select count(1) from flow_labour_info a where a.project_id = sp.id and a.deptId=pui.unitId and a.is_del=0) as lzyjs, '0' as hjyjs, (select count(1) from smz_ssp_problemmodify a where a.projectId=sp.id and a.infoType=1 and a.isDel=0 and a.checkState!=4 and date(NOW()) ]]> date(a.nickedTime)) as zlyjs, (select count(1) from smz_ssp_problemmodify a where a.projectId=sp.id and a.infoType=0 and a.isDel=0 and a.checkState!=4 and date(NOW()) ]]> date(a.nickedTime)) as aqyjs,