标准成本价格单导出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java

@@ -9,11 +9,14 @@ 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.bom.vo.BomRespVO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.stdcostprice.vo.*;
 import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceImportExcelVo;
 import com.win.module.wms.convert.bom.BomConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert;
 import com.win.module.wms.dal.dataobject.bom.BomDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.stdcostprice.StdcostpriceService;
@@ -82,14 +85,6 @@ public class StdcostpriceController {
         return success(StdcostpriceConvert.INSTANCE.convert(stdcostprice));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得标准成本价格单列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:stdcostprice:query')")
-    public CommonResult<List<StdcostpriceRespVO>> getStdcostpriceList(@RequestParam("ids") Collection<Long> ids) {
-        List<StdcostpriceDO> list = stdcostpriceService.getStdcostpriceList(ids);
-        return success(StdcostpriceConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得标准成本价格单分页")
@@ -126,18 +121,33 @@ public class StdcostpriceController {
     public void exportStdcostpriceExcel(@Valid StdcostpriceExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<StdcostpriceDO> list = stdcostpriceService.getStdcostpriceList(exportReqVO);
-        // 导出 Excel
-        List<StdcostpriceExcelVO> datas = StdcostpriceConvert.INSTANCE.convertList02(list);
-        for(StdcostpriceExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }  Map<Integer, String[]> mapDropDown = new HashMap<>();
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<StdcostpriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "标准成本价格单.xlsx", "数据", StdcostpriceExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出标准成本价格单 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:stdcostprice:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStdcostpriceExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<StdcostpriceDO> list = stdcostpriceService.getStdcostpriceList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<StdcostpriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "标准成本价格单.xlsx", "数据", StdcostpriceExcelVO.class, resultList, mapDropDown);
+    }
+    private List<StdcostpriceExcelVO> getExcelVo(List<StdcostpriceDO> list, Map<Integer, String[]> 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", "数据", StdcostpriceExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<StdcostpriceExcelVO> resultList = StdcostpriceConvert.INSTANCE.convertList02(list);
+        for(StdcostpriceExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入标准成本价格单信息模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java

@@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceExportReqVO;
 import com.win.module.wms.controller.stdcostprice.vo.StdcostpricePageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -56,5 +57,8 @@ public interface StdcostpriceMapper extends BaseMapperX<StdcostpriceDO> {
                 .eqIfPresent(StdcostpriceDO::getCreator, reqVO.getCreator())
                 .orderByDesc(StdcostpriceDO::getId));
     }
+    default List<StdcostpriceDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java

@@ -62,7 +62,7 @@ public interface StdcostpriceService {
      * @param ids 编号
      * @return 标准成本价格单列表
      */
-    List<StdcostpriceDO> getStdcostpriceList(Collection<Long> ids);
+    List<StdcostpriceDO> getStdcostpriceList(CustomConditions conditions);
 
     /**
      * 获得标准成本价格单分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java

@@ -78,8 +78,8 @@ public class StdcostpriceServiceImpl implements StdcostpriceService {
     }
 
     @Override
-    public List<StdcostpriceDO> getStdcostpriceList(Collection<Long> ids) {
-        return stdcostpriceMapper.selectBatchIds(ids);
+    public List<StdcostpriceDO> getStdcostpriceList(CustomConditions conditions) {
+        return stdcostpriceMapper.selectSeniorList(conditions);
     }
 
     @Override