器具维修记录导出修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/ContainerRepairRecordMainController.java

@@ -2,11 +2,13 @@ package com.win.module.wms.controller.containerRepair;
 
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.PageResult;
+import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.wms.controller.containerRepair.vo.*;
 import com.win.module.wms.convert.containerRepair.ContainerRepairRecordMainConvert;
 import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordMainDO;
+import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.containerRepair.ContainerRepairRecordMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -93,10 +95,14 @@ public class ContainerRepairRecordMainController {
     @OperateLog(type = EXPORT)
     public void exportContainerRepairRecordMainExcel(@Valid ContainerRepairRecordMainExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
-        List<ContainerRepairRecordMainDO> list = containerRepairRecordMainService.getContainerRepairRecordMainList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] componentContainerStatusFrom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_STATUS);
+        mapDropDown.put(3, componentContainerStatusFrom);
+        String[] componentContainerStatusTo = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_STATUS);
+        mapDropDown.put(4, componentContainerStatusTo);
+        List<ContainerRepairRecordMainExcelVO> list = containerRepairRecordMainService.getContainerRepairRecordMainList(exportReqVO);
         // 导出 Excel
-        List<ContainerRepairRecordMainExcelVO> datas = ContainerRepairRecordMainConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "器具维修记录主.xls", "数据", ContainerRepairRecordMainExcelVO.class, list,mapDropDown);
-        ExcelUtils.write(response, "器具维修记录主.xls", "数据", ContainerRepairRecordMainExcelVO.class, datas);
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/vo/ContainerRepairRecordMainExcelVO.java

@@ -1,6 +1,9 @@
 package com.win.module.wms.controller.containerRepair.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.win.framework.excel.core.annotations.DictFormat;
+import com.win.framework.excel.core.convert.DictConvert;
+import com.win.module.wms.enums.DictTypeConstants;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -13,79 +16,24 @@ import java.time.LocalDateTime;
 @Data
 public class ContainerRepairRecordMainExcelVO {
 
-    @ExcelProperty("id")
-    private Long id;
-
     @ExcelProperty("单据号")
     private String number;
 
     @ExcelProperty("器具号")
     private String containerNumber;
 
-    @ExcelProperty("从仓库代码")
+    @ExcelProperty("仓库代码")
     private String fromWarehouseCode;
 
-    @ExcelProperty("到仓库代码")
+    @ExcelProperty(value = "从状态",converter = DictConvert.class)
-    private String toWarehouseCode;
+    @DictFormat(DictTypeConstants.CONTAINER_STATUS)
-
+    private String fromContainerStatus;
-    @ExcelProperty("出库事务类型")
-    private String outTransactionType;
-
-    @ExcelProperty("入库事务类型")
-    private String inTransactionType;
-
-    @ExcelProperty("执行时间")
-    private LocalDateTime executeTime;
-
-    @ExcelProperty("生效日期")
-    private LocalDateTime activeDate;
-
-    @ExcelProperty("是否可用")
-    private String available;
-
-    @ExcelProperty("申请时间")
-    private LocalDateTime requestTime;
-
-    @ExcelProperty("截止时间")
-    private LocalDateTime dueTime;
-
-    @ExcelProperty("部门")
-    private String departmentCode;
-
-    @ExcelProperty("用户组")
-    private String userGroupCode;
 
-    @ExcelProperty("接口类型")
+    @ExcelProperty(value = "到状态",converter = DictConvert.class)
-    private String interfaceType;
+    @DictFormat(DictTypeConstants.CONTAINER_STATUS)
-
+    private String toContainerStatus;
-    @ExcelProperty("业务类型")
-    private String businessType;
-
-    @ExcelProperty("备注")
-    private String remark;
 
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ExcelProperty("扩展属性")
-    private String extraProperties;
-
-    @ExcelProperty("地点ID")
-    private String siteId;
-
-    @ExcelProperty("代码")
-    private String code;
-
-    @ExcelProperty("从库位类型范围")
-    private String fromLocationTypes;
-
-    @ExcelProperty("到库位类型范围")
-    private String toLocationTypes;
-
-    @ExcelProperty("从库区代码范围")
-    private String fromAreaCodes;
-
-    @ExcelProperty("到库区代码范围")
-    private String toAreaCodes;
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainService.java

@@ -67,7 +67,7 @@ public interface ContainerRepairRecordMainService {
      * @param exportReqVO 查询条件
      * @return 器具维修记录主列表
      */
-    List<ContainerRepairRecordMainDO> getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO);
+    List<ContainerRepairRecordMainExcelVO> getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO);
 
     /**
     * 导入器具维修记录主主信息

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainServiceImpl.java

@@ -3,9 +3,16 @@ package com.win.module.wms.service.containerRepair;
 import cn.hutool.core.collection.CollUtil;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.containerRepair.vo.*;
+import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordDetailExportReqVO;
+import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordMainExcelVO;
 import com.win.module.wms.convert.containerRepair.ContainerRepairRecordMainConvert;
+import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordDetailDO;
 import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordMainDO;
+import com.win.module.wms.dal.dataobject.containerUnbind.ContainerUnbindRecordDetailDO;
+import com.win.module.wms.dal.dataobject.containerUnbind.ContainerUnbindRecordMainDO;
+import com.win.module.wms.dal.mysql.containerRepair.ContainerRepairRecordDetailMapper;
 import com.win.module.wms.dal.mysql.containerRepair.ContainerRepairRecordMainMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -13,6 +20,8 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.module.wms.enums.ErrorCodeConstants.CONTAINER_REPAIR_RECORD_MAIN_IMPORT_LIST_IS_EMPTY;
@@ -29,6 +38,9 @@ public class ContainerRepairRecordMainServiceImpl implements ContainerRepairReco
 
     @Resource
     private ContainerRepairRecordMainMapper containerRepairRecordMainMapper;
+    @Resource
+    private ContainerRepairRecordDetailMapper containerRepairRecordDetailMapper;
+
 
     @Override
     public Long createContainerRepairRecordMain(ContainerRepairRecordMainCreateReqVO createReqVO) {
@@ -78,8 +90,30 @@ public class ContainerRepairRecordMainServiceImpl implements ContainerRepairReco
     }
 
     @Override
-    public List<ContainerRepairRecordMainDO> getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO) {
+    public List<ContainerRepairRecordMainExcelVO> getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO) {
-        return containerRepairRecordMainMapper.selectList(exportReqVO);
+        List<ContainerRepairRecordMainExcelVO> excelVOList = new ArrayList<>();
+        List<ContainerRepairRecordMainDO> mainDOList = containerRepairRecordMainMapper.selectList(exportReqVO);
+        if(mainDOList != null && mainDOList.size() > 0){
+            ContainerRepairRecordDetailExportReqVO reqVO = new ContainerRepairRecordDetailExportReqVO();
+            BeanUtils.copyProperties(exportReqVO,reqVO);
+            List<ContainerRepairRecordDetailDO> detailDOList = containerRepairRecordDetailMapper.selectList(reqVO);
+            Map<Long,List<ContainerRepairRecordDetailDO>> groupMasterIdMap = detailDOList.stream().collect(Collectors.groupingBy(ContainerRepairRecordDetailDO::getMasterId));
+            for(ContainerRepairRecordMainDO mainDO:mainDOList){
+                Long id =  mainDO.getId();
+                List<ContainerRepairRecordDetailDO> detailChildList = groupMasterIdMap.get(id);
+                if(detailChildList != null && detailChildList.size() > 0){
+                    for(ContainerRepairRecordDetailDO detailDO:detailChildList){
+                        ContainerRepairRecordMainExcelVO containerRepairRecordMainExcelVO = new ContainerRepairRecordMainExcelVO();
+                        BeanUtils.copyProperties(mainDO,containerRepairRecordMainExcelVO);
+                        BeanUtils.copyProperties(detailDO,containerRepairRecordMainExcelVO);
+                        containerRepairRecordMainExcelVO.setFromContainerStatus(detailDO.getFromContainerStatus());
+                        containerRepairRecordMainExcelVO.setToContainerStatus(detailDO.getToContainerStatus());
+                        excelVOList.add(containerRepairRecordMainExcelVO);
+                    }
+                }
+            }
+        }
+        return excelVOList;
     }
 
     @Override