diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java new file mode 100644 index 0000000..e3ca8bd --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java @@ -0,0 +1,243 @@ +package com.bonus.common.biz.domain; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** +* Description: +* @Author 阮世耀 +* @Create 2023/12/1 19:40 +* @Version 1.0 +*/ + +/** + * 企业信息表 + */ +@Data +@ApiModel("企业信息表") +public class BmCompanyInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 企业id + */ + @Excel(name = "企业id") + @ApiModelProperty(value = "企业id", required = true) + private Integer companyId; + + /** + * 企业名称 + */ + @Excel(name = "企业名称") + @ApiModelProperty(value = "企业名称", required = true) + private String companyName; + + /** + * 企业类型(社会企业，南网集团企业，南网控股企业) + */ + @Excel(name = "企业类型") + @ApiModelProperty(value = "企业类型", required = true) + private String companyType; + + /** + * 企业所属（广东电网、广西电网、贵州电网、云南电网、海南电网、储能公司、深圳供电局、超高压公司） + */ + @Excel(name = "企业所属") + @ApiModelProperty(value = "企业所属", required = true) + private String companyLtd; + + /** + * 统一社会信用代码 + */ + @Excel(name = "统一社会信用代码") + @ApiModelProperty(value = "统一社会信用代码", required = true) + private String creditCode; + + @Excel(name = "注册地址") + @ApiModelProperty(value = "注册地址", required = true) + private String registerId; + + @Excel(name = "经营地址") + @ApiModelProperty(value = "经营地址", required = true) + private String operateId; + + /** + * 注册地址 + */ + @Excel(name = "注册地址") + @ApiModelProperty(value = "注册地址", required = true) + private String registerAddress; + + /** + * 经营地址 + */ + @Excel(name = "经营地址") + @ApiModelProperty(value = "经营地址", required = true) + private String operateAddress; + + /** + * 证件类型 + */ + @Excel(name = "证件类型") + @ApiModelProperty(value = "证件类型", required = true) + private String certificatetype; + + /** + * 法人证件号码 + */ + @Excel(name = "法人证件号码") + @ApiModelProperty(value = "法人证件号码", required = true) + private String idNumber; + + /** + * 营业执照 + */ + @Excel(name = "营业执照") + @ApiModelProperty(value = "营业执照", required = true) + private String businessLicense; + + /** + * 法人姓名 + */ + @Excel(name = "法人姓名") + @ApiModelProperty(value = "法人姓名", required = true) + private String legalPerson; + + /** + * 邀请码 + */ + @Excel(name = "邀请码") + @ApiModelProperty(value = "邀请码", required = true) + private String invitationCode; + + /** + * 邀请企业名称 + */ + @Excel(name = "邀请企业名称") + @ApiModelProperty(value = "邀请企业名称", required = true) + private String invitationCoName; + + /** + * 经营范围 + */ + @Excel(name = "经营范围") + @ApiModelProperty(value = "经营范围", required = true) + private String businessScope; + + /** + * 被授权人姓名 + */ + @Excel(name = "被授权人姓名") + @ApiModelProperty(value = "被授权人姓名", required = true) + private String authPerson; + + /** + * 被授权人身份证 + */ + @Excel(name = "被授权人身份证") + @ApiModelProperty(value = "被授权人身份证", required = true) + private String authIdNumber; + + /** + * 被授权人手机号 + */ + @Excel(name = "被授权人手机号") + @ApiModelProperty(value = "被授权人手机号", required = true) + private String authPhone; + + /** + * 法人授权书 + */ + @Excel(name = "法人授权书") + @ApiModelProperty(value = "法人授权书", required = true) + private String authDocument; + + /** + * 被授权人身份证头像面 + */ + @Excel(name = "被授权人身份证头像面") + @ApiModelProperty(value = "被授权人身份证头像面", required = true) + private String idFaceUrl; + + /** + * 被授权人身份证国徽面 + */ + @Excel(name = "被授权人身份证国徽面") + @ApiModelProperty(value = "被授权人身份证国徽面", required = true) + private String idNationUrl; + + /** + * 被授权人邮箱 + */ + @Excel(name = "被授权人邮箱") + @ApiModelProperty(value = "被授权人邮箱", required = true) + private String authEmail; + + /** + * 创建时间 + */ + @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间", required = true) + private String createTime; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty(value = "创建人", required = true) + private Integer creator; + + /** + * 审核人 + */ + @Excel(name = "审核人") + @ApiModelProperty(value = "审核人", required = true) + private Integer auditor; + + /** + * 审核时间 + */ + @Excel(name = "审核时间") + @ApiModelProperty(value = "审核时间", required = true) + private String auditTime; + + /** + * 审核备注 + */ + @Excel(name = "审核备注") + @ApiModelProperty(value = "审核备注", required = true) + private String auditRemark; + + /** + * 状态（0待审核，1通过，2驳回） + */ + @Excel(name = "状态（0待审核，1通过，2驳回）") + @ApiModelProperty(value = "状态（0待审核，1通过，2驳回）", required = true) + private String status; + + @Excel(name = "公司logo") + @ApiModelProperty(value = "公司logo", required = true) + private String logoUrl; + + @Excel(name = "修改时间") + @ApiModelProperty(value = "修改时间", required = true) + private String updateTime; + + @Excel(name = "法人身份证头像面") + @ApiModelProperty(value = "法人身份证头像面", required = true) + private String legalFaceUrl; + + @Excel(name = "法人身份证国徽面") + @ApiModelProperty(value = "法人身份证国徽面", required = true) + private String legalNationUrl; + + //用户名 + private String userName; + + +} \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index 9c15501..00f32bb 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -1,5 +1,6 @@ package com.bonus.material.device.controller; +import com.bonus.common.biz.domain.BmCompanyInfo; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -30,7 +31,7 @@ public class DevInfoController extends BaseController { private DevInfoService devInfoService; /** - * 查询设备信息列表 + * 查询设备信息列表(首页装备共享大厅查询列表专用) */ // @RequiresPermissions("equip:info:list") @ApiOperation(value = "装备列表") @@ -41,6 +42,18 @@ public class DevInfoController extends BaseController { return getDataTable(list); } + /** + * 获取公司列表(供装备新增及首页所属公司筛选使用) + * @param obj + * @return + */ + @GetMapping("/companyList") + @ApiOperation("获取公司列表") + public AjaxResult companyList(BmCompanyInfo obj) { + List list = devInfoService.selectCompanyList(obj); + return success(list); + } + /** * 查询商品列表--包含附件查询 */ diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index caf1e7d..295ab7a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -15,75 +15,123 @@ import lombok.ToString; public class DevInfoVo extends DevInfo { private Integer pageNum; + private Integer pageSize; + private long parentId; - /* 装备类别 grandpa */ @ApiModelProperty(value = "装备类别") private String typeName; - /* 装备组别 parent */ + @ApiModelProperty(value = "装备组别") private String groupName; - /* 装备名称 child */ + @ApiModelProperty(value = "装备名称") private String deviceName; + @ApiModelProperty(value = "收藏id") private int collectId; + @ApiModelProperty(value = "公司名称") private String companyName; + + @ApiModelProperty(value = "公司经营地址") + private String operateAddress; + @ApiModelProperty(value = "公司logo") private String companyLogoUrl; + @ApiModelProperty(value = "公司入驻时间") private String companyCreateTime; + @ApiModelProperty(value = "公司上架数量") private Long companyUpNum; - /* 联系商家，被授权人手机号 */ + @ApiModelProperty(value = "认证人电话") private String authPhone; + @ApiModelProperty(value = "外观图集") private String[] pictures; + @ApiModelProperty(value = "关键词") private String keyWord; + @ApiModelProperty(value = "搜索数量") private Long searchNum; + @ApiModelProperty(value = "检验pdf") private String examinationPdf; + @ApiModelProperty(value = "保险pdf") private String insurancePdf; - /**上下架id*/ + @ApiModelProperty(value = "上下架id") private int upId; + @ApiModelProperty(value = "搜索月租金最下值") private Integer monthLeasePriceMin; + @ApiModelProperty(value = "搜索月租金最大值") private Integer monthLeasePriceMax; + @ApiModelProperty(value = "搜索装备年份最小值") private Integer ageMin; + @ApiModelProperty(value = "搜索装备年份最大值") private Integer ageMax; + @ApiModelProperty(value = "搜索装备工作小时最小值") private Integer workingHoursMin; + @ApiModelProperty(value = "搜索装备工作小时最大值") private Integer workingHoursMax; + @ApiModelProperty(value = "搜索装备月租金排序 ASC or DESC") - private String monthLeasePriceOrderBy; // ASC or DESC + private String monthLeasePriceOrderBy; + @ApiModelProperty(value = "搜索装备更新时间排序 ASC or DESC") - private String updateTimeOrderBy; // ASC or DESC + private String updateTimeOrderBy; + @ApiModelProperty(value = "装备分类级别") - private Integer level; //ma_type_level 级别: 1,2,3 + private Integer level; + @ApiModelProperty(value = "装备状态") private String maStatusStr; + @ApiModelProperty(value = "省份名称") private String provinceStr; + @ApiModelProperty(value = "市名称") private String cityStr; + @ApiModelProperty(value = "区名称") private String areaStr; - @ApiModelProperty(value = "装备类别Id") + + @ApiModelProperty(value = "所属公司id") private String companyId; - /* 装备组别 parent */ + @ApiModelProperty(value = "装备组别Id") private String groupId; + @ApiModelProperty(value = "用户id") private Long userId; + + @ApiModelProperty(value = "装备一级类目Id") + private String firstId; + + @ApiModelProperty(value = "装备一级类目名称") + private String firstName; + + @ApiModelProperty(value = "装备二级类目Id") + private String secondId; + + @ApiModelProperty(value = "装备二级类目名称") + private String secondName; + + @ApiModelProperty(value = "装备三级类目Id") + private String thirdId; + + @ApiModelProperty(value = "装备三级类目名称") + private String thirdName; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index 8f76c8a..6a890de 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -1,10 +1,7 @@ package com.bonus.material.device.mapper; -import com.bonus.common.biz.domain.BaseAddress; -import com.bonus.common.biz.domain.SysDic; -import com.bonus.common.biz.domain.SysFile; -import com.bonus.common.biz.domain.UserCollect; +import com.bonus.common.biz.domain.*; import com.bonus.material.device.domain.DevInfo; import com.bonus.material.device.domain.dto.InfoMotionDto; import com.bonus.material.device.domain.vo.DevInfoVo; @@ -99,5 +96,12 @@ public interface DevInfoMapper { String getBaseAddressById(Integer id); List selectDevInfoLists(DevInfoVo devInfo); + + /** + * 查询企业信息 + * @param obj + * @return + */ + List selectCompanyList(BmCompanyInfo obj); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java index 2388cd0..b9401a8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java @@ -1,6 +1,7 @@ package com.bonus.material.device.service; +import com.bonus.common.biz.domain.BmCompanyInfo; import com.bonus.material.device.domain.DevInfo; import com.bonus.material.device.domain.dto.InfoMotionDto; import com.bonus.material.device.domain.vo.DevInfoVo; @@ -23,7 +24,7 @@ public interface DevInfoService { DevInfoVo selectDevInfoByMaId(Long maId); /** - * 查询设备信息列表 + * 查询装备共享大厅列表 * * @param devInfo 设备信息 * @return 设备信息集合 @@ -81,4 +82,10 @@ public interface DevInfoService { List selectDevInfoLists(DevInfoVo devInfo); + /** + * 查询企业列表 + * @param obj + * @return + */ + List selectCompanyList(BmCompanyInfo obj); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index d5e4f3a..28aa0a7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -32,9 +32,6 @@ import java.util.stream.Collectors; */ @Service public class DevInfoServiceImpl implements DevInfoService { - private final Integer ASPECT_PICTURE = 20; - private final Integer EXAMINATION_PDF = 28; - private final Integer INSURANCE_PDF = 29; @Resource private DevInfoMapper devInfoMapper; @@ -76,17 +73,14 @@ public class DevInfoServiceImpl implements DevInfoService { } /** - * 查询设备信息列表 + * 查询装备共享大厅列表 * * @param devInfo 设备信息 * @return 设备信息 */ @Override public List selectDevInfoList(DevInfoVo devInfo) { - List list = devInfoMapper.selectDevInfoList(devInfo); - fillInMaStatusStr(list); - fillInCityStr(list); - return list; + return devInfoMapper.selectDevInfoList(devInfo); } /** @@ -268,6 +262,16 @@ public class DevInfoServiceImpl implements DevInfoService { return list; } + /** + * 查询公司列表 + * @param obj + * @return + */ + @Override + public List selectCompanyList(BmCompanyInfo obj) { + return devInfoMapper.selectCompanyList(obj); + } + @Override public void insertOutType(String devInfo) { ObjectMapper objectMapper = new ObjectMapper(); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 31af20a..c84e8ab 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -35,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -91,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.js_day_price = #{jsDayPrice} and d.description = #{description} and d.gps_code = #{gpsCode} - and d.own_co = #{ownCo} + and d.own_co = #{companyId} and d.creator = #{creator} and d.update_by = #{updateBy} and d.specification = #{specification} @@ -146,15 +145,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.person as person, d.person_phone as personPhone, c.company_name as companyName, - h.search_num as searchNum, d.create_time as createTime FROM ma_dev_info d - LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id LEFT JOIN bm_company_info c ON d.own_co = c.company_id where d.is_active='1' and d.ma_status = '2' + + and d.device_name like concat('%',#{deviceName},'%') + order by d.create_time desc @@ -165,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.device_name as deviceName, d.device_weight as deviceWeight, d.type_id as typeId, + mt4.type_name as typeName, d.ma_status as maStatus, d.brand as brand, d.model_name as modelName, @@ -176,11 +177,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.person as person, d.person_phone as personPhone, c.company_name as companyName, - h.search_num as searchNum + mt3.type_id as thirdId, + mt3.type_name as thirdName, + mt2.type_id as secondId, + mt2.type_name as secondName, + mt1.type_id as firstId, + mt1.type_name as firstName, + GROUP_CONCAT(CONCAT(mt1.type_name, '/', mt2.type_name, '/', mt3.type_name)) AS groupName FROM ma_dev_info d - LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id - LEFT JOIN bm_company_info c ON d.own_co = c.company_id + LEFT JOIN bm_company_info c ON d.own_co = c.company_id + LEFT JOIN ma_type mt4 ON mt4.type_id = d.type_id and mt4.del_flag = '0' + LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0' + LEFT JOIN ma_type mt2 ON mt2.type_id = mt3.parent_id and mt2.del_flag = '0' + LEFT JOIN ma_type mt1 ON mt1.type_id = mt2.parent_id and mt1.del_flag = '0' where d.is_active='1' and d.ma_id = #{maId} @@ -204,8 +214,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ma_id, code, - device_name, - device_weight, type_id, ma_status, lease_scope, @@ -381,12 +389,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name,u.type as type,t.group_name as type_name,t.p_id as group_id,t.group_id as company_id from ma_dev_info d left join (select t.*, p.type_name as parent_name, p.type_id as p_id,mt.type_name as group_name, mt.type_id as group_id - from ma_type t - left join ma_type p on t.parent_id=p.type_id - left join ma_type mt on p.parent_id = mt.type_id + from ma_type_info t + left join ma_type_info p on t.parent_id=p.type_id + left join ma_type_info mt on p.parent_id = mt.type_id ) t on d.type_id = t.type_id left join bm_company_info c on d.own_co = c.company_id left join ma_up_off u on d.ma_id = u.ma_id ORDER BY d.create_time desc + +