diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java new file mode 100644 index 00000000..dceff74a --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java @@ -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; + } + +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java index cd2fd2fd..0277fa46 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java @@ -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,16 +325,12 @@ 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())){ + if(DeptTypeEnum.COMFLAG.getCode().equals(sysDept.getComFlag())){ return sysDept; }else{ - if("101".equals(Convert.toStr(sysDept.getDeptId()))){ - return sysDept; - }else{ - return getZGSDept(sysDept.getParentId()); - } + return getZGSDept(sysDept.getParentId()); } }else{ return sysDept; diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java index 430977ce..aa9ee156 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java @@ -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 dataMap = new HashMap<>(); dataMap.put("loginName",map.get("createUser")); - Map userMap = wxUserLoginMapper.checkLoginNameAndPsw(dataMap); - //当前登录账号角色信息 - String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(userMap.get("user_id")))); + Map deptMap = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("createUser"))); //当前角色时管理员时，修改角色为集团公司 - if(Convert.toInt(SysRoleEnum.JTGS.getCode()) list = surProjectService.selectSurProjectList(surProject); ExcelUtil util = new ExcelUtil(SurProject.class); util.exportExcel(response, list, "项目管理数据"); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java index 31d02966..2cb491ca 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java @@ -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 list = surProjectScheduleService.selectSurProjectScheduleList(surProjectSchedule); ExcelUtil util = new ExcelUtil(SurProjectSchedule.class); util.exportExcel(response, list, "项目进度数据"); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectUserinfoController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectUserinfoController.java index b75f4bf8..4be2bdc2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectUserinfoController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectUserinfoController.java @@ -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 list = surProjectUserinfoService.selectSurProjectUserinfoList(surProjectUserinfo); ExcelUtil util = new ExcelUtil(SurProjectUserinfo.class); util.exportExcel(response, list, "项目用户数据"); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java index 506aa77d..f28bd9f4 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java @@ -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())); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java index bc8ac5d6..bcd9eccf 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java @@ -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 list = smzSspProblemmodifyService.selectSmzSspProblemmodifyList(smzSspProblemmodify); ExcelUtil util = new ExcelUtil(SmzSspProblemmodify.class); util.exportExcel(response, list, "质量整改数据"); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java index 7d3bbdc0..32333aa9 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java @@ -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 list = workTrainService.selectWorkTrainList(workTrain); ExcelUtil util = new ExcelUtil(WorkTrain.class); util.exportExcel(response, list, "演练培训数据"); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java index 41335b60..e1f16cbc 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java @@ -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 list = workTrainService.selectWorkTrainList(workTrain); ExcelUtil util = new ExcelUtil(WorkTrain.class); util.exportExcel(response, list, "演练培训数据"); diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml index d272148f..8b345441 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml @@ -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 - left join sur_project_unit_info spui on spui.projectId = sp.id and spu.project_id = #{projectId} and sp.projectName like concat('%', #{projectName}, '%') @@ -48,7 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sp.deptId = #{nowDept} - and spui.unitId = #{nowDept} + and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept}) + and sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)