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 | 90 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 17 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 bc9ad0e..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
@@ -129,6 +129,7 @@
public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
dailyInspectionStandard.setWritePerson(sysUser.getRealname());
+ dailyInspectionStandard.setAssignMode("1");
dailyInspectionStandardService.save(dailyInspectionStandard);
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
DailyInspectionStandardDetail isd = null;
@@ -268,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();
@@ -292,18 +295,26 @@
Sheet sheet = workbook.getSheetAt(i);
for (Row row : sheet) {
// 閬嶅巻姣忎竴涓崟鍏冩牸
- for (Cell cell : row) {
+// for (Cell cell : row) {
+ for(int j = 0;j < 5;j++){
// 澶勭悊鍗曞厓鏍兼暟鎹紝渚嬪杈撳嚭鍗曞厓鏍肩殑鍊�
+ Cell cell = row.getCell(j);
+// if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){
if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){
//鐐规鍛ㄦ湡瀛樺湪锛屽垽鏂澶囩粺涓�缂栫爜鏄惁瀛樺湪
- if(cell.getStringCellValue().contains("璁惧鍚嶇О锛�")){
- String[] tybh1 = cell.getStringCellValue().split("缁熶竴缂栧彿锛�");
+ 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("骞�");
- equipmentNum = tybh2[0].trim().substring(0,tybh2[0].trim().length()-4).trim();
+// equipmentNum = tybh2[0].trim().substring(0,tybh2[0].trim().length()-4).trim();
+ equipmentNum = tybh2[0].trim();
/*String year = tybh2[0].trim().substring(tybh2[0].trim().length()-4,tybh2[0].trim().length()).trim();
String[] month1 = tybh2[1].split("鏈�");
String month = month1[0].trim();
- String[] unit1 = cell.getStringCellValue().split("鍗曚綅锛�");
+ String[] unit1 = strCell.split("鍗曚綅锛�");
String unit = unit1[1].trim();*/
Equipment equipment = equipmentService.lambdaQuery().eq(Equipment::getNum,equipmentNum).eq(Equipment::getDelFlag, CommonConstant.DEL_FLAG_0).one();
if(equipment == null){
@@ -319,11 +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();
}
@@ -332,23 +347,24 @@
}
//璁惧缁熶竴缂栫爜瀛樺湪锛屽垽鏂偣妫�椤圭洰鏄惁瀛樺湪
if(c == 0){
- System.out.print(cell.getStringCellValue() + "\t");
- if(cell.getStringCellValue().contains("鐐规椤圭洰")){
+ System.out.print(strCell + "\t");
+ if(strCell.contains("鐐规椤圭洰")){
a = 1;
projectColumnIndex = cell.getColumnIndex();
break;
}
- if(cell.getStringCellValue().contains("缁存姢璐ｄ换浜虹瀛�")){
+ if(strCell.contains("缁存姢璐ｄ换浜虹瀛�")){
a = 0;
}
if(projectColumnIndex == cell.getColumnIndex() && a == 1){
DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail();
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
String dayInspectionProjectName = row.getCell(projectColumnIndex).toString();
- String standard = row.getCell(projectColumnIndex+1).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));
@@ -370,12 +386,13 @@
}
break;
}
- if(cell.getStringCellValue().contains("鍛ㄤ繚鍏婚」鐩�")){
+
+ if(strCell.contains("鍛ㄤ繚鍏婚」鐩�")){
b = 1;
maintenanceColumnIndex = cell.getColumnIndex();
break;
}
- if(cell.getStringCellValue().contains("鍛ㄤ繚鍏绘搷浣滆�呮墽琛�")){
+ if(strCell.contains("鍛ㄤ繚鍏绘搷浣滆�呮墽琛�")){
b = 0;
dailyInspectionStandardService.save(dailyInspectionStandard);
for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
@@ -390,9 +407,10 @@
DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail();
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
String weekInspectionProjectName = row.getCell(maintenanceColumnIndex).toString();
- String inspectionStandardName = row.getCell(maintenanceColumnIndex+1).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));
@@ -454,6 +472,7 @@
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
dailyInspectionStandard.setWritePerson(sysUser.getRealname());
dailyInspectionStandard.setId("");
+ dailyInspectionStandard.setAssignMode("1");
dailyInspectionStandard.setApprovalStatus("1");
dailyInspectionStandard.setCreateTime(new Date());
dailyInspectionStandard.setTakeEffectTime(null);
@@ -556,4 +575,41 @@
return Result.error("瀹℃牳澶辫触!");
}
}
+
+
+ /**
+ * 鎵归噺 绛惧娴佺▼
+ * qsw 2023-12-12
+ */
+ @RequestMapping(value = "/auditApprovalBatch", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = { Exception.class })
+ public Result<String> auditApprovalBatch(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ List<DailyInspectionStandard> dailyInspectionStandardlist = dailyInspectionStandard.getDailyInspectionStandardlist();
+ for (DailyInspectionStandard inspectionStandard : dailyInspectionStandardlist) {
+ String approvalStatus = inspectionStandard.getApprovalStatus();
+ if("5".equals(approvalStatus)){//瀹℃牳閫氳繃鍚庯紝鐗堟湰鐢熸晥
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getNum, inspectionStandard.getNum())
+ .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+ for (DailyInspectionStandard standard : dailyInspectionStandards) {
+ standard.setVersionStatus("3");
+ standard.setLoseEfficacyTime(new Date());
+ standard.setLoseEfficacyPerson(sysUser.getRealname());
+ dailyInspectionStandardService.updateById(standard);
+ }
+ inspectionStandard.setApprovalPerson(sysUser.getRealname());
+ inspectionStandard.setVersionStatus("2");
+ inspectionStandard.setTakeEffectTime(new Date());
+ }else if("3".equals(approvalStatus)){
+ inspectionStandard.setAuditPerson(sysUser.getRealname());
+ }
+ boolean b = dailyInspectionStandardService.updateById(inspectionStandard);
+ if (!b){
+ return Result.error("瀹℃牳澶辫触!");
+ }
+ }
+ return Result.OK("瀹℃牳鎴愬姛!");
+ }
}
--
Gitblit v1.9.3