From 707b5af9ed7c12d18cba597e3f2f76671891034b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 12 十二月 2023 17:27:21 +0800
Subject: [PATCH] 技术状态鉴定 批量点检驳回 审批
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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..36c6cdd 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
@@ -136,12 +136,22 @@
/**
- * 鏃ュ父淇濆吇宸ュ崟鍒涘缓 缁勪欢閫氳繃浣跨敤閮ㄩ棬杩囨护鑾峰彇淇濆吇鏍囧噯
+ * 浜屼繚 缁勪欢閫氳繃浣跨敤閮ㄩ棬杩囨护鑾峰彇淇濆吇鏍囧噯
* qsw 2023-4-26
*/
@GetMapping("getMaintenanceStandard2List")
public Result<?> getMaintenanceStandard2List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> maintenanceStandardList = maintenanceStandardService.getMaintenanceStandard2List(pageNo, pageSize, params);
+ return Result.ok(maintenanceStandardList);
+ }
+
+ /**
+ * 涓変繚 缁勪欢閫氳繃浣跨敤閮ㄩ棬杩囨护鑾峰彇淇濆吇鏍囧噯
+ * qsw 2023-12-12
+ */
+ @GetMapping("getMaintenanceStandard3List")
+ public Result<?> getMaintenanceStandard3List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> maintenanceStandardList = maintenanceStandardService.getMaintenanceStandard3List(pageNo, pageSize, params);
return Result.ok(maintenanceStandardList);
}
@@ -302,14 +312,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 +340,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 +366,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 +385,7 @@
}
}
}
+ return Result.OK("瀵煎叆鎴愬姛");
} else {
System.out.println("鏃犳硶瑙ｆ瀽璇ユ枃浠�");
}
@@ -420,6 +443,8 @@
maintenanceStandard.setAssignMode("1");
maintenanceStandard.setVersion("1.0");
maintenanceStandard.setVersionStatus("2");
+ maintenanceStandard.setType("daily");
+ maintenanceStandard.setApprovalStatus("5");
maintenanceStandardService.save(maintenanceStandard);
}
else {
@@ -467,6 +492,7 @@
maintenanceStandardDetail.setMaintenanceProjectId(maintenanceProject.getId());
maintenanceStandardDetail.setLocation(location);
maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.getId());
+ maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetailService.save(maintenanceStandardDetail);
}
@@ -644,4 +670,5 @@
return cell.getParagraphs().get(0).getText();
}
+
}
--
Gitblit v1.9.3