From cb7eb6fa3477e624f7112a2eac632783b96bf4b4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:19:35 +0800
Subject: [PATCH] 点检标准 多sheet页导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index c5c4dff..384511c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -269,9 +269,11 @@
int successLines = 0, errorLines = 0;
//a = 1寮�濮嬭鍙栫偣妫�椤圭洰锛沚 = 1寮�濮嬭鍙栧懆淇濆吇椤圭洰锛沜 = 1璇ヨ澶囧鍏ヤ俊鎭瓨鍦ㄩ敊璇紱projectColumnIndex鐐规椤圭洰鎵�鍦ㄥ垪锛沵aintenanceColumnIndex鍛ㄤ繚鍏婚」鐩墍鍦ㄥ垪
int a = 0,b = 0,c = 0,projectColumnIndex = -1,maintenanceColumnIndex = 0;
+ //琛ㄥご鏍囬
+ String title = "";
String dailyInspectionStandardId = null;
String equipmentNum = null;
- DailyInspectionStandard dailyInspectionStandard = new DailyInspectionStandard();
+ DailyInspectionStandard dailyInspectionStandard = null;
List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = new ArrayList<>();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
@@ -301,6 +303,9 @@
if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){
//鐐规鍛ㄦ湡瀛樺湪锛屽垽鏂澶囩粺涓�缂栫爜鏄惁瀛樺湪
String strCell = cell.getStringCellValue();
+ if(strCell.contains("鐢熶骇璁惧鑷富缁存姢鐐规琛�")){
+ title = strCell.trim().substring(11).trim();
+ }
if(strCell.contains("璁惧鍚嶇О锛�")){
String[] tybh1 = strCell.split("缁熶竴缂栧彿锛�");
String[] tybh2 = tybh1[1].split("骞�");
@@ -325,12 +330,15 @@
errorLines++;
}else {
c = 0;
- dailyInspectionStandard.setNum(identityService.getNumByTypeAndLength("DailylnspectionStandard",4));
+ String num = identityService.getNumByTypeAndLength("DailylnspectionStandard", 4);
+ dailyInspectionStandard = new DailyInspectionStandard();
+ dailyInspectionStandard.setNum(num);
dailyInspectionStandard.setVersionStatus("2");
dailyInspectionStandard.setVersion("1.0");
dailyInspectionStandard.setAssignMode("1");
dailyInspectionStandard.setEquipmentId(equipment.getId());
dailyInspectionStandard.setApprovalStatus("5");
+ dailyInspectionStandard.setDisUda1(title);
//dailyInspectionStandardService.save(dailyInspectionStandard);
//dailyInspectionStandardId = dailyInspectionStandard.getId();
}
@@ -353,9 +361,10 @@
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
String dayInspectionProjectName = row.getCell(projectColumnIndex).toString();
String standard = row.getCell(projectColumnIndex+3).toString();
- //鏌ヨ鐐瑰嚮椤圭洰锛屽鏋滄病鏈夋柊澧炵偣妫�椤圭洰
+ //鏌ヨ鐐规椤圭洰锛屽鏋滄病鏈夋柊澧炵偣妫�椤圭洰
if(StringUtils.isNotBlank(dayInspectionProjectName)){
- List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,dayInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
+ List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,dayInspectionProjectName)
+ .eq(InspectionProject::getDetectionStandard,standard).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
if(CollectionUtils.isEmpty(inspectionProjectList)){
InspectionProject inspectionProject = new InspectionProject();
inspectionProject.setNum(identityService.getNumByTypeAndLength("InspectionProject",4));
@@ -400,7 +409,8 @@
String weekInspectionProjectName = row.getCell(maintenanceColumnIndex).toString();
String inspectionStandardName = row.getCell(maintenanceColumnIndex+3).toString();
if(StringUtils.isNotBlank(weekInspectionProjectName)){
- List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,weekInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
+ List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,weekInspectionProjectName)
+ .eq(InspectionProject::getDetectionStandard,inspectionStandardName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
if(CollectionUtils.isEmpty(inspectionProjectList)){
InspectionProject inspectionProject = new InspectionProject();
inspectionProject.setNum(identityService.getNumByTypeAndLength("InspectionProject",4));
--
Gitblit v1.9.3