From 6604d9c5b6d4d00b621c6a372059653bb63c3b07 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 04 十一月 2023 17:00:09 +0800
Subject: [PATCH] #导出excel单据
---
src/main/resources/mapper/OrderMapper.xml | 8 +-
src/main/java/com/zy/asrs/controller/OrderController.java | 128 +++++++++++++++++++++++++++++-------------
src/main/java/com/zy/asrs/entity/OrderDetl.java | 7 ++
src/main/resources/cu.xlsx | 0
src/main/webapp/views/orderExport/orderExport.html | 16 +++-
src/main/java/com/zy/asrs/entity/OrderDetlLog.java | 7 ++
src/main/resources/ru.xlsx | 0
src/main/webapp/static/js/orderExport/orderExport.js | 7 +
8 files changed, 123 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index de90edd..d6666bf 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -37,6 +37,7 @@
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -58,6 +59,8 @@
private LocOwnerService locOwnerService;
@Autowired
private OrderLogService orderLogService;
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
@RequestMapping(value = "/order/all")
@ManagerAuth
@@ -71,62 +74,109 @@
return R.ok().add(stockStatis);
}
-// @RequestMapping(value = "/order/export")
-// @ManagerAuth
-// public void orderExport(HttpServletResponse response,OrderExport orderExport) throws IOException {
-// List<OrderDetl> orderNo = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderExport.getOrderNo()));
-//
-// response.setContentType("application/vnd.ms-excel");
-// response.setCharacterEncoding("utf-8");
-// String templateFileName =
-// this.getClass().getClassLoader().getResource("ru.xlsx").getPath();;
-//
-// String fileName = "complexFill" + System.currentTimeMillis() + ".xlsx";
-//
-// response.setHeader("Content-disposition", "attachment;filename=" + fileName);
-// ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build();
-// WriteSheet writeSheet = EasyExcel.writerSheet().build();
-// // 杩欓噷娉ㄦ剰 鍏ュ弬鐢ㄤ簡forceNewRow 浠ｈ〃鍦ㄥ啓鍏ist鐨勬椂鍊欎笉绠ist涓嬮潰鏈夋病鏈夌┖琛� 閮戒細鍒涘缓涓�琛岋紝鐒跺悗涓嬮潰鐨勬暟鎹線鍚庣Щ鍔ㄣ�傞粯璁� 鏄痜alse锛屼細鐩存帴浣跨敤涓嬩竴琛岋紝濡傛灉娌℃湁鍒欏垱寤恒��
-// // forceNewRow 濡傛灉璁剧疆浜唗rue,鏈変釜缂虹偣 灏辨槸浠栦細鎶婃墍鏈夌殑鏁版嵁閮芥斁鍒板唴瀛樹簡锛屾墍浠ユ厧鐢�
-// // 绠�鍗曠殑璇� 濡傛灉浣犵殑妯℃澘鏈塴ist,涓攍ist涓嶆槸鏈�鍚庝竴琛岋紝涓嬮潰杩樻湁鏁版嵁闇�瑕佸～鍏� 灏卞繀椤昏缃� forceNewRow=true 浣嗘槸杩欎釜灏变細鎶婃墍鏈夋暟鎹斁鍒板唴瀛� 浼氬緢鑰楀唴瀛�
-// // 濡傛灉鏁版嵁閲忓ぇ list涓嶆槸鏈�鍚庝竴琛� 鍙傜収涓嬩竴涓�
-// FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
-// excelWriter.fill(orderNo, fillConfig, writeSheet);
-//// excelWriter.fill(orderNo, fillConfig, writeSheet);
-// Map<String, Object> map = new HashMap<String, Object>();
-// map.put("date", "2019骞�10鏈�9鏃�13:28:28");
-// map.put("total", 1000);
-// excelWriter.fill(map, writeSheet);
-// excelWriter.finish();
-//
-//
-// }
@RequestMapping("/download_excel")
- public void downloadExcel(HttpServletResponse response,@RequestParam String orderNo) throws IOException {
+ public void downloadExcel(HttpServletResponse response,
+ @RequestParam String orderNo,
+ @RequestParam Integer type,
+ @RequestParam String name,
+ @RequestParam String threeCode) throws IOException {
+
+ //鑾峰彇鍗曟嵁绫诲瀷
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_id", type));
+ if (docType.getPakin()==1 && docType.getPakout()==0){
+ type = 1;
+ } else if (docType.getPakin()==0 && docType.getPakout()==1) {
+ type = 2;
+ }else {
+ throw new CoolException("鍗曟嵁绫诲瀷鏈夎");
+ }
+ //璁剧疆http杩斿洖澶村拰鏂囦欢鍚�
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = "Order " + orderNo + ".xlsx";
response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+ //excel鍐欏叆鐨勬暟鎹�
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("orderNo", orderNo);
+ map.put("name",name);
+ map.put("threeCode",threeCode);
+
OutputStream outputStream = response.getOutputStream();
- orderExport(outputStream, orderNo);
+ orderExport(outputStream,type,map);
outputStream.flush();
outputStream.close();
}
- public void orderExport(OutputStream outputStream, String orderNo) throws IOException {
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ public void orderExport(OutputStream outputStream,Integer type,Map<String, Object> map) throws IOException {
- String templateFileName = this.getClass().getClassLoader().getResource("ru.xlsx").getPath();
+ //鑾峰彇璁㈠崟鏄庣粏鏁版嵁
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", map.get("orderNo")));
+ List<OrderDetlLog> orderDetlLogs = new ArrayList<>();
+ if (Cools.isEmpty(orderDetls)){
+ orderDetlLogs = orderDetlLogService.selectList(new EntityWrapper<OrderDetlLog>().eq("order_no", map.get("orderNo")));
+ }
+ //鑾峰彇妯＄増璺緞
+ String templateFileName = null ;
+ if (type == 1){
+ templateFileName = this.getClass().getClassLoader().getResource("ru.xlsx").getPath();
+ } else if (type ==2 ) {
+ templateFileName = this.getClass().getClassLoader().getResource("cu.xlsx").getPath();
+ }
+
+ //鎶婃枃浠跺啓鍏ュ埌outputStream涓�
ExcelWriter excelWriter = EasyExcel.write(outputStream).withTemplate(templateFileName).build();
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
- excelWriter.fill(orderDetls, fillConfig, writeSheet);
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("date", "2019骞�10鏈�9鏃�13:28:28");
- map.put("orderNo", orderNo);
+
+ //鎬昏鏁伴噺锛岄噸閲�
+ BigDecimal sumWeight = new BigDecimal(0);
+ BigDecimal sumAnfme = new BigDecimal(0);
+
+ if (Cools.isEmpty(orderDetls)){
+ //搴忓彿
+ int i = 1;
+ for (OrderDetlLog orderDetlLog:orderDetlLogs){
+ orderDetlLog.setThreeCode(map.get("threeCode").toString());
+ orderDetlLog.setDanger(i);
+ i++;
+ if (Cools.isEmpty(orderDetlLog.getWeight())){
+ orderDetlLog.setWeight(0.0);
+ }
+ sumWeight = sumWeight.add(BigDecimal.valueOf(orderDetlLog.getWeight()));
+ sumAnfme = sumAnfme.add(BigDecimal.valueOf(orderDetlLog.getAnfme()));
+ }
+ //鍐欏叆orderDetlLogs涓殑鏁版嵁
+ excelWriter.fill(orderDetlLogs, fillConfig, writeSheet);
+ map.put("comp",orderDetlLogs.get(0).getOwner$());
+ map.put("sumVol",sumWeight);
+ map.put("sumAnfme",sumAnfme);
+ }else {
+ int i = 1;
+ for (OrderDetl orderDetl:orderDetls){
+ orderDetl.setThreeCode(map.get("threeCode").toString());
+ orderDetl.setDanger(i);
+ i++;
+ if (Cools.isEmpty(orderDetl.getWeight())){
+ orderDetl.setWeight(0.0);
+ }
+ sumWeight = sumWeight.add(BigDecimal.valueOf(orderDetl.getWeight()));
+ sumAnfme = sumAnfme.add(BigDecimal.valueOf(orderDetl.getAnfme()));
+
+ }
+ excelWriter.fill(orderDetls, fillConfig, writeSheet);
+ map.put("comp",orderDetls.get(0).getOwner$());
+ map.put("sumVol",sumWeight);
+ map.put("sumAnfme",sumAnfme);
+ }
+ Date date = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
+
+ map.put("time",dateFormat.format(date));
+
+ //鍐欏叆map涓殑鏁版嵁
excelWriter.fill(map, writeSheet);
excelWriter.finish();
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 9dcc5aa..bb630fc 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -489,6 +489,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.createTime);
+ }
+
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
index 9fd0859..582b527 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
@@ -416,6 +416,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.createTime);
+ }
+
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
diff --git a/src/main/resources/cu.xlsx b/src/main/resources/cu.xlsx
new file mode 100644
index 0000000..2778aea
--- /dev/null
+++ b/src/main/resources/cu.xlsx
Binary files differ
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 04ddf89..81c9c88 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -82,19 +82,19 @@
select order_no from man_order
</select>
<sql id="orderSql">
- <if test="order_no != null and order_no!='' ">
- and a.order_no like '%' + #{order_no} + '%'
+ <if test="orderNo != null and orderNo!='' ">
+ and order_no like '%' + #{orderNo} + '%'
</if>
</sql>
<select id="getOrderAll" resultMap="BaseResultMap">
select t.row,order_all.* from
(
select
- ROW_NUMBER() over (order by sum(1) desc) as row,id
+ ROW_NUMBER() over (order by order_time desc) as row,id
FROM order_all
WHERE 1=1
<include refid="orderSql"></include>
- GROUP BY id
+ GROUP BY id,order_time
) t
LEFT JOIN order_all ON t.id = order_all.id
where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
diff --git a/src/main/resources/ru.xlsx b/src/main/resources/ru.xlsx
index ecd8bcb..2a6578e 100644
--- a/src/main/resources/ru.xlsx
+++ b/src/main/resources/ru.xlsx
Binary files differ
diff --git a/src/main/webapp/static/js/orderExport/orderExport.js b/src/main/webapp/static/js/orderExport/orderExport.js
index 93df602..2282066 100644
--- a/src/main/webapp/static/js/orderExport/orderExport.js
+++ b/src/main/webapp/static/js/orderExport/orderExport.js
@@ -25,7 +25,7 @@
{field: 'orderNo', align: 'center',title: '鍗曟嵁鍙�'}
,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'createTime$', align: 'center',title: '鏃堕棿'}
,{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160}
@@ -155,7 +155,10 @@
layer.closeAll();
layer.load(1, {shade: [0.1,'#fff']});
// location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
- location.href = baseUrl+"/download_excel?orderNo="+data.field.orderNo;
+ location.href = baseUrl+"/download_excel?orderNo="+data.field.orderNo
+ +"&type="+data.field.docType
+ +"&name="+data.field.name
+ +"&threeCode="+data.field.threeCode;
layer.closeAll('loading');
});
diff --git a/src/main/webapp/views/orderExport/orderExport.html b/src/main/webapp/views/orderExport/orderExport.html
index 4a0ac75..f7635dd 100644
--- a/src/main/webapp/views/orderExport/orderExport.html
+++ b/src/main/webapp/views/orderExport/orderExport.html
@@ -18,9 +18,9 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鐘舵�佹弿杩�:</label>
+ <label class="layui-form-label">鍗曟嵁鍙�:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="order_name" placeholder="鐘舵�佹弿杩�" autocomplete="off">
+ <input class="layui-input" type="text" name="orderNo" placeholder="璇疯緭鍏ュ崟鎹彿" autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -89,13 +89,19 @@
<div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
<div class="layui-input-block">
- <input class="layui-input" name="docType" placeholder="璇疯緭鍏ョ姸鎬佹弿杩�">
+ <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
+ <label class="layui-form-label">濉〃浜�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ <input class="layui-input" name="name" placeholder="璇疯緭鍏ュ～琛ㄤ汉">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呰鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="threeCode" placeholder="璇疯緭鍏ュ寘瑁呯姸鎬�">
</div>
</div>
--
Gitblit v1.9.1