From d5c2bbe053800a69a63c190ede9691222f9d0810 Mon Sep 17 00:00:00 2001 From: lius <Lius2225@163.com> Date: 星期二, 18 七月 2023 09:44:35 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java index 6cbc674..37d65a6 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java @@ -12,6 +12,7 @@ import org.jeecg.modules.mdc.mapper.MdcProcessQuantityMapper; import org.jeecg.modules.mdc.service.IMdcEquipmentService; import org.jeecg.modules.mdc.service.IMdcProcessQuantityService; +import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; @@ -47,7 +48,7 @@ * @return */ @Override - public IPage<MdcProcessQuantityDto> pageList(String userId, Page<MdcProcessQuantityDto> page, MdcProcessQuantity mdcProcessQuantity, HttpServletRequest req) { + public IPage<MdcProcessQuantityDto> pageList(String userId, Page<MdcProcessQuantityDto> page, MdcProcessQuantityVo mdcProcessQuantity, HttpServletRequest req) { List<String> equipmentIds = new ArrayList<>(); if (StringUtils.isNotEmpty(mdcProcessQuantity.getParentId()) && StringUtils.isEmpty(mdcProcessQuantity.getEquipmentId())) { if ("2".equals(mdcProcessQuantity.getTypeTree())) { @@ -89,7 +90,7 @@ * @return */ @Override - public ModelAndView exportXls(String userId, MdcProcessQuantity mdcProcessQuantity) { + public ModelAndView exportXls(String userId, MdcProcessQuantityVo mdcProcessQuantity) { List<String> equipmentIds = new ArrayList<>(); if (StringUtils.isNotEmpty(mdcProcessQuantity.getParentId()) && StringUtils.isEmpty(mdcProcessQuantity.getEquipmentId())) { if ("2".equals(mdcProcessQuantity.getTypeTree())) { -- Gitblit v1.9.3