fix: 订单导出

谢茂盛
1 parent 4f0c10d9
Showing 3 changed files with 224 additions and 31 deletions
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -135,5 +135,10 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
      */
     private String endCheckResult;
+    /**
+     * 选择的字段
+     */
+    private OrderLockFieldVO fieldVO;
+
 }
@@ -196,7 +196,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if (Objects.isNull(adminUserDo.getDeptId())) {
             adminUserDo.setDeptId(1L);
         }
-        adminUserDo.setIsAdmin(false);
+        adminUserDo.setIsAdmin(true);
         adminUserDo.setPassword(passwordEncoder.encode("123456"));
         save(adminUserDo);
@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
-import com.order.erp.common.excel4j.ExcelUtils;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.FileUtil;
@@ -25,7 +24,6 @@ import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.AdminUserDO;
 import com.order.erp.domain.dto.order.*;
-import com.order.erp.domain.excel.OrderExcelVO;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.admin.AdminUserService;
@@ -38,7 +36,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
@@ -172,6 +169,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Override
     public ServerResult export(HttpServletResponse response, OrderBaseInfoQueryVO queryVO) throws IOException, Excel4JException {
+        OrderLockFieldVO lockFieldVO = queryVO.getFieldVO();
+        if (Objects.isNull(lockFieldVO)) {
+            throw new BusinessException("请选择要导出的列！");
+        }
         LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = buildQueryByParam(queryVO);
         List<OrderBaseInfoDO> orderBaseInfoDOList = list(queryWrapper);
         if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
@@ -181,43 +182,230 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 return resultVO;
             }).collect(Collectors.toList());
-            // 填充利润分析
-            fillProfitAnalysisInfo(resultVOList);
+            if (Objects.nonNull(lockFieldVO.getProfitAnalysisFields())) {
+                // 填充利润分析
+                fillProfitAnalysisInfo(resultVOList);
+            }
-            // 填充项目报告
-            fillReportInfo(resultVOList);
+            if (Objects.nonNull(lockFieldVO.getReportFields())) {
+                // 填充项目报告
+                fillReportInfo(resultVOList);
+            }
-            // 填充跟单信息
-            fillTrackStageInfo(resultVOList);
+            if (Objects.nonNull(lockFieldVO.getTrackStageFields())) {
+                // 填充跟单信息
+                fillTrackStageInfo(resultVOList);
+            }
-            // 填充质检信息
-            fillInspectionStageInfo(resultVOList);
+            if (Objects.nonNull(lockFieldVO.getInspectionStageFields())) {
+                // 填充质检信息
+                fillInspectionStageInfo(resultVOList);
+            }
-            if (CollectionUtils.isNotEmpty(resultVOList)) {
-                List<OrderExcelVO> excelVOS = resultVOList.stream().map(x -> {
-                    OrderExcelVO excelVO = new OrderExcelVO();
-                    BeanUtils.copyProperties(x, excelVO);
-                    if (StringUtils.isNotBlank(x.getPicUrl())) {
-                        String filename = x.getPicUrl().replaceAll(host + "/images/", "");
-                        try {
-                            excelVO.setPicDate(FileUtil.imageParseBytes(new File(path + File.separator + filename)));
-                        } catch (Exception e) {
-                            log.error("图片转换异常,订单：{}，e:{}", x.getId(), e.getMessage());
-                        }
-                    }
-                    return excelVO;
-                }).collect(Collectors.toList());
-                //response为HttpServletResponse对象
-                response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
-                //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
-                response.setHeader("Content-Disposition", "attachment;filename=order.xlsx");
-                ExcelUtils.getInstance().exportObjects2Excel(excelVOS, OrderExcelVO.class, response.getOutputStream());
+            if (CollectionUtils.isNotEmpty(resultVOList)) {
+                List<Map<String, Object>> list = buildExportMapVOS(resultVOList, lockFieldVO);
+                if (CollectionUtils.isNotEmpty(list)) {
+                    FileUtil.downloadExcel(list, response);
+                }
             }
         }
         return ServerResult.success();
     }
+    /**
+     * @param resultVOList
+     * @param lockFieldVO
+     * @return
+     */
+    private List<Map<String, Object>> buildExportMapVOS(List<OrderInfoResultVO> resultVOList, OrderLockFieldVO lockFieldVO) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (OrderInfoResultVO orderInfoResultVO : resultVOList) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            OrderBaseFieldVO baseFields = lockFieldVO.getBaseFields();
+            OrderProfitAnalysisFieldVO profitAnalysisFields = lockFieldVO.getProfitAnalysisFields();
+            OrderCompletionReportFieldVO reportFields = lockFieldVO.getReportFields();
+            OrderTrackStageFieldVO trackStageFields = lockFieldVO.getTrackStageFields();
+            OrderInspectionStageFieldVO inspectionStageFields = lockFieldVO.getInspectionStageFields();
+            if (Objects.nonNull(baseFields)) {
+                if (StringUtils.isNotBlank(baseFields.getCustomerCode())) {
+                    map.put("客户编码", orderInfoResultVO.getCustomerCode());
+                }
+                if (StringUtils.isNotBlank(baseFields.getProjectNo())) {
+                    map.put("项目号", orderInfoResultVO.getCustomerCode());
+                }
+                if (StringUtils.isNotBlank(baseFields.getProductionDepartment())) {
+                    map.put("生产科", orderInfoResultVO.getProductionDepartment());
+                }
+                if (StringUtils.isNotBlank(baseFields.getInnerNo())) {
+                    map.put("内部编号", orderInfoResultVO.getInnerNo());
+                }
+                if (StringUtils.isNotBlank(baseFields.getCustomerPo())) {
+                    map.put("客户po号", orderInfoResultVO.getCustomerPo());
+                }
+                if (StringUtils.isNotBlank(baseFields.getCustomerStyle())) {
+                    map.put("客户STYLE#", orderInfoResultVO.getCustomerStyle());
+                }
+                if (StringUtils.isNotBlank(baseFields.getModeleLo())) {
+                    map.put("Modelo(REFERENCE)", orderInfoResultVO.getModeleLo());
+                }
+                if (StringUtils.isNotBlank(baseFields.getCollection())) {
+                    map.put("COLLECTION (style description)", orderInfoResultVO.getCollection());
+                }
+                if (StringUtils.isNotBlank(baseFields.getPoColor())) {
+                    map.put("PO COLOR", orderInfoResultVO.getPoColor());
+                }
+                if (StringUtils.isNotBlank(baseFields.getCnColor())) {
+                    map.put("颜色中文", orderInfoResultVO.getCnColor());
+                }
+                if (StringUtils.isNotBlank(baseFields.getProductionComment())) {
+                    map.put("生产要求", orderInfoResultVO.getProductionComment());
+                }
+                if (StringUtils.isNotBlank(baseFields.getOrderCount())) {
+                    map.put("数量", orderInfoResultVO.getOrderCount());
+                }
+                if (StringUtils.isNotBlank(baseFields.getOrderComposition())) {
+                    map.put("订单成分", orderInfoResultVO.getOrderComposition());
+                }
+                if (StringUtils.isNotBlank(baseFields.getProductStyle())) {
+                    map.put("款式类型", orderInfoResultVO.getProductStyle());
+                }
+                if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime())) {
+                    map.put("生成科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
+                }
+                if (StringUtils.isNotBlank(baseFields.getOrderHodTime())) {
+                    map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
+                }
+                if (StringUtils.isNotBlank(baseFields.getOutboundType())) {
+                    map.put("出库类型", orderInfoResultVO.getOutboundType());
+                }
+                if (StringUtils.isNotBlank(baseFields.getPacketType())) {
+                    map.put("包装类型", orderInfoResultVO.getPacketType());
+                }
+            }
+            OrderProfitAnalysisVO profitAnalysisVO = orderInfoResultVO.getProfitAnalysisInfo();
+            if (Objects.nonNull(profitAnalysisFields) && Objects.nonNull(profitAnalysisVO)) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerPrice())) {
+                    map.put("客户单价$", profitAnalysisVO.getCustomerPrice());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerTotalPrice())) {
+                    map.put("客户总价$", profitAnalysisVO.getCustomerTotalPrice());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice())) {
+                    map.put("生成科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentTotalPrice())) {
+                    map.put("生成科总价￥", profitAnalysisVO.getProductionDepartmentTotalPrice());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice())) {
+                    map.put("包装费用￥", profitAnalysisVO.getPacketPrice());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getPacketTotalPrice())) {
+                    map.put("包装费用合计￥", profitAnalysisVO.getPacketTotalPrice());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getExchangeRate())) {
+                    map.put("汇率", profitAnalysisVO.getExchangeRate());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getProfitRate())) {
+                    map.put("利润率", profitAnalysisVO.getProfitRate());
+                }
+            }
+            OrderCompletionReportVO reportInfo = orderInfoResultVO.getReportInfo();
+            if (Objects.nonNull(reportFields) && Objects.nonNull(reportInfo)) {
+                if (StringUtils.isNotBlank(reportFields.getIdeaSource())) {
+                    map.put("想法来源", reportInfo.getIdeaSource());
+                }
+                if (StringUtils.isNotBlank(reportFields.getManualPreform())) {
+                    map.put("手工初型", reportInfo.getManualPreform());
+                }
+                if (StringUtils.isNotBlank(reportFields.getIdeaManualRate())) {
+                    map.put("想法和手工比例分配", reportInfo.getIdeaManualRate());
+                }
+            }
+            OrderTrackStageVO trackStageInfo = orderInfoResultVO.getTrackStageInfo();
+            if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
+                if (StringUtils.isNotBlank(trackStageFields.getPpTime())) {
+                    map.put("pp date", trackStageInfo.getPpTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult())) {
+                    map.put("pp样品确认意见", trackStageInfo.getPpConfirmResult());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime())) {
+                    map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime())) {
+                    map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult())) {
+                    map.put("shipment sample确认意见", trackStageInfo.getShippmentSampleConfirmResult());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime())) {
+                    map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime())) {
+                    map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime())) {
+                    map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult())) {
+                    map.put("SGS测试结果", trackStageInfo.getSgsTestFinishResult());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime())) {
+                    map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime())) {
+                    map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
+                }
+                if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime())) {
+                    map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
+                }
+            }
+            OrderInspectionStageVO inspectionStageInfo = orderInfoResultVO.getInspectionStageInfo();
+            if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime())) {
+                    map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment())) {
+                    map.put("中期验货（功能性-拉力/跌落等、外观性-颜色/规格等、耐久性-烤厅等）", inspectionStageInfo.getMidCheckComment());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckResult())) {
+                    map.put("中期验货结果PASS / FAIL", inspectionStageInfo.getMidCheckResult());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime())) {
+                    map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getSpecification())) {
+                    map.put("长度/规格", inspectionStageInfo.getSpecification());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getFunctionality())) {
+                    map.put("功能性不良", inspectionStageInfo.getFunctionality());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getElectroplate())) {
+                    map.put("电镀不良", inspectionStageInfo.getElectroplate());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getValue1())) {
+                    map.put("不良1", inspectionStageInfo.getValue1());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getValue2())) {
+                    map.put("不良2", inspectionStageInfo.getValue2());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getValue3())) {
+                    map.put("不良3", inspectionStageInfo.getValue3());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getBoxPacket())) {
+                    map.put("包装：卡片、条码、箱贴，箱单", inspectionStageInfo.getBoxPacket());
+                }
+                if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckResult())) {
+                    map.put("尾期验货结果PASS / FAIL", inspectionStageInfo.getEndCheckResult());
+                }
+            }
+            list.add(map);
+        }
+
+        return list;
+    }
+
     @Override
     public ServerResult fieldUnlockApply(OrderUnlockFieldApplyVO fieldVO) {
         Long userId = dataScope.getLoginUserId();