提交修改

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -1,6 +1,7 @@
 package org.springblade.client.corps.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -11,6 +12,7 @@ import org.springblade.client.corps.excel.CorpsExcel;
 import org.springblade.client.corps.excel.CorpsImport;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -22,7 +24,10 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 客户详情 控制器
@@ -141,9 +146,30 @@ public class CorpsDescController extends BladeController {
 	@PostMapping("/import-desc")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入客户资料", notes = "传入excel")
-	public R importUser(MultipartFile file) {
-		CorpsImport corpsImport = new CorpsImport(corpsDescService,false);
-		ExcelUtil.save(file, corpsImport, CorpsExcel.class);
+	public R importUser(MultipartFile file,String typeId) {
+		List<CorpsExcel> excelList = ExcelUtil.read(file, CorpsExcel.class);
+		if(CollectionUtils.isEmpty(excelList))
+		{
+			throw new SecurityException("数据不能为空");
+		}
+		excelList.forEach(e->{
+			e.setTypeId(typeId);
+		});
+		corpsDescService.importUser(excelList,false);
 		return R.success("操作成功");
 	}
+
+
+	/**
+	 * 导出模板
+	 */
+	@GetMapping("/export-template")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出模板")
+	public void exportPrice(HttpServletResponse response) {
+		List<CorpsExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "客户导入模板", "客户导入数据表", list, CorpsExcel.class);
+	}
+
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/CorpsExcel.java

@@ -49,6 +49,6 @@ public class CorpsExcel implements Serializable {
 	@ExcelProperty("外币银行账号")
 	private String accountNoFcy;
 
-	@ExcelProperty("类型id")
+	@ExcelProperty("类型id,可以不填")
 	private String typeId;
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -25,6 +25,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springblade.client.corps.excel.CorpsExcel;
@@ -53,6 +55,7 @@ import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -264,10 +267,28 @@ public class GoodsDescController extends BladeController {
 	@PostMapping("/import-desc")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入商品资料", notes = "传入excel")
-	public R importUser(MultipartFile file) {
-		GoodsImport corpsImport = new GoodsImport(goodsDescService,false);
-		ExcelUtil.save(file, corpsImport, GoodsExcel.class);
+	public R importUser(MultipartFile file,String typeId) {
+		List<GoodsExcel> excelList = ExcelUtil.read(file, GoodsExcel.class);
+		if(CollectionUtils.isEmpty(excelList))
+		{
+			throw new SecurityException("数据不能为空");
+		}
+		excelList.forEach(e->{
+			e.setTypeId(typeId);
+		});
+		goodsDescService.importGoods(excelList,false);
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 导出模板
+	 */
+	@GetMapping("/export-template")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出模板")
+	public void exportPrice(HttpServletResponse response) {
+		List<GoodsExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "商品导入模板", "商品导入数据表", list, GoodsExcel.class);
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsExcel.java

@@ -53,6 +53,6 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("备注")
 	private String remarks;
 
-	@ExcelProperty("类型id")
+	@ExcelProperty("分类id,可以为空")
 	private String typeId;
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -301,12 +301,13 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			goodsDesc.setBrand(e.getBrand());
 			goodsDesc.setBrandItem(e.getBrandItem());
 			goodsDesc.setSpecs(e.getSpecs());
-			goodsDesc.setType(Long.valueOf(e.getType()));
+			goodsDesc.setType(0L);
 			goodsDesc.setCategory(e.getCategory());
 			goodsDesc.setCategoryitem(e.getCategoryitem());
 			goodsDesc.setUnit(e.getUnit());
 			goodsDesc.setPackgeunit(e.getPackgeunit());
 			goodsDesc.setRemarks(e.getRemarks());
+			goodsDesc.setGoodsTypeId(e.getTypeId());
 			QueryWrapper<GoodsDesc> queryWrapper = Condition.getQueryWrapper(goodsDesc);
 			GoodsDesc one = goodsDescMapper.selectOne(queryWrapper);
 			if(one==null)