From c4c88b0ec16be3240d691ad4fd3cf01b35a12e02 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 24 五月 2025 11:02:57 +0800
Subject: [PATCH] 排班功能模块，其中查询条件用户列表查询中，不应该查出超级管理员
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 5 +++--
1 files changed, 3 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 7dfb822..e33670b 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
@@ -8,6 +8,7 @@
import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrDevice;
+import com.dy.pmsGlobal.util.ExportExcelUtil;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
@@ -147,7 +148,7 @@
list.add(vo);
});
log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
- QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
+ ExportExcelUtil.downloadExcel(response, fileName,sheetName,list);
log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
}
@GetMapping(path="exportDeviceNo")
@@ -168,7 +169,7 @@
PrAssemblyPlan plan = sv.selectByBatchId(batchId);
String fileNameStr = plan.name +"-"+ fileName;
log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
- QrCodeUtil.downloadExcel(response, fileNameStr,sheetName,list);
+ ExportExcelUtil.downloadExcel(response, fileNameStr,sheetName,list);
log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
}
}
--
Gitblit v1.8.0