From 15f220e1cceb79bfe715ec6d14b8d2ad37611a0c Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Mon, 17 Feb 2025 15:21:19 +0100 Subject: [PATCH] fix: sku weight export effective date format --- .../controller/admin/SkuWeightController.java | 30 ++++++++++++++++--- .../modules/business/entity/SkuWeight.java | 4 ++- .../business/mapper/SkuWeightMapper.java | 2 ++ .../business/mapper/xml/SkuWeightMapper.xml | 18 +++++++++++ .../business/service/ISkuWeightService.java | 2 ++ .../service/impl/SkuWeightServiceImpl.java | 5 ++++ 6 files changed, 56 insertions(+), 5 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 e004dd2bd..5dd138f4f 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 @@ -1,6 +1,7 @@ package org.jeecg.modules.business.controller.admin; import java.util.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -8,6 +9,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.config.JeecgBaseConfig; import org.jeecg.modules.business.entity.Sku; import org.jeecg.modules.business.entity.SkuWeight; import org.jeecg.modules.business.mongoService.SkuMongoService; @@ -24,6 +26,9 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.business.vo.Responses; import org.jeecg.modules.business.vo.SkuWeightParam; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -54,6 +59,8 @@ 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; } /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuWeight.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuWeight.java index 2c944f411..9743fd843 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuWeight.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuWeight.java @@ -69,7 +69,9 @@ public class SkuWeight implements Serializable { /** * 生效日期 */ - @Excel(name = "生效日期", width = 15) + @JsonFormat(timezone = "GMT+2", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "生效日期", width = 15, format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "生效日期") private java.util.Date effectiveDate; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java index c1b6db9a3..8898c893d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java @@ -18,4 +18,6 @@ public interface SkuWeightMapper extends BaseMapper { SkuWeight getBySkuId(@Param("skuId") String skuId); String searchFirstEmptyWeightSku(@Param("skuIds") List skuIds); + + List exportToExcel(@Param("skuIds") List skuIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml index bc210352e..67f9d264e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml @@ -24,4 +24,22 @@ ) LIMIT 1; + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java index fe674e045..a9dbf03e0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java @@ -15,4 +15,6 @@ public interface ISkuWeightService extends IService { SkuWeight getBySkuId(String skuId); String searchFirstEmptyWeightSku(List skuIds); + + List exportToExcel(List skuIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java index 21ce36867..73940ee0f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java @@ -32,4 +32,9 @@ public class SkuWeightServiceImpl extends ServiceImpl skuIds) { return skuWeightMapper.searchFirstEmptyWeightSku(skuIds); } + + @Override + public List exportToExcel(List skuIds) { + return skuWeightMapper.exportToExcel(skuIds); + } }