canrd-outside / order-erp · Commits

Commit 50ce96828bbfc4106344712607b9bfb33f9c1545

Authored by chenhang4442024
1 parent a3f18d14
build: skipped

fix:业务研发部分表中在导出时不要到处图片,影响导出效率

Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
  View file @50ce968
@@ -665,13 +665,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl<OrderCostInfoMapper, O @@ -665,13 +665,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl<OrderCostInfoMapper, O
665 map.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : ""); 665 map.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
666 map.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : ""); 666 map.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
667 map.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : ""); 667 map.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
668 - if(StringUtils.isNotBlank(vo.getPicUrl())){ 668 + /* 不要图片,影响导出效率。
  669 + if(StringUtils.isNotBlank(vo.getPicUrl())){
669 URL url = new URL(vo.getPicUrl()); 670 URL url = new URL(vo.getPicUrl());
670 InputStream inputStream = url.openStream(); 671 InputStream inputStream = url.openStream();
671 map.put("订单图片", FileUtil.imageParseBytes(inputStream)); 672 map.put("订单图片", FileUtil.imageParseBytes(inputStream));
672 }else{ 673 }else{
673 map.put("订单图片", ""); 674 map.put("订单图片", "");
674 - } 675 + }*/
675 map.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : ""); 676 map.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
676 map.put("包装费用$",Objects.nonNull(vo.getPacketPrice()) ? String.format("%.2f",vo.getPacketPrice()) : ""); 677 map.put("包装费用$",Objects.nonNull(vo.getPacketPrice()) ? String.format("%.2f",vo.getPacketPrice()) : "");
677 map.put("包装费用合计$",Objects.nonNull(vo.getPacketTotalPrice()) ? String.format("%.2f",vo.getPacketTotalPrice()) : ""); 678 map.put("包装费用合计$",Objects.nonNull(vo.getPacketTotalPrice()) ? String.format("%.2f",vo.getPacketTotalPrice()) : "");
@@ -699,13 +700,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl<OrderCostInfoMapper, O @@ -699,13 +700,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl<OrderCostInfoMapper, O
699 hashMap.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : ""); 700 hashMap.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
700 hashMap.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : ""); 701 hashMap.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
701 hashMap.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : ""); 702 hashMap.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
  703 + /* 不要图片,影响到处效率。
702 if(StringUtils.isNotBlank(vo.getPicUrl())){ 704 if(StringUtils.isNotBlank(vo.getPicUrl())){
703 URL url = new URL(vo.getPicUrl()); 705 URL url = new URL(vo.getPicUrl());
704 InputStream inputStream = url.openStream(); 706 InputStream inputStream = url.openStream();
705 hashMap.put("订单图片", FileUtil.imageParseBytes(inputStream)); 707 hashMap.put("订单图片", FileUtil.imageParseBytes(inputStream));
706 }else{ 708 }else{
707 hashMap.put("订单图片", ""); 709 hashMap.put("订单图片", "");
708 - } 710 + }*/
709 hashMap.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : ""); 711 hashMap.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
710 hashMap.put("生产科单价￥",Objects.nonNull(vo.getProductionDepartmentPrice()) ? String.format("%.2f",vo.getProductionDepartmentPrice()) : ""); 712 hashMap.put("生产科单价￥",Objects.nonNull(vo.getProductionDepartmentPrice()) ? String.format("%.2f",vo.getProductionDepartmentPrice()) : "");
711 hashMap.put("生产科总价￥",Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ? String.format("%.2f",vo.getProductionDepartmentTotalPrice()) : ""); 713 hashMap.put("生产科总价￥",Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ? String.format("%.2f",vo.getProductionDepartmentTotalPrice()) : "");