From 2360d89ec129e0585e24fa3fcd58815205adc15a Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Mon, 24 Feb 2025 17:24:58 +0100 Subject: [PATCH 1/2] feat : credit description --- .../java/org/jeecg/modules/business/entity/Credit.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java index 12de31b01..9045614ce 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java @@ -2,12 +2,10 @@ package org.jeecg.modules.business.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -57,6 +55,9 @@ public class Credit implements Serializable { @Dict(dictTable = "client WHERE active = '1'", dicText = "internal_code", dicCode = "id") @ApiModelProperty(value = "client_id") private java.lang.String clientId; + @Excel(name = "description", width = 15) + @ApiModelProperty(value = "description") + private java.lang.String description; /**amount*/ @Excel(name = "amount", width = 15) @ApiModelProperty(value = "amount") From b7e55aef7e5521d32d308d6f184934ed24a9dfbc Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Tue, 25 Feb 2025 10:15:33 +0100 Subject: [PATCH 2/2] fix : SKu weight export --- .../controller/admin/SkuWeightController.java | 42 +++++++++---------- .../modules/business/vo/SkuWeightPage.java | 2 +- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java index 15bb39a28..cb0f9423e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java @@ -9,6 +9,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -164,29 +165,24 @@ public class SkuWeightController extends JeecgController selections = new ArrayList<>(); - request.getParameterMap().forEach((k,v) -> { - if(k.equals("selections[]")) { - selections.addAll(Arrays.asList(v)); - } - }); - List exportList = skuWeightService.exportToExcel(selections); - - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "SKU重量"); - mv.addObject(NormalExcelConstants.CLASS, SkuWeight.class); - ExportParams exportParams=new ExportParams("SKU重量报表", "导出人:" + sysUser.getRealname(), "SKU重量"); - exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; - } + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(@RequestParam(value = "selections[]", required = false) List skuIds) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List skuWeightList; + if (skuIds == null || skuIds.isEmpty()) { + skuWeightList = skuWeightService.listLatestWeights(); + } else { + skuWeightList = skuWeightService.listLatestWeightForSkus(skuIds); + } + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "SKU重量列表"); + mv.addObject(NormalExcelConstants.CLASS, SkuWeightPage.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("SKU重量数据", "导出人:" + sysUser.getRealname(), "SKU重量")); + mv.addObject(NormalExcelConstants.DATA_LIST, skuWeightList); + return mv; + } /** * 通过excel导入数据 @@ -208,7 +204,7 @@ public class SkuWeightController extends JeecgController entity : fileMap.entrySet()) { MultipartFile file = entity.getValue(); try (InputStream inputStream = file.getInputStream()){ - Workbook workbook = new XSSFWorkbook(inputStream); + Workbook workbook = new HSSFWorkbook(inputStream); Sheet firstSheet = workbook.getSheetAt(0); int firstRow = firstSheet.getFirstRowNum(); int lastRow = firstSheet.getLastRowNum(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java index 69ba4e094..c6d388729 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java @@ -17,7 +17,7 @@ public class SkuWeightPage { @Excel(name = "重量", width = 15) @ApiModelProperty(value = "重量") private Integer weight; - @Excel(name = "生效日期", width = 15) + @Excel(name = "生效日期", width = 15, format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "生效日期") private Date effectiveDate; }