行业类型

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/bo/CompanyAddBo.java

@@ -1,16 +1,18 @@
 package com.zhongzheng.modules.company.bo;
 
-import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import java.util.Date;
+
 
 
 /**
  * 公司管理列添加对象 company
  *
  * @author ruoyi
- * @date 2021-08-12
+ * @date 2021-08-16
  */
 @Data
 @ApiModel("公司管理列添加对象")
@@ -21,20 +23,19 @@ public class CompanyAddBo {
     private String companyName;
     /** 公司类型 */
     @ApiModelProperty("公司类型")
-    private String companyType;
+    private Long companyTypeId;
     /** 公司规模 */
     @ApiModelProperty("公司规模")
-    private String companySize;
-    /** 行业类别 */
-    @ApiModelProperty("行业类别")
-    private Integer industryType;
-
-    /** 行业类别名字 */
-    @ApiModelProperty("行业类别名字")
-    private String industryTypeName;
+    private Long companySizeId;
+    /** 行业类别id */
+    @ApiModelProperty("行业类别id")
+    private Long industryTypeId;
     /** 公司介绍 */
     @ApiModelProperty("公司介绍")
     private String companyIntroduce;
+    /** 行业类别名字 */
+    @ApiModelProperty("行业类别名字")
+    private String industryTypeName;
     /** 公司logo */
     @ApiModelProperty("公司logo")
     private String logoUrl;
@@ -71,11 +72,7 @@ public class CompanyAddBo {
     /** 0 删除 1有效 */
     @ApiModelProperty("0 删除 1有效")
     private Integer status;
-
-    /** 租户id */
-    @ApiModelProperty("租户id")
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
     private Long tenantId;
-
-
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/bo/CompanyEditBo.java

@@ -1,16 +1,17 @@
 package com.zhongzheng.modules.company.bo;
 
-import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import java.util.Date;
 
 
 /**
  * 公司管理列编辑对象 company
  *
  * @author ruoyi
- * @date 2021-08-12
+ * @date 2021-08-16
  */
 @Data
 @ApiModel("公司管理列编辑对象")
@@ -27,24 +28,24 @@ public class CompanyEditBo {
 
     /** 公司类型 */
     @ApiModelProperty("公司类型")
-    private String companyType;
+    private Long companyTypeId;
 
     /** 公司规模 */
     @ApiModelProperty("公司规模")
-    private String companySize;
+    private Long companySizeId;
 
-    /** 行业类别 */
-    @ApiModelProperty("行业类别")
-    private Integer industryType;
-
-    /** 行业类别名字 */
-    @ApiModelProperty("行业类别名字")
-    private String industryTypeName;
+    /** 行业类别id */
+    @ApiModelProperty("行业类别id")
+    private Long industryTypeId;
 
     /** 公司介绍 */
     @ApiModelProperty("公司介绍")
     private String companyIntroduce;
 
+    /** 行业类别名字 */
+    @ApiModelProperty("行业类别名字")
+    private String industryTypeName;
+
     /** 公司logo */
     @ApiModelProperty("公司logo")
     private String logoUrl;
@@ -89,8 +90,7 @@ public class CompanyEditBo {
     @ApiModelProperty("0 删除 1有效")
     private Integer status;
 
-    /** 租户id */
-    @ApiModelProperty("租户id")
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
     private Long tenantId;
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/bo/CompanyQueryBo.java

@@ -1,18 +1,21 @@
 package com.zhongzheng.modules.company.bo;
 
-import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
 import com.zhongzheng.common.core.domain.BaseEntity;
 
 /**
  * 公司管理列分页查询对象 company
  *
  * @author ruoyi
- * @date 2021-08-12
+ * @date 2021-08-16
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -38,21 +41,19 @@ public class CompanyQueryBo extends BaseEntity {
 	private String companyName;
 	/** 公司类型 */
 	@ApiModelProperty("公司类型")
-	private String companyType;
+	private Long companyTypeId;
 	/** 公司规模 */
 	@ApiModelProperty("公司规模")
-	private String companySize;
-	/** 行业类别 */
-	@ApiModelProperty("行业类别")
-	private Integer industryType;
-
-	/** 行业类别名字 */
-	@ApiModelProperty("行业类别名字")
-	private String industryTypeName;
-
+	private Long companySizeId;
+	/** 行业类别id */
+	@ApiModelProperty("行业类别id")
+	private Long industryTypeId;
 	/** 公司介绍 */
 	@ApiModelProperty("公司介绍")
 	private String companyIntroduce;
+	/** 行业类别名字 */
+	@ApiModelProperty("行业类别名字")
+	private String industryTypeName;
 	/** 公司logo */
 	@ApiModelProperty("公司logo")
 	private String logoUrl;
@@ -83,10 +84,8 @@ public class CompanyQueryBo extends BaseEntity {
 	/** 0 删除 1有效 */
 	@ApiModelProperty("0 删除 1有效")
 	private Integer status;
-
-	/** 租户id */
-	@ApiModelProperty("租户id")
+	/** 商户ID */
+	@ApiModelProperty("商户ID")
 	private Long tenantId;
 
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/domain/Company.java

@@ -1,18 +1,19 @@
 package com.zhongzheng.modules.company.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 公司管理列对象 company
  * 
- * @author change
- * @date 2021-08-12
+ * @author ruoyi
+ * @date 2021-08-16
  */
 @Data
 @NoArgsConstructor
@@ -31,20 +32,20 @@ private static final long serialVersionUID=1L;
     private String companyName;
 
     /** 公司类型 */
-    private String companyType;
+    private Long companyTypeId;
 
     /** 公司规模 */
-    private String companySize;
-
-    /** 行业类别 */
-    private Integer industryType;
+    private Long companySizeId;
 
-    /** 行业类别名字 */
-    private String industryTypeName;
+    /** 行业类别id */
+    private Long industryTypeId;
 
     /** 公司介绍 */
     private String companyIntroduce;
 
+    /** 行业类别名字 */
+    private String industryTypeName;
+
     /** 公司logo */
     private String logoUrl;
 
@@ -83,10 +84,7 @@ private static final long serialVersionUID=1L;
     /** 0 删除 1有效 */
     private Integer status;
 
-    /** 租户id */
-    @Excel(name = "租户id")
-    @ApiModelProperty("租户id")
+    /** 商户ID */
     private Long tenantId;
 
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/mapper/CompanyMapper.java

@@ -12,5 +12,5 @@ import com.zhongzheng.modules.company.domain.Company;
 public interface CompanyMapper extends BaseMapper<Company> {
 
 
-    Integer selectIndustry(String industry);
+    Long selectIndustry(String industry);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/impl/CompanyServiceImpl.java

@@ -5,8 +5,13 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
+import com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.company.service.ICompanyTradeService;
+import com.zhongzheng.modules.company.vo.CompanyTradeVo;
+import com.zhongzheng.modules.system.service.ISysDictDataService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -28,7 +33,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,11 +41,17 @@ import java.util.stream.Collectors;
  * 公司管理列Service业务层处理
  *
  * @author ruoyi
- * @date 2021-08-12
+ * @date 2021-08-16
  */
 @Service
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements ICompanyService {
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ICompanyTradeService iCompanyTradeService;
+
     @Override
     public CompanyVo queryById(Long companyId){
         Company db = this.baseMapper.selectById(companyId);
@@ -51,10 +62,11 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     public List<CompanyVo> queryList(CompanyQueryBo bo) {
         LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getCompanyName()), Company::getCompanyName, bo.getCompanyName());
-        lqw.eq(StrUtil.isNotBlank(bo.getCompanyType()), Company::getCompanyType, bo.getCompanyType());
-        lqw.eq(StrUtil.isNotBlank(bo.getCompanySize()), Company::getCompanySize, bo.getCompanySize());
-        lqw.eq(bo.getIndustryType()!=null, Company::getIndustryType, bo.getIndustryType());
+        lqw.eq(bo.getCompanyTypeId() != null, Company::getCompanyTypeId, bo.getCompanyTypeId());
+        lqw.eq(bo.getCompanySizeId() != null, Company::getCompanySizeId, bo.getCompanySizeId());
+        lqw.eq(bo.getIndustryTypeId() != null, Company::getIndustryTypeId, bo.getIndustryTypeId());
         lqw.eq(StrUtil.isNotBlank(bo.getCompanyIntroduce()), Company::getCompanyIntroduce, bo.getCompanyIntroduce());
+        lqw.like(StrUtil.isNotBlank(bo.getIndustryTypeName()), Company::getIndustryTypeName, bo.getIndustryTypeName());
         lqw.eq(StrUtil.isNotBlank(bo.getLogoUrl()), Company::getLogoUrl, bo.getLogoUrl());
         lqw.eq(StrUtil.isNotBlank(bo.getLicenseUrl()), Company::getLicenseUrl, bo.getLicenseUrl());
         lqw.eq(StrUtil.isNotBlank(bo.getSocietyCode()), Company::getSocietyCode, bo.getSocietyCode());
@@ -64,9 +76,16 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         lqw.eq(StrUtil.isNotBlank(bo.getCompanyPh()), Company::getCompanyPh, bo.getCompanyPh());
         lqw.eq(StrUtil.isNotBlank(bo.getLinkMan()), Company::getLinkMan, bo.getLinkMan());
         lqw.eq(StrUtil.isNotBlank(bo.getPostBox()), Company::getPostBox, bo.getPostBox());
-        lqw.eq( Company::getStatus, 1);
-        lqw.eq(bo.getTenantId()!=null,Company::getTenantId, bo.getTenantId());
-        return entity2Vo(this.list(lqw));
+        lqw.eq(Company::getStatus, 1);
+        lqw.eq(bo.getTenantId() != null, Company::getTenantId, bo.getTenantId());
+        List<CompanyVo> companyVos = entity2Vo(this.list(lqw));
+        for (CompanyVo companyVo : companyVos) {
+            SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
+            SysDictData sysDictData1 = dictDataService.selectDictDataById(companyVo.getCompanySizeId());
+            companyVo.setCompanyType(sysDictData.getDictLabel());
+            companyVo.setCompanySize(sysDictData1.getDictLabel());
+        }
+        return companyVos;
     }
 
     /**
@@ -95,6 +114,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setStatus(1);
+        CompanyTradeVo companyTradeVo = iCompanyTradeService.queryById(bo.getIndustryTypeId());
+        add.setIndustryTypeName(companyTradeVo.getTradeName());
         return this.save(add);
     }
 
@@ -137,14 +159,23 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         for (int i = 0; i < readAll.size(); i++) {
             Company company = new Company();
             company.setCompanyName(readAll.get(i).get(0).toString());
-            company.setCompanyType(readAll.get(i).get(1).toString());
-            Integer industryId = baseMapper.selectIndustry(readAll.get(i).get(2).toString());
+            LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
+            Long sysDictData = dictDataService.selectDictLabelType("company_type",readAll.get(i).get(1).toString());
+            if (sysDictData == null){
+                throw new RuntimeException("第"+i+1+"行公司类型存在错误，请仔细检查再上传。");
+            }
+            company.setCompanyTypeId(sysDictData);
+            Long industryId = baseMapper.selectIndustry(readAll.get(i).get(2).toString());
             if (industryId == null){
-                throw new RuntimeException("第"+i+1+"行存在错误，请仔细检查再上传。");
+                throw new RuntimeException("第"+i+1+"行行业类别存在错误，请仔细检查再上传。");
             }
-            company.setIndustryType(industryId);
+            company.setIndustryTypeId(industryId);
             company.setIndustryTypeName(readAll.get(i).get(2).toString());
-            company.setCompanySize(readAll.get(i).get(3).toString());
+            Long sysDictLong = dictDataService.selectDictLabelType("company_size",readAll.get(i).get(3).toString());
+            if (sysDictLong == null){
+                throw new RuntimeException("第"+i+1+"行公司规模存在错误，请仔细检查再上传。");
+            }
+            company.setCompanySizeId(sysDictLong);
             company.setCompanyIntroduce(readAll.get(i).get(4).toString());
             company.setSocietyCode(readAll.get(i).get(5).toString());
             company.setProvince(readAll.get(i).get(6).toString());

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/vo/CompanyVo.java

@@ -1,18 +1,19 @@
 package com.zhongzheng.modules.company.vo;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.Date;
+
 
 
 /**
  * 公司管理列视图对象 mall_package
  *
  * @author ruoyi
- * @date 2021-08-12
+ * @date 2021-08-16
  */
 @Data
 @ApiModel("公司管理列视图对象")
@@ -28,21 +29,34 @@ public class CompanyVo {
 	@ApiModelProperty("公司名称")
 	private String companyName;
 	/** 公司类型 */
+	@Excel(name = "公司类型id")
+	@ApiModelProperty("公司类型id")
+	private Long companyTypeId;
+
 	@Excel(name = "公司类型")
 	@ApiModelProperty("公司类型")
 	private String companyType;
+	/** 公司规模 */
+	@Excel(name = "公司规模id")
+	@ApiModelProperty("公司规模id")
+	private Long companySizeId;
+
 	/** 公司规模 */
 	@Excel(name = "公司规模")
 	@ApiModelProperty("公司规模")
 	private String companySize;
-	/** 行业类别 */
-	@Excel(name = "行业类别")
-	@ApiModelProperty("行业类别")
-	private Integer industryType;
+	/** 行业类别id */
+	@Excel(name = "行业类别id")
+	@ApiModelProperty("行业类别id")
+	private Long industryTypeId;
 	/** 公司介绍 */
 	@Excel(name = "公司介绍")
 	@ApiModelProperty("公司介绍")
 	private String companyIntroduce;
+	/** 行业类别名字 */
+	@Excel(name = "行业类别名字")
+	@ApiModelProperty("行业类别名字")
+	private String industryTypeName;
 	/** 公司logo */
 	@Excel(name = "公司logo")
 	@ApiModelProperty("公司logo")
@@ -83,10 +97,9 @@ public class CompanyVo {
 	@Excel(name = "0 删除 1有效")
 	@ApiModelProperty("0 删除 1有效")
 	private Integer status;
-
-	/** 租户id */
-	@Excel(name = "租户id")
-	@ApiModelProperty("租户id")
+	/** 商户ID */
+	@Excel(name = "商户ID")
+	@ApiModelProperty("商户ID")
 	private Long tenantId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysDictDataService.java

@@ -59,4 +59,6 @@ public interface ISysDictDataService extends IService<SysDictData> {
      * @return 结果
      */
     public int updateDictData(SysDictData dictData);
+
+    Long selectDictLabelType(String company_type, String toString);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysDictDataServiceImpl.java

@@ -115,6 +115,15 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
         return row;
     }
 
+    @Override
+    public Long selectDictLabelType(String company_type, String toString) {
+        return  getOne(new LambdaQueryWrapper<SysDictData>()
+                .select(SysDictData::getDictCode)
+                .eq(SysDictData::getDictType, company_type)
+                .eq(SysDictData::getDictLabel, toString))
+                .getDictCode();
+    }
+
     /**
      * 保存前的数据校验
      *

zhongzheng-system/src/main/resources/mapper/modules/company/CompanyMapper.xml

@@ -7,11 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zhongzheng.modules.company.domain.Company" id="CompanyResult">
         <result property="companyId" column="company_id"/>
         <result property="companyName" column="company_name"/>
-        <result property="companyType" column="company_type"/>
-        <result property="companySize" column="company_size"/>
-        <result property="industryType" column="industry_type"/>
-        <result property="industryTypeName" column="industry_type_name"/>
+        <result property="companyTypeId" column="company_type_id"/>
+        <result property="companySizeId" column="company_size_id"/>
+        <result property="industryTypeId" column="industry_type_id"/>
         <result property="companyIntroduce" column="company_introduce"/>
+        <result property="industryTypeName" column="industry_type_name"/>
         <result property="logoUrl" column="logo_url"/>
         <result property="licenseUrl" column="license_url"/>
         <result property="societyCode" column="society_code"/>
@@ -24,10 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
-    <select id="selectIndustry" resultType="integer" parameterType="map">
-        select trade_id FROM compony_trade where trade_name=#{industry} LIMIT 1
+
+    <select id="selectIndustry" resultType="Long" parameterType="map">
+        select trade_id FROM company_trade where trade_name=#{industry} LIMIT 1
     </select>
 
 </mapper>