From be90adff42bb02c96252991c205b3a43bde9636d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 20 十一月 2025 13:05:01 +0800
Subject: [PATCH] 耐丝lims影像仪mysql数据读取调整
---
src/main/java/com/chinaztt/mes/docx/util/TakeWords.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
index 727ccc1..301b47d 100644
--- a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
+++ b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
@@ -60,21 +60,25 @@
public static Object readExcelFile(File file) throws IOException {
StringBuilder result = new StringBuilder();
//鍒涘缓宸ヤ綔绨垮璞�
- XSSFWorkbook xssfWorkbook = new XSSFWorkbook(Files.newInputStream(file.toPath()));
- //鑾峰彇宸ヤ綔绨夸笅sheet鐨勪釜鏁� 鍙鍙栫涓�涓猻heet
+ try {
+ XSSFWorkbook xssfWorkbook = new XSSFWorkbook(Files.newInputStream(file.toPath()));
+ //鑾峰彇宸ヤ綔绨夸笅sheet鐨勪釜鏁� 鍙鍙栫涓�涓猻heet
// int sheetNum = xssfWorkbook.getNumberOfSheets();
- //閬嶅巻宸ヤ綔绨夸腑鐨勬墍鏈夋暟鎹�
- XSSFSheet sheet = xssfWorkbook.getSheetAt(0);
- //鑾峰彇鏈�鍚庝竴琛岀殑num锛屽嵆鎬昏鏁般�傛澶勪粠0寮�濮�
- int maxRow = sheet.getLastRowNum();
- for (int row = 1; row <= maxRow; row++) {
- //鑾峰彇鏈�鍚庡崟鍏冩牸num锛屽嵆鎬诲崟鍏冩牸鏁� ***娉ㄦ剰锛氭澶勪粠1寮�濮嬭鏁�***
- int maxRol = sheet.getRow(row).getLastCellNum();
- StringBuilder aLine = new StringBuilder();
- for (int rol = 0; rol < maxRol; rol++) {
- aLine.append(sheet.getRow(row).getCell(rol)).append(splitIdentifier);
+ //閬嶅巻宸ヤ綔绨夸腑鐨勬墍鏈夋暟鎹�
+ XSSFSheet sheet = xssfWorkbook.getSheetAt(0);
+ //鑾峰彇鏈�鍚庝竴琛岀殑num锛屽嵆鎬昏鏁般�傛澶勪粠0寮�濮�
+ int maxRow = sheet.getLastRowNum();
+ for (int row = 1; row <= maxRow; row++) {
+ //鑾峰彇鏈�鍚庡崟鍏冩牸num锛屽嵆鎬诲崟鍏冩牸鏁� ***娉ㄦ剰锛氭澶勪粠1寮�濮嬭鏁�***
+ int maxRol = sheet.getRow(row).getLastCellNum();
+ StringBuilder aLine = new StringBuilder();
+ for (int rol = 0; rol < maxRol; rol++) {
+ aLine.append(sheet.getRow(row).getCell(rol)).append(splitIdentifier);
+ }
+ result.append(aLine).append("\n");
}
- result.append(aLine).append("\n");
+ }catch (Exception e){
+ e.printStackTrace();
}
return result.toString();
}
@@ -353,7 +357,7 @@
return R.failed("鏁版嵁搴撳悕鎴栬〃鍚嶄笉鑳戒负绌�");
}
// 鏁版嵁搴撹繛鎺ヤ俊鎭�
- String url = "jdbc:mysql://localhost:3307/"+dbName+"?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&characterEncoding=utf8";
+ String url = "jdbc:mysql://localhost:3306/"+dbName+"?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&characterEncoding=utf8";
Connection connection = null;
PreparedStatement preparedStatement = null;
ResultSet resultSet = null;
@@ -365,12 +369,20 @@
// 鏋勫缓鍩虹 SQL
String sql = "SELECT * FROM "+table+" WHERE 1=1";
- if(StringUtils.isNotBlank(getFileDto.getMdbEntrustCode())){
- sql+=" AND " + getFileDto.getMdbEntrustCode() + " = '" + getFileDto.getEntrustCode()+ "'";
+ if(StringUtils.isNotBlank(getFileDto.getMdbEntrustCode()) ){
+ sql+=" AND (" + getFileDto.getMdbEntrustCode() + " = '" + getFileDto.getEntrustCode()+ "'";
+ if(StringUtils.isNotBlank(getFileDto.getLotBatchNo())){
+ sql+=" OR "+ getFileDto.getMdbEntrustCode() + " = '" + getFileDto.getLotBatchNo()+ "'";
+ }
+ sql+=")";
}
if(StringUtils.isNotBlank(getFileDto.getMdbSampleCode())){
sql+=" AND " + getFileDto.getMdbSampleCode() + " = '" + getFileDto.getSampleCode() + "'";
}
+ if(StringUtils.isNotBlank(getFileDto.getCableTag())){
+ sql+=" AND Color = '" + getFileDto.getCableTag() + "'";
+ }
+
// 鍒涘缓 PreparedStatement 瀵硅薄鎵ц SQL
preparedStatement = connection.prepareStatement(sql);
resultSet = preparedStatement.executeQuery();
--
Gitblit v1.9.3