Selaa lähdekoodia

质量月报bugfix

wangggziwen 1 vuosi sitten
vanhempi
commit
b1fabc1596
16 muutettua tiedostoa jossa 173 lisäystä ja 15 poistoa
  1. 72 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportController.java
  2. 6 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS0501Controller.java
  3. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS1301Controller.java
  4. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2002Controller.java
  5. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2007Controller.java
  6. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2400Controller.java
  7. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3004Controller.java
  8. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4012Controller.java
  9. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4013Controller.java
  10. 3 1
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4501Controller.java
  11. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5001Controller.java
  12. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5003Controller.java
  13. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6101Controller.java
  14. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6107Controller.java
  15. 3 0
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6301Controller.java
  16. 56 14
      ui/src/views/production/quality/index.vue

+ 72 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportController.java

@@ -1367,6 +1367,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1429,6 +1432,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1487,6 +1493,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1519,6 +1528,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1551,6 +1563,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1587,6 +1602,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1621,6 +1639,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1653,6 +1674,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1687,6 +1711,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1737,6 +1764,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1787,6 +1817,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1837,6 +1870,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1887,6 +1923,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1921,6 +1960,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1959,6 +2001,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -1999,6 +2044,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2069,6 +2117,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2109,6 +2160,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2161,6 +2215,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2203,6 +2260,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2247,6 +2307,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2317,6 +2380,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2349,6 +2415,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {
@@ -2401,6 +2470,9 @@ public class TMonthlyQualityReportController extends BaseController
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
+                    if (cellValue.indexOf("<") != -1) {
+                        cellValue = cellValue.substring(cellValue.indexOf("<") + 1);
+                    }
                     if (j == 0) {
                         entity.setLocationName(cellValue);
                     } else if (j == 1) {

+ 6 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS0501Controller.java

@@ -67,6 +67,9 @@ public class TMonthlyQualityReportS0501Controller extends BaseController
                 startMonth++;
             }
         } while (startYear != endYear || startMonth != endMonth + 1);
+        if (dataMap.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取map第一个元素
         List<String> keys = new ArrayList<>(dataMap.keySet());
         String firstKey = keys.get(0);
@@ -154,6 +157,9 @@ public class TMonthlyQualityReportS0501Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS0501 tMonthlyQualityReportS0501)
     {
         List<TMonthlyQualityReportS0501> tMonthlyQualityReportS0501s = tMonthlyQualityReportS0501Service.selectTMonthlyQualityReportS0501List(tMonthlyQualityReportS0501);
+        if (tMonthlyQualityReportS0501s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS0501 firstValue = tMonthlyQualityReportS0501s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS1301Controller.java

@@ -45,6 +45,9 @@ public class TMonthlyQualityReportS1301Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS1301 tMonthlyQualityReportS1301)
     {
         List<TMonthlyQualityReportS1301> tMonthlyQualityReportS1301s = tMonthlyQualityReportS1301Service.selectTMonthlyQualityReportS1301List(tMonthlyQualityReportS1301);
+        if (tMonthlyQualityReportS1301s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS1301 firstValue = tMonthlyQualityReportS1301s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2002Controller.java

@@ -45,6 +45,9 @@ public class TMonthlyQualityReportS2002Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS2002 tMonthlyQualityReportS2002)
     {
         List<TMonthlyQualityReportS2002> tMonthlyQualityReportS2002s = tMonthlyQualityReportS2002Service.selectTMonthlyQualityReportS2002List(tMonthlyQualityReportS2002);
+        if (tMonthlyQualityReportS2002s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS2002 firstValue = tMonthlyQualityReportS2002s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2007Controller.java

@@ -45,6 +45,9 @@ public class TMonthlyQualityReportS2007Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS2007 tMonthlyQualityReportS2007)
     {
         List<TMonthlyQualityReportS2007> tMonthlyQualityReportS2007s = tMonthlyQualityReportS2007Service.selectTMonthlyQualityReportS2007List(tMonthlyQualityReportS2007);
+        if (tMonthlyQualityReportS2007s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS2007 firstValue = tMonthlyQualityReportS2007s.get(0);
         String firstProductionString = firstValue.getProduction();

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2400Controller.java

@@ -45,6 +45,9 @@ public class TMonthlyQualityReportS2400Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS2400 tMonthlyQualityReportS2400)
     {
         List<TMonthlyQualityReportS2400> tMonthlyQualityReportS2400s = tMonthlyQualityReportS2400Service.selectTMonthlyQualityReportS2400List(tMonthlyQualityReportS2400);
+        if (tMonthlyQualityReportS2400s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS2400 firstValue = tMonthlyQualityReportS2400s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3004Controller.java

@@ -45,6 +45,9 @@ public class TMonthlyQualityReportS3004Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS3004 tMonthlyQualityReportS3004)
     {
         List<TMonthlyQualityReportS3004> tMonthlyQualityReportS3004s = tMonthlyQualityReportS3004Service.selectTMonthlyQualityReportS3004List(tMonthlyQualityReportS3004);
+        if (tMonthlyQualityReportS3004s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS3004 firstValue = tMonthlyQualityReportS3004s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4012Controller.java

@@ -47,6 +47,9 @@ public class TMonthlyQualityReportS4012Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS4012 tMonthlyQualityReportS4012)
     {
         List<TMonthlyQualityReportS4012> tMonthlyQualityReportS4012s = tMonthlyQualityReportS4012Service.selectTMonthlyQualityReportS4012List(tMonthlyQualityReportS4012);
+        if (tMonthlyQualityReportS4012s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS4012 firstValue = tMonthlyQualityReportS4012s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4013Controller.java

@@ -45,6 +45,9 @@ public class TMonthlyQualityReportS4013Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS4013 tMonthlyQualityReportS4013)
     {
         List<TMonthlyQualityReportS4013> tMonthlyQualityReportS4013s = tMonthlyQualityReportS4013Service.selectTMonthlyQualityReportS4013List(tMonthlyQualityReportS4013);
+        if (tMonthlyQualityReportS4013s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS4013 firstValue = tMonthlyQualityReportS4013s.get(0);
         // 最大值

+ 3 - 1
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4501Controller.java

@@ -44,8 +44,10 @@ public class TMonthlyQualityReportS4501Controller extends BaseController
     @GetMapping("/list")
     public AjaxResult list(TMonthlyQualityReportS4501 tMonthlyQualityReportS4501)
     {
-
         List<TMonthlyQualityReportS4501> tMonthlyQualityReportS4501s = tMonthlyQualityReportS4501Service.selectTMonthlyQualityReportS4501List(tMonthlyQualityReportS4501);
+        if (tMonthlyQualityReportS4501s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS4501 firstValue = tMonthlyQualityReportS4501s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5001Controller.java

@@ -55,6 +55,9 @@ public class TMonthlyQualityReportS5001Controller extends BaseController
             BigDecimal mapd = propadiene.add(methylacetylene);
             monthlyQualityReportS5001.setMapd(mapd.toString());
         }
+        if (tMonthlyQualityReportS5001s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS5001 firstValue = tMonthlyQualityReportS5001s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5003Controller.java

@@ -45,6 +45,9 @@ public class TMonthlyQualityReportS5003Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS5003 tMonthlyQualityReportS5003)
     {
         List<TMonthlyQualityReportS5003> tMonthlyQualityReportS5003s = tMonthlyQualityReportS5003Service.selectTMonthlyQualityReportS5003List(tMonthlyQualityReportS5003);
+        if (tMonthlyQualityReportS5003s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS5003 firstValue = tMonthlyQualityReportS5003s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6101Controller.java

@@ -46,6 +46,9 @@ public class TMonthlyQualityReportS6101Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS6101 tMonthlyQualityReportS6101)
     {
         List<TMonthlyQualityReportS6101> tMonthlyQualityReportS6101s = tMonthlyQualityReportS6101Service.selectTMonthlyQualityReportS6101List(tMonthlyQualityReportS6101);
+        if (tMonthlyQualityReportS6101s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS6101 firstValue = tMonthlyQualityReportS6101s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6107Controller.java

@@ -46,6 +46,9 @@ public class TMonthlyQualityReportS6107Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS6107 tMonthlyQualityReportS6107)
     {
         List<TMonthlyQualityReportS6107> tMonthlyQualityReportS6107s = tMonthlyQualityReportS6107Service.selectTMonthlyQualityReportS6107List(tMonthlyQualityReportS6107);
+        if (tMonthlyQualityReportS6107s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS6107 firstValue = tMonthlyQualityReportS6107s.get(0);
         // 最大值

+ 3 - 0
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6301Controller.java

@@ -46,6 +46,9 @@ public class TMonthlyQualityReportS6301Controller extends BaseController
     public AjaxResult list(TMonthlyQualityReportS6301 tMonthlyQualityReportS6301)
     {
         List<TMonthlyQualityReportS6301> tMonthlyQualityReportS6301s = tMonthlyQualityReportS6301Service.selectTMonthlyQualityReportS6301List(tMonthlyQualityReportS6301);
+        if (tMonthlyQualityReportS6301s.size() == 0) {
+            return AjaxResult.success();
+        }
         // 获取list第一个元素
         TMonthlyQualityReportS6301 firstValue = tMonthlyQualityReportS6301s.get(0);
         // 最大值

+ 56 - 14
ui/src/views/production/quality/index.vue

@@ -2653,22 +2653,31 @@ export default {
     },
     getListS0501() {
       this.loadingS0501 = true;
+      this.s0501List = [];
       listS0501(this.queryParams).then(response => {
-        this.s0501List = response.data.dataList;
+        if (response.data != null) {
+          this.s0501List = response.data.dataList;
+        }
         this.loadingS0501 = false;
       });
     },
     getListS1301() {
       this.loadingS1301 = true;
+      this.s1301List = [];
       listS1301(this.queryParams).then(response => {
-        this.s1301List = response.data.dataList;
+        if (response.data != null) {
+          this.s1301List = response.data.dataList;
+        }
         this.loadingS1301 = false;
       });
     },
     getListS2002() {
       this.loadingS2002 = true;
+      this.s2002List = [];
       listS2002(this.queryParams).then(response => {
-        this.s2002List = response.data.dataList;
+        if (response.data != null) {
+          this.s2002List = response.data.dataList;
+        }
         this.loadingS2002 = false;
       });
     },
@@ -2681,8 +2690,11 @@ export default {
     },
     getListS2007() {
       this.loadingS2007 = true;
+      this.s2007List = [];
       listS2007(this.queryParams).then(response => {
-        this.s2007List = response.data.dataList;
+        if (response.data != null) {
+          this.s2007List = response.data.dataList;
+        }
         this.loadingS2007 = false;
       });
     },
@@ -2695,15 +2707,21 @@ export default {
     },
     getListS2400() {
       this.loadingS2400 = true;
+      this.s2400List = [];
       listS2400(this.queryParams).then(response => {
-        this.s2400List = response.data.dataList;
+        if (response.data != null) {
+          this.s2400List = response.data.dataList;
+        }
         this.loadingS2400 = false;
       });
     },
     getListS3004() {
       this.loadingS3004 = true;
+      this.s3004List = [];
       listS3004(this.queryParams).then(response => {
-        this.s3004List = response.data.dataList;
+        if (response.data != null) {
+          this.s3004List = response.data.dataList;
+        }
         this.loadingS3004 = false;
       });
     },
@@ -2744,36 +2762,51 @@ export default {
     },
     getListS4012() {
       this.loadingS4012 = true;
+      this.s4012List = [];
       listS4012(this.queryParams).then(response => {
-        this.s4012List = response.data.dataList;
+        if (response.data != null) {
+          this.s4012List = response.data.dataList;
+        }
         this.loadingS4012 = false;
       });
     },
     getListS4013() {
       this.loadingS4013 = true;
+      this.s4013List = [];
       listS4013(this.queryParams).then(response => {
-        this.s4013List = response.data.dataList;
+        if (response.data != null) {
+          this.s4013List = response.data.dataList;
+        }
         this.loadingS4013 = false;
       });
     },
     getListS4501() {
       this.loadingS4501 = true;
+      this.s4501List = [];
       listS4501(this.queryParams).then(response => {
-        this.s4501List = response.data.dataList;
+        if (response.data != null) {
+          this.s4501List = response.data.dataList;
+        }
         this.loadingS4501 = false;
       });
     },
     getListS5001() {
       this.loadingS5001 = true;
+      this.s5001List = [];
       listS5001(this.queryParams).then(response => {
-        this.s5001List = response.data.dataList;
+        if (response.data != null) {
+          this.s5001List = response.data.dataList;
+        }
         this.loadingS5001 = false;
       });
     },
     getListS5003() {
       this.loadingS5003 = true;
+      this.s5003List = [];
       listS5003(this.queryParams).then(response => {
-        this.s5003List = response.data.dataList;
+        if (response.data != null) {
+          this.s5003List = response.data.dataList;
+        }
         this.loadingS5003 = false;
       });
     },
@@ -2793,22 +2826,31 @@ export default {
     },
     getListS6101() {
       this.loadingS6101 = true;
+      this.s6101List = [];
       listS6101(this.queryParams).then(response => {
-        this.s6101List = response.data.dataList;
+        if (response.data != null) {
+          this.s6101List = response.data.dataList;
+        }
         this.loadingS6101 = false;
       });
     },
     getListS6107() {
       this.loadingS6107 = true;
+      this.s6107List = [];
       listS6107(this.queryParams).then(response => {
-        this.s6107List = response.data.dataList;
+        if (response.data != null) {
+          this.s6107List = response.data.dataList;
+        }
         this.loadingS6107 = false;
       });
     },
     getListS6301() {
       this.loadingS6301 = true;
+      this.s6301List = [];
       listS6301(this.queryParams).then(response => {
-        this.s6301List = response.data.dataList;
+        if (response.data != null) {
+          this.s6301List = response.data.dataList;
+        }
         this.loadingS6301 = false;
       });
     },