Merge remote-tracking branch 'origin/master'

zhangherong

6 天以前 d6372da6f37778e90a4bae02865e8ec77e980b6e

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java

@@ -252,19 +252,21 @@
            for (int i = 1; i <= 31; i++) {
                if (collect.containsKey(i)) {
                    String inspectionResult = "";
                    switch (collect.get(i).getInspectionResult()) {
                        case "NORMAL":
                            inspectionResult = "√";
                            break;
                        case "ANOMALY":
                            inspectionResult = "×";
                            break;
                        case "FAULT":
                            inspectionResult = "△";
                            break;
                        case "CLOSE":
                            inspectionResult = "T";
                            break;
                    if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
                        switch (collect.get(i).getInspectionResult()) {
                            case "NORMAL":
                                inspectionResult = "√";
                                break;
                            case "ANOMALY":
                                inspectionResult = "×";
                                break;
                            case "FAULT":
                                inspectionResult = "△";
                                break;
                            case "CLOSE":
                                inspectionResult = "T";
                                break;
                        }
                    }
                    resultMap.put("inspectionResult" + i, inspectionResult);
                } else {
@@ -386,19 +388,21 @@
            for (int i = 1; i <= 5; i++) {
                if (collect.containsKey(i)) {
                    String inspectionResult = "";
                    switch (collect.get(i).getInspectionResult()) {
                        case "NORMAL":
                            inspectionResult = "√";
                            break;
                        case "ANOMALY":
                            inspectionResult = "×";
                            break;
                        case "FAULT":
                            inspectionResult = "△";
                            break;
                        case "CLOSE":
                            inspectionResult = "T";
                            break;
                    if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
                        switch (collect.get(i).getInspectionResult()) {
                            case "NORMAL":
                                inspectionResult = "√";
                                break;
                            case "ANOMALY":
                                inspectionResult = "×";
                                break;
                            case "FAULT":
                                inspectionResult = "△";
                                break;
                            case "CLOSE":
                                inspectionResult = "T";
                                break;
                        }
                    }
                    resultMap.put("inspectionResult" + i, inspectionResult);
                } else {