From aaab711287381361ab54af0de2e82296f2699072 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: Sat, 9 Mar 2024 19:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- ruoyi-ui/src/views/work/workFile/index.vue | 2 +- .../ProjectProblemmodifyController.java | 4 ++ .../src/main/resources/application.yml | 2 +- .../impl/SurProjectAuditinfoServiceImpl.java | 43 +++++++++++++++++-- 5 files changed, 46 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f449f345..134c6f93 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -25,7 +25,7 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 100MB + max-file-size: 200MB # 设置总上传的文件大小 max-request-size: 500MB # 服务模块 diff --git a/ruoyi-ui/src/views/work/workFile/index.vue b/ruoyi-ui/src/views/work/workFile/index.vue index c957196f..fdf81d1b 100644 --- a/ruoyi-ui/src/views/work/workFile/index.vue +++ b/ruoyi-ui/src/views/work/workFile/index.vue @@ -187,7 +187,7 @@ - + diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java index d7d4f0db..3fd65fdd 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java @@ -3,8 +3,11 @@ package com.ruoyi.web.project.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.SysRoleEnum; import com.ruoyi.common.utils.DictUtils; +import com.ruoyi.system.domain.FlowTaskEntity; import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodifyDraft; @@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * @version : V1.0 diff --git a/ruoyi-wechat/src/main/resources/application.yml b/ruoyi-wechat/src/main/resources/application.yml index fe5d62be..13af2178 100644 --- a/ruoyi-wechat/src/main/resources/application.yml +++ b/ruoyi-wechat/src/main/resources/application.yml @@ -20,7 +20,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: druid # 文件上传 servlet: multipart: diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java index cfba331a..98e7a7f0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java @@ -1,16 +1,18 @@ package com.yanzhu.jh.project.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.FlowTaskEntity; import com.ruoyi.system.mapper.FlowBusinessKeyMapper; import com.yanzhu.jh.project.domain.*; import com.yanzhu.jh.project.mapper.*; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; +import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; +import com.yanzhu.jh.trouble.mapper.SmzSspProblemmodifyMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.service.ISurProjectAuditinfoService; @@ -42,6 +44,9 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi @Autowired private SurProjectMeasureMapper surProjectMeasureMapper; + @Autowired + private SmzSspProblemmodifyMapper smzSspProblemmodifyMapper; + /** * 查询项目审核信息 * @@ -160,6 +165,36 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi }else{ dataMap.put("approve",0); } + + SmzSspProblemmodifyWhere smzSspProblemmodifyWhere = new SmzSspProblemmodifyWhere(); + smzSspProblemmodifyWhere.setProjectId(Convert.toLong(flowTaskEntity.getBusinessKey())); + smzSspProblemmodifyWhere.setInfoType(1L); + Long minRole = flowTaskEntity.getRoleIds().stream().mapToLong(Long::longValue).min().getAsLong(); + smzSspProblemmodifyWhere.setNowRole(Convert.toStr(minRole)); + smzSspProblemmodifyWhere.setNowUser(flowTaskEntity.getNowUserName()); + int zlCount = 0; + List> zlDataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodifyWhere); + if(StringUtils.isNotEmpty(zlDataList)){ + for(Map map:zlDataList){ + String state = Convert.toStr(map.get("checkState")); + if(Objects.equals(state,"0") || Objects.equals(state,"1")){ + zlCount += Convert.toInt(map.get("total")); + } + } + } + int aqCount = 0; + smzSspProblemmodifyWhere.setInfoType(0L); + List> aqDataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodifyWhere); + if(StringUtils.isNotEmpty(aqDataList)){ + for(Map map:aqDataList){ + String state = Convert.toStr(map.get("checkState")); + if(Objects.equals(state,"0") || Objects.equals(state,"1")){ + aqCount += Convert.toInt(map.get("total")); + } + } + } + dataMap.put("zlCount",zlCount); + dataMap.put("aqCount",aqCount); dataMap.put("approveQYFS",a); dataMap.put("approveSCSL",b); dataMap.put("approveJPYS",c);