sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sxyanzhu:9b73add815348123d6cdc970e6c2acfe3956edc4
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:684c088d56a6421ba4c2fd72a7bc00bf30663a52
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "9b73add815348123d6cdc970e6c2acfe3956edc4" and "684c088d56a6421ba4c2fd72a7bc00bf30663a52" have entirely different histories.
9b73add815 ... 684c088d56

6 changed files with 7 additions and 61 deletions
Show Stats Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -25,7 +25,7 @@ spring:
servlet:
multipart:
# 单个文件大小
max-file-size: 200MB
max-file-size: 100MB
# 设置总上传的文件大小
max-request-size: 500MB
# 服务模块

2
ruoyi-ui/src/views/work/workFile/index.vue
View File

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

4
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
View File

@ -3,11 +3,8 @@ 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;
@ -19,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* @version : V1.0

2
ruoyi-wechat/src/main/resources/application.yml
View File

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

43
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
View File

@ -1,18 +1,16 @@
package com.yanzhu.jh.project.service.impl;
import java.util.*;
import java.util.ArrayList;
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;
@ -44,9 +42,6 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
@Autowired
private SurProjectMeasureMapper surProjectMeasureMapper;
@Autowired
private SmzSspProblemmodifyMapper smzSspProblemmodifyMapper;
/**
* 查询项目审核信息
*
@ -165,36 +160,6 @@ 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);

15
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java
View File

@ -12,9 +12,7 @@ import com.ruoyi.common.enums.PublicStateEnum;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.yanzhu.jh.project.domain.SurProject;
import com.yanzhu.jh.project.domain.SurProjectUserinfo;
import com.yanzhu.jh.project.mapper.SurProjectMapper;
import com.yanzhu.jh.project.mapper.SurProjectUserinfoMapper;
import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo;
import com.yanzhu.jh.trouble.domain.SmzSspFileinfo;
@ -41,9 +39,6 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
@Autowired
private SysDeptMapper deptMapper;
@Autowired
private SurProjectMapper surProjectMapper;
@Autowired
private SmzSspAuditinfoMapper smzSspAuditinfoMapper;
@ -133,11 +128,6 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
}
//设置主图
smzSspProblemmodify.setMarksPicture(smzSspProblemmodify.getSmarkUrl().split(",")[0]);
//兼容项目名称为空的异常...
if(StringUtils.isEmpty(smzSspProblemmodify.getProblemArea())){
SurProject surProject = surProjectMapper.selectSurProjectById(smzSspProblemmodify.getProjectId());
smzSspProblemmodify.setProblemArea(surProject.getProjectName());
}
smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify);
SmzSspAuditinfo smzSspAuditinfo = new SmzSspAuditinfo();
smzSspAuditinfo.setMainId(smzSspProblemmodify.getId());
@ -206,11 +196,6 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
smzSspProblemmodifyDraftMapper.deleteSmzSspProblemmodifyDraftById(smzSspProblemmodify.getId());
//设置主图
smzSspProblemmodify.setMarksPicture(smzSspProblemmodify.getSmarkUrl().split(",")[0]);
//兼容项目名称为空的异常...
if(StringUtils.isEmpty(smzSspProblemmodify.getProblemArea())){
SurProject surProject = surProjectMapper.selectSurProjectById(smzSspProblemmodify.getProjectId());
smzSspProblemmodify.setProblemArea(surProject.getProjectName());
}
smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify);
SmzSspAuditinfo smzSspAuditinfo = new SmzSspAuditinfo();
smzSspAuditinfo.setMainId(smzSspProblemmodify.getId());