fzzy-igdss-core/src/main/java/com/fzzy/igds/data/IgdsBaseParam.java
@@ -18,6 +18,12 @@ private String depotId; private String userType; private String parentId; private String bankId; private String key;//自定义关键字 @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreCompanyMapper.java
@@ -1,9 +1,14 @@ package com.fzzy.igds.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fzzy.igds.domain.Camera; import com.fzzy.igds.domain.Company; import com.fzzy.igds.domain.PledgeContract; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; /** * @Description @@ -13,4 +18,13 @@ @Mapper public interface CoreCompanyMapper extends BaseMapper<Company> { /** * 自定义关联查询SQL * 关联合同表，根据银行id查询公司列表 * @param queryWrapper * @return */ @Select("SELECT d.* FROM d_pledge_contract c LEFT JOIN d_company d ON d.id = c.pledge_company ${ew.customSqlSegment}") List<Company> selectCompanyByBankId(@Param("ew") QueryWrapper<PledgeContract> queryWrapper); } fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreDeptMapper.java
@@ -1,8 +1,13 @@ package com.fzzy.igds.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fzzy.igds.domain.Dept; import com.fzzy.igds.domain.PledgeContract; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; /** * @Description @@ -12,4 +17,13 @@ @Mapper public interface CoreDeptMapper extends BaseMapper<Dept> { /** * 自定义关联查询SQL * 关联合同表，根据银行id查询库区列表 * @param queryWrapper * @return */ @Select("SELECT d.* FROM d_pledge_contract c LEFT JOIN d_dept d ON d.id = c.pledge_dept ${ew.customSqlSegment}") List<Dept> selectDeptByBankId(@Param("ew") QueryWrapper<PledgeContract> queryWrapper); } fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
@@ -1,10 +1,13 @@ package com.fzzy.igds.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.domain.Company; import com.fzzy.igds.domain.PledgeContract; import com.fzzy.igds.mapper.CoreCompanyMapper; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -22,6 +25,48 @@ @Resource private CoreCompanyMapper coreCompanyMapper; /** * 根据用户类型获取对应公司列表信息 * @return */ public List<Company> getCompanyByUserType() { //获取当前登录人 SysUser user = ContextUtil.getLoginUser(); if (Constant.USER_TYPE_10.equals(user.getUserType())) { //监管用户，直接查询组织下所有公司 return this.listCompany(null,user.getCompanyId(),null); } if (Constant.USER_TYPE_20.equals(user.getUserType())) { //银行用户，根据合同查询银行下所有库区 return this.getCompanyByContract(user.getUserData()); } if (Constant.USER_TYPE_30.equals(user.getUserType())) { //库区用户 return this.listCompany(user.getDeptId()+"",null,null); } return this.listCompany(null,user.getCompanyId(),null); } /** * 根据银行id，关联合同表查询公司列表 * @param bankId * @return */ public List<Company> getCompanyByContract(String bankId) { if (StringUtils.isBlank(bankId)){ return null; } QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("c.pledge_bank", bankId); return coreCompanyMapper.selectCompanyByBankId(queryWrapper); } /** * 根据条件查询公司信息 * @param id fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -3,12 +3,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.domain.Dept; import com.fzzy.igds.domain.PledgeContract; import com.fzzy.igds.mapper.CoreDeptMapper; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; @@ -23,11 +23,63 @@ public class CoreDeptService { @Resource private ISysDeptService iSysDeptService; @Resource private CoreDeptMapper coreDeptMapper; @Resource private InoutConfService inoutConfService; /** * 根据用户类型获取对应库区列表信息 * * @param parentId * @return */ public List<Dept> getDeptByUserType(String parentId) { if(StringUtils.isNotBlank(parentId)){ //查公司下所有库区 return this.listDept(null,null, parentId); } //获取当前登录人 SysUser user = ContextUtil.getLoginUser(); if (Constant.USER_TYPE_10.equals(user.getUserType())) { //监管用户，直接查询组织下所有库区 return this.listDept(null,user.getCompanyId(),null); } if (Constant.USER_TYPE_20.equals(user.getUserType())) { //银行用户，根据合同查询银行下所有库区 return this.getDeptByContract(user.getUserData()); } if (Constant.USER_TYPE_30.equals(user.getUserType())) { //库区用户 String deptId = user.getDeptId() + ""; if(deptId.length() > 7){ //查询用户所属库区 return this.listDept(deptId,null,null); }else { //查询用户所属公司下所有库区 return this.listDept(null,null, deptId); } } return this.listDept(null,user.getCompanyId(),null); } /** * 根据银行id，关联合同表查询库区列表 * @param bankId * @return */ public List<Dept> getDeptByContract(String bankId) { if (StringUtils.isBlank(bankId)){ return null; } QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("c.pledge_bank", bankId); return coreDeptMapper.selectDeptByBankId(queryWrapper); } /** * 根据条件查询库区信息 @@ -62,7 +114,7 @@ if (Constant.USER_TYPE_30.equals(user.getUserType())) { return this.listDept(ContextUtil.subDeptId(user),null,null); }else { return this.listDept(null,null,user.getDeptId() + "%"); return this.listDept(null,null,user.getDeptId()+""); } }
@@ -245,7 +245,7 @@ }</ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> <Property name="dataProvider">companyPR#getData</Property> <Property name="dataProvider">companyPR#getCompanyByUserType</Property> <Property name="dataType">[dtMain]</Property> </DataSet> <Container> fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
@@ -22,6 +22,19 @@ @Resource private CoreCompanyService coreCompanyService; /** * 根据用户类型获取公司信息 * companyPR#getCompanyByUserType * @return */ @DataProvider public List<Company> getCompanyByUserType() { return coreCompanyService.getCompanyByUserType(); } /** * 获取当前账号下属所有公司信息 * @@ -34,7 +47,6 @@ SysUser user = ContextUtil.getLoginUser(); return coreCompanyService.listCompany(null, null, user.getDeptId() + ""); } /** * companyPR#saveData fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
@@ -191,7 +191,7 @@ }</ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> <Property name="dataProvider">deptPR#getData</Property> <Property name="dataProvider">deptPR#getDeptByUserType</Property> <Property name="dataType">[dtMain]</Property> <Property name="loadMode">manual</Property> </DataSet> fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * @Description 库区信息 @@ -24,6 +23,17 @@ private CoreDeptService coreDeptService; /** * 根据用户类型获取对应库区列表信息 * deptPR#getDeptByUserType * @return */ @DataProvider public List<Dept> getDeptByUserType(String parentId) { return coreDeptService.getDeptByUserType(parentId); } /** * 查询设备,将操作信息调整为空，默认包括分库参数 * * deptPR#getAllData fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml
@@ -74,7 +74,7 @@ var cur = view.get("#dgMain").get("selection");
 var deptId = cur.get("deptId");
 var url = "/com.fzzy.igds.Patrol.d";
 window.$openParentTab("巡更详情", url,false, panelId); window.$openParentTab("巡更详情", url); };
 
 renderStatus = function(arg){
 fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
