From d0ea31c499c20966ed9454a03b799df59d22f5c8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 16 Nov 2023 08:59:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccountcalendarController.java | 39 +++++++++------- .../CurrencyexchangeController.java | 44 ++++++++++++------- .../SystemcalendarController.java | 39 ++++++++++------ .../AccountcalendarMapper.java | 3 ++ .../CurrencyexchangeMapper.java | 4 ++ .../systemcalendar/SystemcalendarMapper.java | 4 ++ .../AccountcalendarService.java | 4 +- .../AccountcalendarServiceImpl.java | 4 +- .../CurrencyexchangeService.java | 4 +- .../CurrencyexchangeServiceImpl.java | 4 +- .../systemcalendar/SystemcalendarService.java | 4 +- .../SystemcalendarServiceImpl.java | 4 +- 12 files changed, 99 insertions(+), 58 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java index 954f7285..75de7ed0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java @@ -9,10 +9,13 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.accountcalendar.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarRespVO; import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.accountcalendar.AccountcalendarService; import io.swagger.v3.oas.annotations.Operation; @@ -80,15 +83,6 @@ public class AccountcalendarController { return success(AccountcalendarConvert.INSTANCE.convert(accountcalendar)); } - @GetMapping("/list") - @Operation(summary = "获得账期日历列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") - public CommonResult> getAccountcalendarList(@RequestParam("ids") Collection ids) { - List list = accountcalendarService.getAccountcalendarList(ids); - return success(AccountcalendarConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得账期日历分页") @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") @@ -123,16 +117,31 @@ public class AccountcalendarController { public void exportAccountcalendarExcel(@Valid AccountcalendarExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = accountcalendarService.getAccountcalendarList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "账期日历.xlsx", "数据", AccountcalendarExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出账期日历 Excel") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:export')") + @OperateLog(type = EXPORT) + public void exportAccountcalendarExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = accountcalendarService.getAccountcalendarList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "账期日历.xlsx", "数据", AccountcalendarExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(6, available); // 导出 Excel - List datas = AccountcalendarConvert.INSTANCE.convertList02(list); - for(AccountcalendarExcelVO vo : datas) { + List resultList = AccountcalendarConvert.INSTANCE.convertList02(list); + for(AccountcalendarExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - }Map mapDropDown = new HashMap<>(); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(6, available); - ExcelUtils.write(response, "账期日历.xls", "数据", AccountcalendarExcelVO.class, datas,mapDropDown); + } + return resultList; } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java index f5cb5bf7..bba5ed96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java @@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarRespVO; import com.win.module.wms.controller.currencyexchange.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.currencyexchange.CurrencyexchangeService; import io.swagger.v3.oas.annotations.Operation; @@ -80,15 +83,6 @@ public class CurrencyexchangeController { return success(CurrencyexchangeConvert.INSTANCE.convert(currencyexchange)); } - @GetMapping("/list") - @Operation(summary = "获得货币转换列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')") - public CommonResult> getCurrencyexchangeList(@RequestParam("ids") Collection ids) { - List list = currencyexchangeService.getCurrencyexchangeList(ids); - return success(CurrencyexchangeConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得货币转换分页") @PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')") @@ -122,19 +116,35 @@ public class CurrencyexchangeController { public void exportCurrencyexchangeExcel(@Valid CurrencyexchangeExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = currencyexchangeService.getCurrencyexchangeList(exportReqVO); - // 导出 Excel - List datas = CurrencyexchangeConvert.INSTANCE.convertList02(list); - for(CurrencyexchangeExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "货币转换.xlsx", "数据", CurrencyexchangeExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出货币转换 Excel") + @PreAuthorize("@ss.hasPermission('wms:currencyexchange:export')") + @OperateLog(type = EXPORT) + public void exportCurrencyexchangeExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = currencyexchangeService.getCurrencyexchangeList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "货币转换.xlsx", "数据", CurrencyexchangeExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(0, currency); String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(3, isRequired); - ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = CurrencyexchangeConvert.INSTANCE.convertList02(list); + for(CurrencyexchangeExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入货币转换模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index 274efd62..01da58b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -8,11 +8,14 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO;; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.process.vo.ProcessRespVO; import com.win.module.wms.controller.systemcalendar.vo.*; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.process.ProcessConvert; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.systemcalendar.SystemcalendarService; @@ -79,14 +82,6 @@ public class SystemcalendarController { return success(SystemcalendarConvert.INSTANCE.convert(systemcalendar)); } - @GetMapping("/list") - @Operation(summary = "获得系统日历列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:systemcalendar:query')") - public CommonResult> getSystemcalendarList(@RequestParam("ids") Collection ids) { - List list = systemcalendarService.getSystemcalendarList(ids); - return success(SystemcalendarConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得系统日历分页") @@ -121,17 +116,33 @@ public class SystemcalendarController { public void exportSystemcalendarExcel(@Valid SystemcalendarExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = systemcalendarService.getSystemcalendarList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "系统日历.xlsx", "数据", SystemcalendarExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出系统日历 Excel") + @PreAuthorize("@ss.hasPermission('wms:systemcalendar:export')") + @OperateLog(type = EXPORT) + public void exportSystemcalendarExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = systemcalendarService.getSystemcalendarList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "系统日历.xlsx", "数据", SystemcalendarExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, available); // 导出 Excel - List datas = SystemcalendarConvert.INSTANCE.convertList02(list); - for(SystemcalendarExcelVO vo : datas) { + List resultList = SystemcalendarConvert.INSTANCE.convertList02(list); + for(SystemcalendarExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(3, available); - ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas,mapDropDown); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入班组信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java index 4c042438..3e6915aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java @@ -60,5 +60,8 @@ public interface AccountcalendarMapper extends BaseMapperX { .eqIfPresent(AccountcalendarDO::getCreator, reqVO.getCreator()) .orderByDesc(AccountcalendarDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java index 60c6514b..a5afe4ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangeExportReqVO; import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangePageReqVO; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -49,5 +50,8 @@ public interface CurrencyexchangeMapper extends BaseMapperX .eqIfPresent(CurrencyexchangeDO::getCreator, reqVO.getCreator()) .orderByDesc(CurrencyexchangeDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java index 4b450162..cbc42c17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarExportReqVO; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; import org.apache.ibatis.annotations.Mapper; @@ -49,5 +50,8 @@ public interface SystemcalendarMapper extends BaseMapperX { .eqIfPresent(SystemcalendarDO::getCreator, reqVO.getCreator()) .orderByDesc(SystemcalendarDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java index ef6ef7de..dabc9f03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java @@ -49,10 +49,10 @@ public interface AccountcalendarService { /** * 获得账期日历列表 * - * @param ids 编号 + * @param conditions 编号 * @return 账期日历列表 */ - List getAccountcalendarList(Collection ids); + List getAccountcalendarList(CustomConditions conditions); /** * 获得账期日历分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java index 8c043fe5..b1de58c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java @@ -70,8 +70,8 @@ public class AccountcalendarServiceImpl implements AccountcalendarService { } @Override - public List getAccountcalendarList(Collection ids) { - return accountcalendarMapper.selectBatchIds(ids); + public List getAccountcalendarList(CustomConditions conditions) { + return accountcalendarMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java index d8e02dd2..ec51e093 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java @@ -49,10 +49,10 @@ public interface CurrencyexchangeService { /** * 获得货币转换列表 * - * @param ids 编号 + * @param conditions 编号 * @return 货币转换列表 */ - List getCurrencyexchangeList(Collection ids); + List getCurrencyexchangeList(CustomConditions conditions); /** * 获得货币转换分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java index 2040ca6a..ab961db1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java @@ -80,8 +80,8 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService { } @Override - public List getCurrencyexchangeList(Collection ids) { - return currencyexchangeMapper.selectBatchIds(ids); + public List getCurrencyexchangeList(CustomConditions conditions) { + return currencyexchangeMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java index 35516d41..70eb13e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java @@ -55,10 +55,10 @@ public interface SystemcalendarService { /** * 获得系统日历列表 * - * @param ids 编号 + * @param conditions 编号 * @return 系统日历列表 */ - List getSystemcalendarList(Collection ids); + List getSystemcalendarList(CustomConditions conditions); /** * 获得系统日历分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java index de419b03..d437b4ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java @@ -70,8 +70,8 @@ public class SystemcalendarServiceImpl implements SystemcalendarService { } @Override - public List getSystemcalendarList(Collection ids) { - return systemcalendarMapper.selectBatchIds(ids); + public List getSystemcalendarList(CustomConditions conditions) { + return systemcalendarMapper.selectSeniorList(conditions); } @Override