Skip to content

Z
zlmy-cloud
Commit d7ab1f13 authored by 鲁鸿波's avatar 鲁鸿波
Browse files
Options

危险作业列表东北港口所属组织机构查询所有 

东北口港走两个流程图
授权文件更换
parent 08f4bad7
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 28 deletions
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/dto/THazardWorkPlanParam.java
View file @ d7ab1f13
......@@ -52,4 +52,7 @@ public class THazardWorkPlanParam extends THazardWorkPlan {
@ApiModelProperty(value = "查询内容，用于app端作业计划列表输入框查询条件")
private String queryContent;
@ApiModelProperty(value = "是否查询了orgId")
private boolean flag;
}
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java
View file @ d7ab1f13
......@@ -250,8 +250,10 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
StringHelper.isEmpty(param.getLimit()) ? BizConstants.LIMIT : Long.valueOf(param.getLimit());
Page<THazardWorkPlan> resultPage = new Page<>(page, limit);
// TODO 根据需求修改查询条件及查询参数
param.setFlag(true);
// 默认orgId为当前用户的id
if(StringUtils.isEmpty(param.getOrgId())){
param.setFlag(false);
param.setOrgId(ContextUtils.getLoginUser().getOrgId());
}
QueryWrapper<THazardWorkPlan> queryWrapper = this.createQuery(param);
......@@ -1959,38 +1961,36 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
//查询下级机构id
queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);*/
/*List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
.filter(s -> !s.trim().isEmpty()) // 忽略空值
.collect(Collectors.toList());
List<String> idsChildrenById = new ArrayList<>();
for(String orgId:list){
idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
}
idsChildrenById.addAll(list);
//查询下级机构id
queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);*/
List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
.filter(s -> !s.trim().isEmpty()) // 忽略空值
.collect(Collectors.toList());
List<String> idsChildrenById = new ArrayList<>();
boolean isDbgk = false;
for(String orgId:list){
NewSysOrg org = newSysOrgService.getOne(new QueryWrapper<NewSysOrg>().eq("org_id", orgId));
if(org.getParentIds().contains(com.testor.common.core.constant.Constants.DBGK_ORG_ID)){
isDbgk = true;
if(queryParam.isFlag()){
List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
.filter(s -> !s.trim().isEmpty()) // 忽略空值
.collect(Collectors.toList());
for(String orgId:list){
idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
}
idsChildrenById.addAll(list);
}else{
List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
.filter(s -> !s.trim().isEmpty()) // 忽略空值
.collect(Collectors.toList());
boolean isDbgk = false;
for(String orgId:list){
NewSysOrg org = newSysOrgService.getOne(new QueryWrapper<NewSysOrg>().eq("org_id", orgId));
if(org.getParentIds().contains(com.testor.common.core.constant.Constants.DBGK_ORG_ID)){
isDbgk = true;
}
idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
}
idsChildrenById.addAll(list);
//如果是东北港口下的部门,查询东北港口所有
if(isDbgk){
idsChildrenById.addAll(newSysOrgService.dbgkChildOrgIds());
idsChildrenById.add(com.testor.common.core.constant.Constants.DBGK_ORG_ID);
}
idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
}
idsChildrenById.addAll(list);
//如果是东北港口下的部门,查询东北港口所有
if(isDbgk){
idsChildrenById.addAll(newSysOrgService.dbgkChildOrgIds());
idsChildrenById.add(com.testor.common.core.constant.Constants.DBGK_ORG_ID);
}
//查询下级机构id
queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);
......
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/notice/dao/TSysOrgDao.java
View file @ d7ab1f13
......@@ -5,6 +5,7 @@ import com.testor.module.notice.model.domain.TreeVO;
import com.tongtech.tfw.backend.common.models.supers.SuperDao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
......@@ -37,4 +38,6 @@ public interface TSysOrgDao extends SuperDao<TSysOrg> {
*/
List<TSysOrg> selectIsRentDept();
}
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysOrgController.java
View file @ d7ab1f13
......@@ -26,12 +26,14 @@ import com.testor.biz.sys.user.service.SysUserService;
import com.testor.biz.sys.userRole.model.domain.SysUserRole;
import com.testor.biz.sys.userRole.service.SysUserRoleService;
import com.testor.common.constant.NewOrgEnumCode;
import com.testor.common.core.constant.Constants;
import com.testor.common.util.BeanConverUtil;
import com.testor.module.accident.model.resp.ReportUnitResp;
import com.testor.module.contractor.ledger.model.domain.TContractorInfo;
import com.testor.module.contractor.ledger.model.domain.TContractorLedger;
import com.testor.module.contractor.ledger.service.TContractorInfoService;
import com.testor.module.contractor.ledger.service.TContractorLedgerService;
import com.testor.module.notice.model.domain.TSysOrg;
import com.testor.module.sys.model.domian.NewSysOrg;
import com.testor.module.sys.model.dto.NewDeptAndPost;
import com.testor.module.sys.model.dto.NewSysOrgCreateAndUpdateRequest;
......@@ -646,4 +648,20 @@ public class NewSysOrgController extends SuperController {
baseResponse.setData(returnOrg);
return baseResponse;
}
@ApiModelProperty(value = "根据用户id查询组织信息")
@GetMapping(value = "/selectOrgByUserId")
public BaseResponse selectOrgByUserId(String userId) throws Exception {
BaseResponse baseResponse = new BaseResponse<>();
baseResponse.setData(false);
TSysOrg tSysOrg = sysOrgService.selectOrgByUserId(userId);
if(null != tSysOrg){
if(tSysOrg.getParentIds().contains(Constants.DBGK_ORG_ID) || tSysOrg.getOrgId().equals(Constants.DBGK_ORG_ID)){
baseResponse.setData(true);
}
}
return baseResponse;
}
}
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/dao/NewSysOrgDao.java
View file @ d7ab1f13
......@@ -2,6 +2,7 @@ package com.testor.module.sys.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.testor.biz.sys.org.model.domain.SysOrg;
import com.testor.module.notice.model.domain.TSysOrg;
import com.testor.module.sys.model.domian.NewSysOrg;
import com.tongtech.tfw.backend.common.models.supers.SuperDao;
import org.apache.ibatis.annotations.Mapper;
......@@ -52,5 +53,16 @@ public interface NewSysOrgDao extends SuperDao<NewSysOrg> {
"where is_dept = '0' and parent_ids like '%1335dbc3f81b4919bf59014fede4819d%'")
List<String> dbgkChildOrgIds();
/**
* 根据用户id查询组织信息
* @param userId
* @return
*/
@Select("select * from t_sys_org\n" +
"where org_id in(\n" +
"select org_id from t_sys_user\n" +
"where user_id = #{userId}\n" +
")")
TSysOrg selectOrgByUserId(@Param("userId") String userId);
}
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/NewSysOrgService.java
View file @ d7ab1f13
......@@ -2,8 +2,10 @@ package com.testor.module.sys.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.testor.biz.sys.org.model.domain.SysOrg;
import com.testor.module.notice.model.domain.TSysOrg;
import com.testor.module.sys.model.domian.NewSysOrg;
import com.testor.module.sys.model.vo.SysOrgVo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
......@@ -122,4 +124,12 @@ public interface NewSysOrgService extends IService<NewSysOrg> {
*/
List<String> dbgkChildOrgIds();
/**
* 根据用户id查询组织信息
* @param userId
* @return
*/
TSysOrg selectOrgByUserId(String userId);
}
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/impl/NewSysOrgServiceImpl.java
View file @ d7ab1f13
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.testor.biz.sys.org.model.domain.SysOrg;
import com.testor.common.constant.StatusEnum;
import com.testor.common.util.StreamUtils;
import com.testor.module.notice.model.domain.TSysOrg;
import com.testor.module.sys.dao.NewSysOrgDao;
import com.testor.module.sys.model.domain.TSysConfig;
import com.testor.module.sys.model.domian.NewSysOrg;
......@@ -282,4 +283,9 @@ public class NewSysOrgServiceImpl extends SuperServiceImpl<NewSysOrgDao, NewSysO
public List<String> dbgkChildOrgIds() {
return baseMapper.dbgkChildOrgIds();
}
@Override
public TSysOrg selectOrgByUserId(String userId) {
return sysOrgDao.selectOrgByUserId(userId);
}
}
zlmy-modules/zlmy-boot/src/main/resources/license.dat
View file @ d7ab1f13
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 o=
\ No newline at end of file
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 o=
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment