提交

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
   # 服务模块

ruoyi-ui/src/views/work/workFile/index.vue

@@ -187,7 +187,7 @@
         </el-select>
       </el-form-item>
         <el-form-item label="上传文件" prop="fileData">
-          <FileUpload @input="fileInput"/>
+          <FileUpload @input="fileInput" :fileSize="200"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>

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

ruoyi-wechat/src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: druid
   # 文件上传
   servlet:
     multipart:

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.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
+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<Map<String, Object>> zlDataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodifyWhere);
+        if(StringUtils.isNotEmpty(zlDataList)){
+            for(Map<String, Object> 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<Map<String, Object>> aqDataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodifyWhere);
+        if(StringUtils.isNotEmpty(aqDataList)){
+            for(Map<String, Object> 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);