From 417c2e6247704736e79db39414abd4e2f0f9ecc6 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 05 十二月 2023 17:19:26 +0800
Subject: [PATCH] 优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 3606d73..b4c92dd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -302,14 +302,17 @@
equipmentNum =cellEquipmentNum.getText();
equipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentNum).eq("del_flag",0),false);
if(ObjectUtils.isNotNull(equipment)){
- maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("version_status",2).eq("del_flag",0).eq("equipment_id",equipment.getId()),false);
+ maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("version_status","2").eq("del_flag",0).eq("equipment_id",equipment.getId()),false);
if(ObjectUtils.isNull(maintenanceStandard)){
maintenanceStandard = new MaintenanceStandard();
maintenanceStandard.setNum(sysIdentityService.getNumByTypeAndLength("DailyMaintenanceStandard",4));
maintenanceStandard.setEquipmentId(equipment.getId());
maintenanceStandard.setAssignMode("1");
maintenanceStandard.setVersion("1.0");
+ maintenanceStandard.setType("daily");
maintenanceStandard.setVersionStatus("2");
+ maintenanceStandard.setDelFlag(0);
+ maintenanceStandard.setApprovalStatus("5");
maintenanceStandardService.save(maintenanceStandard);
}
else {
@@ -327,11 +330,17 @@
else {
continue;
}
+ String role0 = "";
for (XWPFTableRow row : table.getRows()) {
XWPFTableCell cell0 = row.getCell(0);
XWPFTableCell cell2 = row.getCell(2);
- if(rowNumber>3){
- String role = getMergedCellValue(cell0);
+ if(rowNumber>1){
+ String role = cell0.getText();
+ if(StringUtils.isNotBlank(role)){
+ role0=role;
+ }
+ }
+ if(rowNumber>2){
String projectName = cell2.getText();
MaintenanceStandardDetail maintenanceStandardDetail = new MaintenanceStandardDetail();
MaintenanceProjectCategory maintenanceProjectCategory = maintenanceProjectCategoryService.getOne(new QueryWrapper<MaintenanceProjectCategory>().eq("name","浜岀骇淇濆吇").eq("del_flag",0),false);
@@ -347,15 +356,18 @@
maintenanceProjectService.save(maintenanceProject);
}
maintenanceStandardDetail.setMaintenanceProjectId(maintenanceProject.getId());
- if(role.equals("缁翠慨浜哄憳淇濆吇鍐呭")){
+ if(role0.equals("缁翠慨浜哄憳淇濆吇鍐呭")){
maintenanceStandardDetail.setMaintenanceRole("maintenance");
- } else if(role.equals("鎿嶄綔浜哄憳淇濆吇鍐呭")){
+ } else if(role0.equals("鎿嶄綔浜哄憳淇濆吇鍐呭")){
maintenanceStandardDetail.setMaintenanceRole("operator");
}
if(ObjectUtils.isNotNull(maintenanceCycle)){
maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.getId());
}
+ maintenanceStandardDetail.setDelFlag(0);
+ maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetailService.save(maintenanceStandardDetail);
+
}
}
@@ -363,6 +375,7 @@
}
}
}
+ return Result.OK("瀵煎叆鎴愬姛");
} else {
System.out.println("鏃犳硶瑙ｆ瀽璇ユ枃浠�");
}
@@ -420,6 +433,8 @@
maintenanceStandard.setAssignMode("1");
maintenanceStandard.setVersion("1.0");
maintenanceStandard.setVersionStatus("2");
+ maintenanceStandard.setType("daily");
+ maintenanceStandard.setApprovalStatus("5");
maintenanceStandardService.save(maintenanceStandard);
}
else {
@@ -467,6 +482,7 @@
maintenanceStandardDetail.setMaintenanceProjectId(maintenanceProject.getId());
maintenanceStandardDetail.setLocation(location);
maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.getId());
+ maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetailService.save(maintenanceStandardDetail);
}
@@ -644,4 +660,5 @@
return cell.getParagraphs().get(0).getText();
}
+
}
--
Gitblit v1.9.3