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

修改bug

dev_xds
姜玉琦 2023-08-12 18:55:05 +08:00
parent 4d0f4ee14b
commit 388cfb1d6a
11 changed files with 108 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java 100644
View File

@ -0,0 +1,38 @@
package com.ruoyi.common.enums;
public enum DeptTypeEnum {
JTGS("1", "泾河产业发展集团"),
ZGS("11", "发展集团子公司"),
JLDW("4", "监理单位"),
ZBDW("2", "总包单位"),
FBDW("3", "分包单位"),
JTGSTYPE("3", "泾河产业发展集团"),
ZGSTYPE("4", "发展集团子公司"),
JLDWTYPE("5", "监理单位"),
ZBDWTYPE("6", "总包单位"),
FBDWTYPE("7", "分包单位"),
COMFLAG("1","子公司标识");
private final String code;
private final String info;
DeptTypeEnum(String code, String info)
{
this.code = code;
this.info = info;
}
public String getCode()
{
return code;
}
public String getInfo()
{
return info;
}
}

11
ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.web.projectInfo.service;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DeptTypeEnum;
import com.ruoyi.common.enums.SysRoleEnum;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
@ -68,7 +69,7 @@ public class WxProjectInfoServiceImpl implements WxIProjectInfoService {
//普通角色，获取真实部门
SysDept sysDept = this.getZGSDept(Convert.toLong(map.get("deptId")));
//判断当前部门是否是产业发展集团
if("1".equals(sysDept.getTypeFlag())){
if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag()) || DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
sysDept = this.getZGSDept(Convert.toLong(sysDept.getDeptId()));
totalMap.put("id",sysDept.getDeptId());
totalMap.put("text",sysDept.getDeptName());
@ -324,17 +325,13 @@ public class WxProjectInfoServiceImpl implements WxIProjectInfoService {
*/
private SysDept getZGSDept(Long deptId){
SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
if("1".equals(sysDept.getTypeFlag())){
if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
//comFlag标识为1是子公司
if("1".equals(sysDept.getComFlag())){
return sysDept;
}else{
if("101".equals(Convert.toStr(sysDept.getDeptId()))){
if(DeptTypeEnum.COMFLAG.getCode().equals(sysDept.getComFlag())){
return sysDept;
}else{
return getZGSDept(sysDept.getParentId());
}
}
}else{
return sysDept;
}

20
ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.web.sspManage.service;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DeptTypeEnum;
import com.ruoyi.common.enums.SysRoleEnum;
import com.ruoyi.common.utils.QiniuBase64UploadUtil;
import com.ruoyi.common.utils.file.FileUploadUtils;
@ -142,14 +143,21 @@ public class SspServiceImpl implements ISspService {
//问题整改
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("loginName",map.get("createUser"));
Map<String,Object> userMap = wxUserLoginMapper.checkLoginNameAndPsw(dataMap);
//当前登录账号角色信息
String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(userMap.get("user_id"))));
Map<String,Object> deptMap = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("createUser")));
//当前角色时管理员时，修改角色为集团公司
if(Convert.toInt(SysRoleEnum.JTGS.getCode())<Convert.toInt(nowRole)){
nowRole = SysRoleEnum.JTGS.getCode();
String roleType = "";
if(DeptTypeEnum.JTGS.getCode().equals(deptMap.get("type_flag"))){
roleType = DeptTypeEnum.JTGSTYPE.getCode();
}else if(DeptTypeEnum.ZGS.getCode().equals(deptMap.get("type_flag"))){
roleType = DeptTypeEnum.ZGSTYPE.getCode();
}else if(DeptTypeEnum.JLDW.getCode().equals(deptMap.get("type_flag"))){
roleType = DeptTypeEnum.JLDWTYPE.getCode();
}else if(DeptTypeEnum.ZBDW.getCode().equals(deptMap.get("type_flag"))){
roleType = DeptTypeEnum.ZBDWTYPE.getCode();
}else if(DeptTypeEnum.FBDW.getCode().equals(deptMap.get("type_flag"))){
roleType = DeptTypeEnum.FBDWTYPE.getCode();
}
map.put("roleType",nowRole);
map.put("roleType",roleType);
/**
* 基本信息入库
* 图片 视频入库

7
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java
View File

@ -69,6 +69,13 @@ public class SurProjectController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SurProject surProject)
{
surProject.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProject.getNowRole())){
surProject.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProject.setNowDept(Convert.toStr(getDeptId()));
}
surProject.setNowUser(Convert.toStr(getUserId()));
List<SurProject> list = surProjectService.selectSurProjectList(surProject);
ExcelUtil<SurProject> util = new ExcelUtil<SurProject>(SurProject.class);
util.exportExcel(response, list, "项目管理数据");

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java
View File

@ -70,6 +70,14 @@ public class SurProjectScheduleController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SurProjectSchedule surProjectSchedule)
{
surProjectSchedule.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectSchedule.getNowRole())){
surProjectSchedule.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProjectSchedule.setNowDept(Convert.toStr(getDeptId()));
}
surProjectSchedule.setNowUser(Convert.toStr(getUserId()));
surProjectSchedule.setCreateBy(Convert.toStr(getLoginUser().getUser().getUserId()));
List<SurProjectSchedule> list = surProjectScheduleService.selectSurProjectScheduleList(surProjectSchedule);
ExcelUtil<SurProjectSchedule> util = new ExcelUtil<SurProjectSchedule>(SurProjectSchedule.class);
util.exportExcel(response, list, "项目进度数据");

7
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectUserinfoController.java
View File

@ -70,6 +70,13 @@ public class SurProjectUserinfoController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SurProjectUserinfo surProjectUserinfo)
{
surProjectUserinfo.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectUserinfo.getNowRole())){
surProjectUserinfo.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProjectUserinfo.setNowDept(Convert.toStr(getDeptId()));
}
surProjectUserinfo.setNowUser(Convert.toStr(getUserId()));
List<SurProjectUserinfo> list = surProjectUserinfoService.selectSurProjectUserinfoList(surProjectUserinfo);
ExcelUtil<SurProjectUserinfo> util = new ExcelUtil<SurProjectUserinfo>(SurProjectUserinfo.class);
util.exportExcel(response, list, "项目用户数据");

7
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DeptTypeEnum;
import com.ruoyi.common.enums.PublicStateEnum;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
@ -84,7 +85,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
surProjectUserinfo.setCreateTime(DateUtils.getNowDate());
SysDept sysDept = deptMapper.selectDeptById(surProjectUserinfo.getDeptId());
//如果时城建公司的人&&当前选的单位非子公司，这里自己查询项目的所属单位
if("1".equals(sysDept.getTypeFlag()) && !"1".equals(sysDept.getComFlag())){
if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
SurProject surProject = surProjectMapper.selectSurProjectById(surProjectUserinfo.getProjectId());
//选择人员职务是甲方经理时，同步到项目负责人
if("21".equals(surProjectUserinfo.getJobType())){
@ -96,7 +97,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
sysDept = deptMapper.selectDeptById(surProject.getDeptId());
}
surProjectUserinfo.setDeptName(sysDept.getDeptName());
surProjectUserinfo.setDeptType(sysDept.getTypeFlag());
surProjectUserinfo.setDeptType(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())?DeptTypeEnum.JTGS.getCode():sysDept.getTypeFlag());
surProjectUserinfo.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode()));
for(Long userId:surProjectUserinfo.getUserIds()){
surProjectUserinfo.setUserId(userId);
@ -112,7 +113,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
if(surProjectUnitInfosList!=null && surProjectUnitInfosList.size()>0){
//已有关系不再保存
}else{
surProjectUnitInfo.setUnitType(Long.parseLong(sysDept.getTypeFlag()));
surProjectUnitInfo.setUnitType(Long.parseLong(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())?DeptTypeEnum.JTGS.getCode():sysDept.getTypeFlag()));
surProjectUnitInfo.setUnitName(sysDept.getDeptName());
surProjectUnitInfo.setCreateTime(new Date());
surProjectUnitInfo.setDelFlag(Convert.toLong(PublicStateEnum.OK.getCode()));

7
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java
View File

@ -73,6 +73,13 @@ public class SmzSspProblemmodifyController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SmzSspProblemmodify smzSspProblemmodify)
{
smzSspProblemmodify.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodify.getNowRole())){
smzSspProblemmodify.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
smzSspProblemmodify.setNowDept(Convert.toStr(getDeptId()));
}
smzSspProblemmodify.setNowUser(getLoginUser().getUsername());
List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSmzSspProblemmodifyList(smzSspProblemmodify);
ExcelUtil<SmzSspProblemmodify> util = new ExcelUtil<SmzSspProblemmodify>(SmzSspProblemmodify.class);
util.exportExcel(response, list, "质量整改数据");

8
yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java
View File

@ -67,6 +67,14 @@ public class EmergencyDrillController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, WorkTrain workTrain)
{
workTrain.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(workTrain.getNowRole())){
workTrain.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
workTrain.setNowDept(Convert.toStr(getDeptId()));
}
workTrain.setNowUser(Convert.toStr(getUserId()));
workTrain.setNowUserName(getUsername());
List<WorkTrain> list = workTrainService.selectWorkTrainList(workTrain);
ExcelUtil<WorkTrain> util = new ExcelUtil<WorkTrain>(WorkTrain.class);
util.exportExcel(response, list, "演练培训数据");

8
yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java
View File

@ -74,6 +74,14 @@ public class WorkTrainController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, WorkTrain workTrain)
{
workTrain.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(workTrain.getNowRole())){
workTrain.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
workTrain.setNowDept(Convert.toStr(getDeptId()));
}
workTrain.setNowUser(Convert.toStr(getUserId()));
workTrain.setNowUserName(getUsername());
List<WorkTrain> list = workTrainService.selectWorkTrainList(workTrain);
ExcelUtil<WorkTrain> util = new ExcelUtil<WorkTrain>(WorkTrain.class);
util.exportExcel(response, list, "演练培训数据");

4
yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml
View File

@ -32,7 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sur_project sp on spu.project_id = sp.id
left join sys_user su on spu.user_id = su.user_id
<!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
<where>
<if test="projectId != null "> and spu.project_id = #{projectId}</if>
<if test="projectName != null "> and sp.projectName like concat('%', #{projectName}, '%')</if>
@ -48,7 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--子部门数据-->
<if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
<!--监理单位/总包公司/分包单位查询当前关联数据-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept})</if>
<if test='nowRole == "99"'> and sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)</if>
</where>
</select>