企业信息
This commit is contained in:
parent
b04f927016
commit
6050aedcd6
@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.SystemUserDataScope;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserDataScopeService;
|
||||
import com.zhgd.xmgl.modules.city.engineering.entity.Engineering;
|
||||
import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService;
|
||||
|
||||
@ -3,9 +3,9 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.zhgd.annotation.OperLog;
|
||||
import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
|
||||
import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
|
||||
import com.zhgd.xmgl.valid.AddGroup;
|
||||
|
||||
@ -6,10 +6,10 @@ import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto;
|
||||
import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto;
|
||||
import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.wisdom.entity.WorkerInfo;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.*;
|
||||
import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService;
|
||||
import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService;
|
||||
import com.zhgd.xmgl.modules.wisdom.service.IWorkerInfoService;
|
||||
|
||||
@ -9,7 +9,7 @@ import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.jeecg.common.util.PageUtil;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService;
|
||||
import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto;
|
||||
import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto;
|
||||
|
||||
@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.zhgd.annotation.OperLog;
|
||||
import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
|
||||
import com.zhgd.xmgl.security.SecurityUser;
|
||||
import com.zhgd.xmgl.security.SecurityUtil;
|
||||
|
||||
@ -6,7 +6,7 @@ import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto;
|
||||
import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto;
|
||||
import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.project.entity.Project;
|
||||
import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService;
|
||||
import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService;
|
||||
|
||||
@ -14,6 +14,7 @@ import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole;
|
||||
import com.zhgd.xmgl.modules.basicdata.mapper.*;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
|
||||
import com.zhgd.xmgl.modules.basicdata.vo.SystemUserVo;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.mapper.EnterpriseMapper;
|
||||
import com.zhgd.xmgl.modules.city.project.mapper.ProjectMapper;
|
||||
import com.zhgd.xmgl.security.SecurityUser;
|
||||
import com.zhgd.xmgl.security.SecurityUtil;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.vo;
|
||||
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.valid.AddGroup;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.controller.project;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.controller;
|
||||
|
||||
import com.zhgd.annotation.OperLog;
|
||||
import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.entity;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
@ -1,9 +1,10 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.entity;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMainLicense;
|
||||
import com.zhgd.xmgl.valid.AddGroup;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@ -1,7 +1,7 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.mapper;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
@ -1,10 +1,10 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.mapper;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainMapper">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.city.enterprise.mapper.EnterpriseMainMapper">
|
||||
|
||||
<select id="getList" resultType="com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain">
|
||||
<select id="getList" resultType="com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain">
|
||||
SELECT m.*, d.dict_value as mainTypeName FROM enterprise_main m
|
||||
LEFT JOIN system_dict_data d ON m.main_type = d.dict_label AND d.dict_type = 'enterprise_main'
|
||||
WHERE m.enterprise_sn = #{enterpriseSn}
|
||||
</select>
|
||||
</mapper>
|
||||
</mapper>
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMapper">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.city.enterprise.mapper.EnterpriseMapper">
|
||||
|
||||
<select id="getDetailById" resultType="com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo">
|
||||
SELECT c.*, u.account, u.show_password as password, u.user_tel as phone, u.real_name, u.email, g.government_name FROM enterprise c
|
||||
@ -9,12 +9,12 @@
|
||||
WHERE c.enterprise_id = #{enterpriseId}
|
||||
</select>
|
||||
|
||||
<select id="listByMainType" resultType="com.zhgd.xmgl.modules.basicdata.entity.Enterprise">
|
||||
<select id="listByMainType" resultType="com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise">
|
||||
SELECT c.* FROM enterprise c INNER JOIN enterprise_main m ON c.enterprise_sn = m.enterprise_sn
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="pageList" resultType="com.zhgd.xmgl.modules.basicdata.entity.Enterprise">
|
||||
<select id="pageList" resultType="com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise">
|
||||
SELECT * FROM (SELECT e.*, GROUP_CONCAT(d.dict_value) as mainTypeName, GROUP_CONCAT(m.main_type) as main_type FROM enterprise e
|
||||
LEFT JOIN enterprise_main m ON e.enterprise_sn = m.enterprise_sn
|
||||
LEFT JOIN system_dict_data d ON m.main_type = d.dict_label AND d.dict_type = 'enterprise_main'
|
||||
@ -24,4 +24,4 @@
|
||||
<select id="getSnListFByGov" resultType="java.lang.String">
|
||||
SELECT enterprise_sn FROM enterprise where government_sn = #{governmentSn}
|
||||
</select>
|
||||
</mapper>
|
||||
</mapper>
|
||||
@ -1,7 +1,7 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.service;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.service;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
|
||||
|
||||
import java.util.List;
|
||||
@ -1,9 +1,9 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.service.impl;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainMapper;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseMainService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.mapper.EnterpriseMainMapper;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseMainService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.service.impl;
|
||||
package com.zhgd.xmgl.modules.city.enterprise.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.jeecg.common.util.PageUtil;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.*;
|
||||
import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMapper;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.EnterpriseMain;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.mapper.EnterpriseMapper;
|
||||
import com.zhgd.xmgl.modules.city.project.entity.Project;
|
||||
import com.zhgd.xmgl.modules.city.project.mapper.ProjectMapper;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseMainLicenseService;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseMainService;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseMainService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
|
||||
import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
|
||||
import com.zhgd.xmgl.security.SecurityUtil;
|
||||
@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.xmgl.modules.basicdata.dto.GovernmentDto;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.project.entity.Project;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
||||
import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMapper;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.mapper.EnterpriseMapper;
|
||||
import com.zhgd.xmgl.modules.city.project.mapper.ProjectMapper;
|
||||
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
|
||||
import com.zhgd.xmgl.modules.basicdata.vo.GovernmentVo;
|
||||
|
||||
@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise;
|
||||
import com.zhgd.xmgl.modules.safety.entity.LiftingDevice;
|
||||
import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceExamine;
|
||||
import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceUse;
|
||||
import com.zhgd.xmgl.modules.safety.mapper.LiftingDeviceMapper;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService;
|
||||
import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceExamineService;
|
||||
import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceService;
|
||||
import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceUseService;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user