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 ed03dbcbe..15bb39a28 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 @@ -5,6 +5,7 @@ import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,6 +18,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; @@ -69,9 +71,12 @@ public class SkuWeightController extends JeecgController 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; + public ModelAndView exportXls(HttpServletRequest request) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + List 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; } /** @@ -185,7 +195,7 @@ public class SkuWeightController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException { log.info("Importing Sku weights from Excel..."); 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 634967812..0c4e5ae2a 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 @@ -20,7 +20,10 @@ public interface SkuWeightMapper extends BaseMapper { String searchFirstEmptyWeightSku(@Param("skuIds") List skuIds); + List exportToExcel(@Param("skuIds") List skuIds); + List listLatestWeights(); List listLatestWeightForSkus(@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 a59b234bb..c9d5225f0 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 @@ -62,4 +62,23 @@ ORDER BY erp_code; + + \ 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 463c22047..ea1da9637 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 @@ -17,6 +17,7 @@ public interface ISkuWeightService extends IService { String searchFirstEmptyWeightSku(List skuIds); + List exportToExcel(List skuIds); /** * used to export all latest weights for front, so instead of fetching skuId, we fetch erpCode * @return 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 92c8d9b53..5531896e2 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 @@ -34,6 +34,11 @@ public class SkuWeightServiceImpl extends ServiceImpl exportToExcel(List skuIds) { + return skuWeightMapper.exportToExcel(skuIds); + } + @Override public List listLatestWeights() { return skuWeightMapper.listLatestWeights();