Merge remote-tracking branch 'origin/master'

yangbin

6 天以前 0c36e85b7267f96c4fe57bc567f44c8c02bfdbac

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

@@ -252,6 +252,7 @@
            for (int i = 1; i <= 31; i++) {
                if (collect.containsKey(i)) {
                    String inspectionResult = "";
                    if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
                    switch (collect.get(i).getInspectionResult()) {
                        case "NORMAL":
                            inspectionResult = "√";
@@ -265,6 +266,7 @@
                        case "CLOSE":
                            inspectionResult = "T";
                            break;
                        }
                    }
                    resultMap.put("inspectionResult" + i, inspectionResult);
                } else {
@@ -386,6 +388,7 @@
            for (int i = 1; i <= 5; i++) {
                if (collect.containsKey(i)) {
                    String inspectionResult = "";
                    if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
                    switch (collect.get(i).getInspectionResult()) {
                        case "NORMAL":
                            inspectionResult = "√";
@@ -400,6 +403,7 @@
                            inspectionResult = "T";
                            break;
                    }
                    }
                    resultMap.put("inspectionResult" + i, inspectionResult);
                } else {
                    resultMap.put("inspectionResult" + i, "");