公司添加

zhongzheng-admin/src/main/java/com/zhongzheng/controller/conpany/CompanyController.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.controller.conpany;
 
+import java.io.IOException;
 import java.util.List;
 
 import lombok.RequiredArgsConstructor;
@@ -37,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 @Api(value = "公司管理列控制器", tags = {"公司管理列管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/modules.company/company")
+@RequestMapping("/companyCon")
 public class CompanyController extends BaseController {
 
     private final ICompanyService iCompanyService;
@@ -55,7 +56,6 @@ public class CompanyController extends BaseController {
     }
 
 
-
     /**
      * 获取公司管理列详细信息
      */
@@ -72,7 +72,7 @@ public class CompanyController extends BaseController {
     @ApiOperation("新增公司管理列")
     @PreAuthorize("@ss.hasPermi('modules.company:company:add')")
     @Log(title = "公司管理列", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @PostMapping("/add")
     public AjaxResult<Void> add(@RequestBody CompanyAddBo bo) {
         return toAjax(iCompanyService.insertByAddBo(bo) ? 1 : 0);
     }
@@ -83,7 +83,7 @@ public class CompanyController extends BaseController {
     @ApiOperation("修改公司管理列")
     @PreAuthorize("@ss.hasPermi('modules.company:company:edit')")
     @Log(title = "公司管理列", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody CompanyEditBo bo) {
         return toAjax(iCompanyService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -94,9 +94,8 @@ public class CompanyController extends BaseController {
     @ApiOperation("导入公司")
     @PreAuthorize("@ss.hasPermi('modules.company:company:edit')")
     @Log(title = "公司管理列", businessType = BusinessType.INSERT)
-    @PutMapping()
-    public AjaxResult<Void> exc(MultipartFile file, HttpServletRequest request) {
-
+    @PostMapping("/importExcel")
+    public AjaxResult<Void> exc(MultipartFile file, HttpServletRequest request) throws IOException {
 
         // 判断文件是否为空
         if (file == null) {

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

@@ -27,7 +27,11 @@ public class CompanyAddBo {
     private String companySize;
     /** 行业类别 */
     @ApiModelProperty("行业类别")
-    private String industryType;
+    private Integer industryType;
+
+    /** 行业类别名字 */
+    @ApiModelProperty("行业类别名字")
+    private String industryTypeName;
     /** 公司介绍 */
     @ApiModelProperty("公司介绍")
     private String companyIntroduce;

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

@@ -35,7 +35,11 @@ public class CompanyEditBo {
 
     /** 行业类别 */
     @ApiModelProperty("行业类别")
-    private String industryType;
+    private Integer industryType;
+
+    /** 行业类别名字 */
+    @ApiModelProperty("行业类别名字")
+    private String industryTypeName;
 
     /** 公司介绍 */
     @ApiModelProperty("公司介绍")

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

@@ -44,7 +44,12 @@ public class CompanyQueryBo extends BaseEntity {
 	private String companySize;
 	/** 行业类别 */
 	@ApiModelProperty("行业类别")
-	private String industryType;
+	private Integer industryType;
+
+	/** 行业类别名字 */
+	@ApiModelProperty("行业类别名字")
+	private String industryTypeName;
+
 	/** 公司介绍 */
 	@ApiModelProperty("公司介绍")
 	private String companyIntroduce;

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

@@ -37,7 +37,10 @@ private static final long serialVersionUID=1L;
     private String companySize;
 
     /** 行业类别 */
-    private String industryType;
+    private Integer industryType;
+
+    /** 行业类别名字 */
+    private String industryTypeName;
 
     /** 公司介绍 */
     private String companyIntroduce;

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

@@ -11,4 +11,6 @@ import com.zhongzheng.modules.company.domain.Company;
  */
 public interface CompanyMapper extends BaseMapper<Company> {
 
+
+    Integer selectIndustry(String industry);
 }

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

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.company.bo.CompanyEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
@@ -52,9 +53,9 @@ public interface ICompanyService extends IService<Company> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 	/**
-	 * 校验并删除数据
+	 * 导入数据
 	 * @param file 文件
 	 * @return
 	 */
-    Boolean batchImport(MultipartFile file);
+    Boolean batchImport(MultipartFile file) throws IOException;
 }

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

@@ -1,8 +1,12 @@
 package com.zhongzheng.modules.company.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+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.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,9 +19,16 @@ import com.zhongzheng.modules.company.domain.Company;
 import com.zhongzheng.modules.company.mapper.CompanyMapper;
 import com.zhongzheng.modules.company.vo.CompanyVo;
 import com.zhongzheng.modules.company.service.ICompanyService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,7 +53,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         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(StrUtil.isNotBlank(bo.getIndustryType()), Company::getIndustryType, bo.getIndustryType());
+        lqw.eq(bo.getIndustryType()!=null, Company::getIndustryType, bo.getIndustryType());
         lqw.eq(StrUtil.isNotBlank(bo.getCompanyIntroduce()), Company::getCompanyIntroduce, bo.getCompanyIntroduce());
         lqw.eq(StrUtil.isNotBlank(bo.getLogoUrl()), Company::getLogoUrl, bo.getLogoUrl());
         lqw.eq(StrUtil.isNotBlank(bo.getLicenseUrl()), Company::getLicenseUrl, bo.getLicenseUrl());
@@ -113,7 +124,41 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     }
 
     @Override
-    public Boolean batchImport(MultipartFile file) {
-        return true;
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchImport(MultipartFile file) throws IOException {
+        byte [] byteArr=file.getBytes();
+        InputStream inputStream = new ByteArrayInputStream(byteArr);
+        ExcelReader reader = ExcelUtil.getReader(inputStream);
+        List<List<Object>> readAll = reader.read();
+        readAll.remove(0);
+        List<Company> companyList = new ArrayList<>();
+        String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+        Long nowTime = DateUtils.getNowTime();
+        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());
+            if (industryId == null){
+                throw new RuntimeException("第"+i+1+"行存在错误，请仔细检查再上传。");
+            }
+            company.setIndustryType(industryId);
+            company.setIndustryTypeName(readAll.get(i).get(2).toString());
+            company.setCompanySize(readAll.get(i).get(3).toString());
+            company.setCompanyIntroduce(readAll.get(i).get(4).toString());
+            company.setSocietyCode(readAll.get(i).get(5).toString());
+            company.setProvince(readAll.get(i).get(6).toString());
+            company.setCity(readAll.get(i).get(7).toString());
+            company.setAddress(readAll.get(i).get(8).toString());
+            company.setCompanyPh(readAll.get(i).get(9).toString());
+            company.setLinkMan(readAll.get(i).get(10).toString());
+            company.setPostBox(readAll.get(i).get(11).toString());
+            company.setTenantId(Convert.toLong(TenantId));
+            company.setCreateTime(nowTime);
+            company.setUpdateTime(nowTime);
+            company.setStatus(1);
+            companyList.add(company);
+        }
+        return this.saveBatch(companyList);
     }
 }

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

@@ -38,7 +38,7 @@ public class CompanyVo {
 	/** 行业类别 */
 	@Excel(name = "行业类别")
 	@ApiModelProperty("行业类别")
-	private String industryType;
+	private Integer industryType;
 	/** 公司介绍 */
 	@Excel(name = "公司介绍")
 	@ApiModelProperty("公司介绍")

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="companyIntroduce" column="company_introduce"/>
         <result property="logoUrl" column="logo_url"/>
         <result property="licenseUrl" column="license_url"/>
@@ -25,5 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
     </resultMap>
 
+    <select id="selectIndustry" resultType="integer" parameterType="map">
+        select trade_id FROM compony_trade where trade_name=#{industry} LIMIT 1
+    </select>
 
 </mapper>