diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java index ad7dc8ca..4d3e2158 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java @@ -10,10 +10,13 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo; import com.win.module.wms.controller.customer.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO; import com.win.module.wms.convert.customer.CustomerConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; import com.win.module.wms.dal.dataobject.customer.CustomerDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customer.CustomerService; import io.swagger.v3.oas.annotations.Operation; @@ -122,22 +125,38 @@ public class CustomerController { public void exportCustomerExcel(@Valid CustomerExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = customerService.getCustomerList(exportReqVO); - // 导出 Excel - List datas = CustomerConvert.INSTANCE.convertList02(list); - for(CustomerExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户.xlsx", "数据", CustomerExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出客户 Excel") + @PreAuthorize("@ss.hasPermission('wms:customer:export')") + @OperateLog(type = EXPORT) + public void exportCustomerExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = customerService.getCustomerList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户.xlsx", "数据", CustomerExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(11, currency); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CUSTOMER_TYPE); mapDropDown.put(13, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(14, available); - ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = CustomerConvert.INSTANCE.convertList02(list); + for(CustomerExcelVO 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/customerdock/CustomerdockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java index 32fd5169..9f27940f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.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.customer.vo.CustomerRespVO; import com.win.module.wms.controller.customerdock.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.convert.customerdock.CustomerdockConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customerdock.CustomerdockService; import io.swagger.v3.oas.annotations.Operation; @@ -80,15 +83,6 @@ public class CustomerdockController { return success(CustomerdockConvert.INSTANCE.convert(customerdock)); } - @GetMapping("/list") - @Operation(summary = "获得客户月台列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:customerdock:query')") - public CommonResult> getCustomerdockList(@RequestParam("ids") Collection ids) { - List list = customerdockService.getCustomerdockList(ids); - return success(CustomerdockConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得客户月台分页") @PreAuthorize("@ss.hasPermission('wms:customerdock:query')") @@ -122,15 +116,31 @@ public class CustomerdockController { public void exportCustomerdockExcel(@Valid CustomerdockExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = customerdockService.getCustomerdockList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户月台.xlsx", "数据", CustomerdockExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出客户月台 Excel") + @PreAuthorize("@ss.hasPermission('wms:customerdock:export')") + @OperateLog(type = EXPORT) + public void exportCustomerdockExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = customerdockService.getCustomerdockList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户月台.xlsx", "数据", CustomerdockExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { // 导出 Excel - List datas = CustomerdockConvert.INSTANCE.convertList02(list); - for(CustomerdockExcelVO vo : datas) { + List resultList =CustomerdockConvert.INSTANCE.convertList02(list); + for(CustomerdockExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "客户月台.xls", "数据", CustomerdockExcelVO.class, datas); + 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/customeritem/CustomeritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java index b033056f..c0fff056 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.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.customerdock.vo.CustomerdockRespVO; import com.win.module.wms.controller.customeritem.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.convert.customeritem.CustomeritemConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customeritem.CustomeritemService; import io.swagger.v3.oas.annotations.Operation; @@ -80,14 +83,6 @@ public class CustomeritemController { return success(CustomeritemConvert.INSTANCE.convert(customeritem)); } - @GetMapping("/list") - @Operation(summary = "获得客户物品列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:customeritem:query')") - public CommonResult> getCustomeritemList(@RequestParam("ids") Collection ids) { - List list = customeritemService.getCustomeritemList(ids); - return success(CustomeritemConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得客户物品分页") @@ -122,14 +117,21 @@ public class CustomeritemController { public void exportCustomeritemExcel(@Valid CustomeritemExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = customeritemService.getCustomeritemList(exportReqVO); - // 导出 Excel - List datas = CustomeritemConvert.INSTANCE.convertList02(list); - for(CustomeritemExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出客户物品 Excel") + @PreAuthorize("@ss.hasPermission('wms:customeritem:export')") + @OperateLog(type = EXPORT) + public void exportCustomeritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = customeritemService.getCustomeritemList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(3, cusotmerUom); String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); @@ -138,7 +140,14 @@ public class CustomeritemController { mapDropDown.put(7, altPackUnit); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available); - ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = CustomeritemConvert.INSTANCE.convertList02(list); + for(CustomeritemExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java index 040852c7..c4209496 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java @@ -9,9 +9,12 @@ 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.customeritem.vo.CustomeritemRespVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.project.vo.*; import com.win.module.wms.convert.customeritem.CustomeritemConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.project.ProjectConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.project.ProjectDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.project.ProjectService; @@ -91,14 +94,6 @@ public class ProjectController { } return success(result); } - @GetMapping("/list") - @Operation(summary = "获得项目列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:project:query')") - public CommonResult> getProjectList(@RequestParam("ids") Collection ids) { - List list = projectService.getProjectList(ids); - return success(ProjectConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得项目分页") @@ -121,15 +116,32 @@ public class ProjectController { public void exportProjectExcel(@Valid ProjectExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = projectService.getProjectList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "项目.xlsx", "数据",ProjectExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出项目 Excel") + @PreAuthorize("@ss.hasPermission('wms:project:export')") + @OperateLog(type = EXPORT) + public void exportProjectExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = projectService.getProjectList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "项目.xlsx", "数据",ProjectExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + // 导出 Excel - List datas = ProjectConvert.INSTANCE.convertList02(list); - for(ProjectExcelVO vo : datas) { + List resultList = ProjectConvert.INSTANCE.convertList02(list); + for(ProjectExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "项目.xls", "数据", ProjectExcelVO.class, datas); + 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/saleprice/SalepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java index eba552c1..0463ef34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.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.project.vo.ProjectRespVO; import com.win.module.wms.controller.saleprice.vo.*; import com.win.module.wms.controller.saleprice.vo.SalepriceImportExcelVo; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.project.ProjectConvert; import com.win.module.wms.convert.saleprice.SalepriceConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.saleprice.SalepriceService; @@ -81,14 +84,6 @@ public class SalepriceController { return success(SalepriceConvert.INSTANCE.convert(saleprice)); } - @GetMapping("/list") - @Operation(summary = "获得销售价格单列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:saleprice:query')") - public CommonResult> getSalepriceList(@RequestParam("ids") Collection ids) { - List list = salepriceService.getSalepriceList(ids); - return success(SalepriceConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得销售价格单分页") @@ -123,20 +118,35 @@ public class SalepriceController { public void exportSalepriceExcel(@Valid SalepriceExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = salepriceService.getSalepriceList(exportReqVO); - // 导出 Excel - List datas = SalepriceConvert.INSTANCE.convertList02(list); - for(SalepriceExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "销售价格单.xlsx", "数据", SalepriceExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出销售价格单 Excel") + @PreAuthorize("@ss.hasPermission('wms:saleprice:export')") + @OperateLog(type = EXPORT) + public void exportSalepriceExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list =salepriceService.getSalepriceList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "销售价格单.xlsx", "数据", SalepriceExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(2, currency); - ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = SalepriceConvert.INSTANCE.convertList02(list); + for(SalepriceExcelVO 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/dal/mysql/customer/CustomerMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java index 982bb331..58e35eb3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customer.vo.CustomerExportReqVO; import com.win.module.wms.controller.customer.vo.CustomerPageReqVO; import com.win.module.wms.dal.dataobject.customer.CustomerDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -74,4 +75,7 @@ public interface CustomerMapper extends BaseMapperX { default CustomerDO selectByCode(String code){return selectOne(CustomerDO::getCode, code); } + 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/customerdock/CustomerdockMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java index 7fc7d24e..d2515973 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerdock.vo.CustomerdockExportReqVO; import com.win.module.wms.controller.customerdock.vo.CustomerdockPageReqVO; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -66,4 +67,7 @@ public interface CustomerdockMapper extends BaseMapperX { default CustomerdockDO selectByCode(String code){return selectOne(CustomerdockDO::getCode, code); } + 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/customeritem/CustomeritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java index b9a25785..98f55b99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customeritem.vo.CustomeritemExportReqVO; import com.win.module.wms.controller.customeritem.vo.CustomeritemPageReqVO; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -65,4 +66,8 @@ public interface CustomeritemMapper extends BaseMapperX { } default CustomeritemDO selectByItemCode(String itemCode){return selectOne(CustomeritemDO::getItemCode, itemCode);}; + 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/project/ProjectMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java index b8fd9a94..854db2d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.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.project.vo.ProjectExportReqVO; import com.win.module.wms.controller.project.vo.ProjectPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.project.ProjectDO; import org.apache.ibatis.annotations.Mapper; @@ -52,4 +53,7 @@ public interface ProjectMapper extends BaseMapperX { } default ProjectDO selectByCode(String code){return selectOne(ProjectDO::getCode,code);}; + 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/saleprice/SalepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java index 23b4f383..a5108a98 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.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.saleprice.vo.SalepriceExportReqVO; import com.win.module.wms.controller.saleprice.vo.SalepricePageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import org.apache.ibatis.annotations.Mapper; @@ -55,5 +56,8 @@ public interface SalepriceMapper extends BaseMapperX { .eqIfPresent(SalepriceDO::getCreator, reqVO.getCreator()) .orderByDesc(SalepriceDO::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/customer/CustomerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java index 26d53bf7..27d1f678 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java @@ -52,7 +52,7 @@ public interface CustomerService { * @param ids 编号 * @return 客户列表 */ - List getCustomerList(Collection ids); + List getCustomerList(CustomConditions conditions); /** * 获得客户分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java index c119c65a..944bb5d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java @@ -71,8 +71,8 @@ public class CustomerServiceImpl implements CustomerService { } @Override - public List getCustomerList(Collection ids) { - return customerMapper.selectBatchIds(ids); + public List getCustomerList(CustomConditions conditions) { + return customerMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java index 535a98f7..6f07b208 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java @@ -52,7 +52,7 @@ public interface CustomerdockService { * @param ids 编号 * @return 客户月台列表 */ - List getCustomerdockList(Collection ids); + List getCustomerdockList(CustomConditions conditions); /** * 获得客户月台分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java index 3bbfbd9b..882e44e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java @@ -78,8 +78,8 @@ public class CustomerdockServiceImpl implements CustomerdockService { } @Override - public List getCustomerdockList(Collection ids) { - return customerdockMapper.selectBatchIds(ids); + public List getCustomerdockList(CustomConditions conditions) { + return customerdockMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java index c492dd6f..465d7cab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java @@ -52,7 +52,7 @@ public interface CustomeritemService { * @param ids 编号 * @return 客户物品列表 */ - List getCustomeritemList(Collection ids); + List getCustomeritemList(CustomConditions conditions); /** * 获得客户物品分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java index 08c8ebbc..347a6846 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java @@ -77,8 +77,8 @@ public class CustomeritemServiceImpl implements CustomeritemService { } @Override - public List getCustomeritemList(Collection ids) { - return customeritemMapper.selectBatchIds(ids); + public List getCustomeritemList(CustomConditions conditions) { + return customeritemMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java index 7ce3b085..e850dc10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java @@ -59,7 +59,7 @@ public interface ProjectService { * @param ids 编号 * @return 项目列表 */ - List getProjectList(Collection ids); + List getProjectList(CustomConditions conditions); /** * 获得项目分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java index ca95f896..a860f6b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java @@ -72,8 +72,8 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public List getProjectList(Collection ids) { - return projectMapper.selectBatchIds(ids); + public List getProjectList(CustomConditions conditions) { + return projectMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java index 088f728b..982c9c26 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java @@ -61,7 +61,7 @@ public interface SalepriceService { * @param ids 编号 * @return 销售价格单列表 */ - List getSalepriceList(Collection ids); + List getSalepriceList(CustomConditions conditions); /** * 获得销售价格单分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java index 262cf907..a4a2bcb7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java @@ -74,8 +74,8 @@ public class SalepriceServiceImpl implements SalepriceService { } @Override - public List getSalepriceList(Collection ids) { - return salepriceMapper.selectBatchIds(ids); + public List getSalepriceList(CustomConditions conditions) { + return salepriceMapper.selectSeniorList(conditions); } @Override