diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index e7c9651..c7c2ae1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -360,7 +360,7 @@ public class AreaCountFacade { } else if (key.contains("num15")) { - num20.add(result.get(key)); + num15.add(result.get(key)); } else if (key.contains("num20")) { @@ -372,7 +372,7 @@ public class AreaCountFacade { } else if (key.contains("num27")) { - num24.add(result.get(key)); + num27.add(result.get(key)); } else if (key.contains("num36")) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java index 2dfab1d..74d9a02 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java @@ -135,7 +135,7 @@ public class CheckPointCountWorker implements Callable{ int itemnum27 = result.get("itemnum27"); int itemnum36 = result.get("itemnum36"); int itemnum40 = result.get("itemnum40"); - int cjNum = itemnum12+itemnum20+itemnum24+itemnum36+itemnum40; + int cjNum = itemnum12+itemnum15+itemnum20+itemnum24+itemnum27+itemnum36+itemnum40; if (buildCount == 0 && cjNum == 0) { continue; @@ -144,7 +144,7 @@ public class CheckPointCountWorker implements Callable{ map.put("CJ_NUM", cjNum); map.put("NUM_12", itemnum12); map.put("NUM_15", itemnum15); - map.put("NUM_16", itemnum20); + map.put("NUM_20", itemnum20); map.put("NUM_24", itemnum24); map.put("NUM_27", itemnum27); map.put("NUM_36", itemnum36); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java index 3539363..623bee8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java @@ -37,11 +37,6 @@ public class CheckWeeksNumWorker implements Callable> { } /** - * weeks.add(0); - weeks.add(16); - weeks.add(21); - weeks.add(28); - weeks.add(37); * @return * @throws Exception */