From 24c817c0d6f60e9b285338442fc7c0186ab9c477 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Wed, 12 Jul 2023 10:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87=E5=9B=BE?=
 =?UTF-8?q?=E4=BE=8B=E4=B8=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/config/PublicConfig.java            | 6 +++---
 .../controller/DepositoryRecordController.java            | 8 ++++----
 .../service/impl/DepositoryRecordServiceImpl.java         | 4 ++--
 .../templates/pages/material/material-view_back.html      | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
index 567dc112..23206458 100644
--- a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
+++ b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
@@ -124,7 +124,7 @@ public class PublicConfig {
             List<UserByPort> allUserByMainDepartment = FindUserByAdminorg(maindepartment, userKey, userToken);
             for (UserByPort userByPort : allUserByMainDepartment) {
                 int emptype = userByPort.getEmptype();
-                if(emptype>10){
+                if (emptype > 10) {
                     continue;
                 }
                 if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) {
@@ -343,7 +343,7 @@ public class PublicConfig {
         JSONObject jsonObject = JSONObject.parseObject(post);
         JSONObject data = (JSONObject) jsonObject.get("data");
         UserByPort userByPort = JSONObject.toJavaObject(data, UserByPort.class);
-        if("300732".equals(userByPort.getNumber())){
+        if ("300732".equals(userByPort.getNumber())) {
             userByPort.setMaindeparment(361);
             userByPort.setMaindeparmentname("仓储中心");
         }
@@ -372,7 +372,7 @@ public class PublicConfig {
             e.printStackTrace();
         }
         JSONObject jsonObject = JSONObject.parseObject(post);
-        JSONObject data =  jsonObject.getJSONObject("data");
+        JSONObject data = jsonObject.getJSONObject("data");
         JSONArray jsonArray = data.getJSONArray("list");
         List<UserByPort> list = new ArrayList<>();
         for (Object o : jsonArray
diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
index 52a7f477..4d1d47d0 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
@@ -2461,8 +2461,8 @@ public class DepositoryRecordController {
         // 反转
         Collections.reverse(inventoryAmountList);
         Collections.reverse(inventoryCountList);
-        Map<String, Object> countItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("count", inventoryCountList);
-        Map<String, Object> amountItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("amount", inventoryAmountList);
+        Map<String, Object> countItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("总数", inventoryCountList);
+        Map<String, Object> amountItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("总金额", inventoryAmountList);
         Map<String, Object> result = new HashMap<>();
 
         result.put("countItemForIn", countItemForIn);
@@ -2470,7 +2470,7 @@ public class DepositoryRecordController {
         result.put("countItemForOut", countItemForOut);
         Map<String, List<String>> legendItem = new HashMap<>();
         List<String> legends = new ArrayList<>();
-        legends.add("count");
+        legends.add("总数");
 
         legendItem.put("data", legends);
 
@@ -2488,7 +2488,7 @@ public class DepositoryRecordController {
             result.put("amountItemForInventory", amountItemForInventory);
             result.put("amountItemForOut", amountItemForOut);
             result.put("amountItemForIn", amountItemForIn);
-            legends.add("amount");
+            legends.add("总金额");
         }
         result.put("legend", legendItem);
         return new RestResponse(result);
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index acb012b3..80ed5d9f 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -2196,8 +2196,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             amountList.add(amount);
         }
 
-        Map<String, Object> amountItem = createStackedAreaChartSeriesItem("amount", amountList);
-        Map<String, Object> countItem = createStackedAreaChartSeriesItem("count", countList);
+        Map<String, Object> amountItem = createStackedAreaChartSeriesItem("总金额", amountList);
+        Map<String, Object> countItem = createStackedAreaChartSeriesItem("总数", countList);
         result.put("amountItem", amountItem);
         result.put("countItem", countItem);
         return result;
diff --git a/src/main/resources/templates/pages/material/material-view_back.html b/src/main/resources/templates/pages/material/material-view_back.html
index 74626d4f..2252eeb4 100644
--- a/src/main/resources/templates/pages/material/material-view_back.html
+++ b/src/main/resources/templates/pages/material/material-view_back.html
@@ -530,7 +530,7 @@
                                 content:'<div id="fullChart" style="width: 100%;height: 100%;padding:30px 0px"></div>',
                                 success:function(){
                                     var fullchart = echarts.init(window.top.document.getElementById('fullChart'));
-                                    fullchart.setOption(optionLineChartIn)
+                                    fullchart.setOption(optionLineChartOut)
                                 }
                             })
                         }
@@ -573,7 +573,7 @@
                                 content:'<div id="fullChart" style="width: 100%;height: 100%;padding:30px 0px"></div>',
                                 success:function(){
                                     var fullchart = echarts.init(window.top.document.getElementById('fullChart'));
-                                    fullchart.setOption(optionLineChartIn)
+                                    fullchart.setOption(optionLineChartInventory)
                                 }
                             })
                         }