优化

“linengliang”

2023-12-05 417c2e6247704736e79db39414abd4e2f0f9ecc6

优化

 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();
    }


}