From 7a6e4f5b60c2092184c5b601be5cbe036a55ab7b Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 10 十月 2024 09:06:20 +0800
Subject: [PATCH] selectNodeBySort,sta_repair_info.insertSelective 方法修改
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
index 02566d8..7dfb822 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
@@ -129,7 +129,7 @@
@GetMapping(path="exportDevice")
@SsoPowerAop(power = "10200001")
- @Log("瀵煎嚭璁惧鍙�")
+ @Log("瀵煎嚭璁惧鍙峰強浜岀淮鐮�")
public void exportDevice(Long batchId, HttpServletResponse response){
Date start = new Date() ;
List<Converter> list = new ArrayList<>();
@@ -146,8 +146,29 @@
}
list.add(vo);
});
- log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
+ log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ }
+ @GetMapping(path="exportDeviceNo")
+ @SsoPowerAop(power = "10200001")
+ @Log("瀵煎嚭璁惧鍙�")
+ public void exportDeviceNo(Long batchId, HttpServletResponse response){
+ Date start = new Date() ;
+ List<Converter> list = new ArrayList<>();
+
+ List<PrDevice> deviceList = sv.selectDeviceByBatchId(batchId) ;
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘
+ deviceList.parallelStream().forEach(device -> {
+ ExcelDeviceNoVo vo = new ExcelDeviceNoVo();
+ vo.deviceNo = device.deviceNo;
+ list.add(vo);
+ });
+ //鏍规嵁batchid鎵惧埌浠诲姟鍚嶇О
+ PrAssemblyPlan plan = sv.selectByBatchId(batchId);
+ String fileNameStr = plan.name +"-"+ fileName;
+ log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ QrCodeUtil.downloadExcel(response, fileNameStr,sheetName,list);
log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
}
}
--
Gitblit v1.8.0