物品包装信息导出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java

@@ -8,10 +8,12 @@ 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.itembasic.vo.ItembasicRespVO;
 import com.win.module.wms.controller.itempackaging.vo.*;
 import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.itempackaging.ItempackagingConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.itempackaging.ItempackagingService;
@@ -79,14 +81,14 @@ public class ItempackagingController {
         return success(ItempackagingConvert.INSTANCE.convert(itempackaging));
     }
 
-    @GetMapping("/list")
+//    @GetMapping("/list")
-    @Operation(summary = "获得物品包装信息 列表")
+//    @Operation(summary = "获得物品包装信息 列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+//    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
+//    @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
-    public CommonResult<List<ItempackagingRespVO>> getItempackagingList(@RequestParam("ids") Collection<Long> ids) {
+//    public CommonResult<List<ItempackagingRespVO>> getItempackagingList(@RequestParam("ids") Collection<Long> ids) {
-        List<ItempackagingDO> list = itempackagingService.getItempackagingList(ids);
+//        List<ItempackagingDO> list = itempackagingService.getItempackagingList(ids);
-        return success(ItempackagingConvert.INSTANCE.convertList(list));
+//        return success(ItempackagingConvert.INSTANCE.convertList(list));
-    }
+//    }
 
     @GetMapping("/page")
     @Operation(summary = "获得物品包装信息分页")
@@ -130,6 +132,20 @@ public class ItempackagingController {
             vo.setCreator(user.getNickname());
         }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+
+        ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出物品包装信息 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:export')")
+    @OperateLog(type = EXPORT)
+    public void exportItempackagingExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ItempackagingDO> list = itempackagingService.getItempackagingList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ItempackagingExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "物品包装信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown);
+    }
+    private List<ItempackagingExcelVO> getExcelVo(List<ItempackagingDO> list, Map<Integer, String[]> mapDropDown) {
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
         mapDropDown.put(1, uom);
         String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
@@ -144,8 +160,16 @@ public class ItempackagingController {
         mapDropDown.put(11, altPackUnit4);;
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(13, available);;
-        ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<ItempackagingExcelVO> resultList = ItempackagingConvert.INSTANCE.convertList02(list);
+        for(ItempackagingExcelVO 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/itempackaging/ItempackagingMapper.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.itempackaging.vo.ItempackagingExportReqVO;
 import com.win.module.wms.controller.itempackaging.vo.ItempackagingPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -69,4 +70,7 @@ public interface ItempackagingMapper extends BaseMapperX<ItempackagingDO> {
     }
 
     default ItempackagingDO selectByItemCode(String itemCode){return selectOne(ItempackagingDO::getItemCode,itemCode);};
+    default List<ItempackagingDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java

@@ -52,7 +52,7 @@ public interface ItempackagingService {
      * @param ids 编号
      * @return 物品包装信息 列表
      */
-    List<ItempackagingDO> getItempackagingList(Collection<Long> ids);
+    List<ItempackagingDO> getItempackagingList(CustomConditions conditions);
 
     /**
      * 获得物品包装信息 分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java

@@ -71,8 +71,8 @@ public class ItempackagingServiceImpl implements ItempackagingService {
     }
 
     @Override
-    public List<ItempackagingDO> getItempackagingList(Collection<Long> ids) {
+    public List<ItempackagingDO> getItempackagingList(CustomConditions conditions) {
-        return itempackagingMapper.selectBatchIds(ids);
+        return itempackagingMapper.selectSeniorList(conditions);
     }
 
     @Override