优化部分图表

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java

@@ -1032,7 +1032,9 @@ public class DepositoryController {
         // 中国地图数据
         // ['product', '3月', '4月', '5月', '6月', '7月', '8月'],
         // ['电子产品类', 41.1, 30.4, 65.1, 53.3, 83.8, 98.7],
+
         Map<String, Object> mapData = new HashMap<>();
+        if (!"0".equals(type)) {
             List<Object> mapDataList = new ArrayList<>();
             Map<String, Object> previousMonth1 = getPreviousMonth();
             List<Object> months1 = (List<Object>) previousMonth1.get("months");
@@ -1068,20 +1070,26 @@ public class DepositoryController {
             }
 
             mapData.put("mapDataList", mapDataList);
-
+        }
         // 封装 展示数据
         Map<String, Object> depository_data = new LinkedHashMap<String, Object>();
         // 构造对应格式
         depository_data.put("week", show_weekday);
         depository_data.put("data", show_data);
-        depository_data.put("yesterdayData", yesterdayData);
-        depository_data.put("todayInventory", todayInventory);
         depository_data.put("sourceList", sourceList);
-        depository_data.put("mapData", mapData);
+        // 获取库存图
+        if ("0".equals(type)) {
+            // 如果是获取库存
+            depository_data.put("todayInventory", todayInventory);
             depository_data.put("sourceListByMonth", getBeforeInventoryByMonth(depositoryService, depositoryRecordService, userByPort));
-        depository_data.put("BeforeInventory", getBeforeInventoryByDName(depositoryService, depositoryRecordService, userByPort));
             depository_data.put("ThisWeekInventory", getThisWeekInventoryByDName(depositoryService, depositoryRecordService, userByPort));
+            depository_data.put("BeforeInventory", getBeforeInventoryByDName(depositoryService, depositoryRecordService, userByPort));
             depository_data.put("MapInventory", getBeforeInventoryOnMap(depositoryService, depositoryRecordService, userByPort));
+        } else {
+            // 如果不是
+            depository_data.put("yesterdayData", yesterdayData);
+            depository_data.put("mapData", mapData);
+        }
         // 封装 最终数据
         Map<String, Object> data = new LinkedHashMap<String, Object>();
         data.put("depository_data", depository_data);

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -1077,7 +1077,14 @@
         <if test="depositoryId != null">
             and depositoryId = #{depositoryId}
         </if>
+        <if test="state != null and state != ''">
+            <if test="state == '已出库'">
+                and aormcheckId is not null
+            </if>
+            <if test="state != '已出库'">
                 and aorstate = #{state}
+            </if>
+        </if>
         and depositoryManagerTime between #{start} and #{end}
     </select>
 
@@ -1122,8 +1129,13 @@
         from applicationoutrecordinfo
         where 1 = 1
         <if test="state != null and state != ''">
+            <if test="state == '已出库'">
+                and aormcheckId is not null
+            </if>
+            <if test="state != '已出库'">
                 and aorstate = #{state}
             </if>
+        </if>
         <if test="depository_id != null and depository_id != ''">
             and depositoryId = #{depository_id}
         </if>

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java

@@ -112,4 +112,11 @@ public interface MaterialTypeMapper {
      */
     List<MaterialType> findMaterialTypeNoParent();
 
+    /**
+     * 根据父级获取所有类别
+     * @param parentId
+     * @return
+     */
+    List<MaterialType> findMaterialTypeByParent(Integer parentId);
+
 }

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml

@@ -79,6 +79,14 @@
         FROM material_type mt WHERE mt.id = #{id}
     </select>
 
+    <!-- 根据父类查询数据 -->
+    <select id="findMaterialTypeByParent" resultMap="materialTypeMap" parameterType="int">
+        SELECT
+        <include refid="allColumns" />
+        FROM material_type mt
+         WHERE mt.parentId = #{parentId}
+    </select>
+
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeById" resultMap="materialTypeMap" parameterType="integer">
         SELECT

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -15,6 +15,7 @@ import com.dreamchaser.depository_manage.pojo.*;
 import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_templatecard.TemplateCard;
 import com.dreamchaser.depository_manage.security.bean.UserToken;
 import com.dreamchaser.depository_manage.service.DepositoryRecordService;
+import com.dreamchaser.depository_manage.service.MaterialTypeService;
 import com.dreamchaser.depository_manage.service.RoleService;
 import com.dreamchaser.depository_manage.utils.*;
 import org.apache.http.protocol.HTTP;
@@ -68,6 +69,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
     @Autowired
     private QyWxOperationService qyWxOperationService;
 
+    @Autowired
+    private MaterialTypeMapper materialTypeMapper;
+
 
     /**
      * 提交申请，插入一条仓库调度记录
@@ -1543,13 +1547,30 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
     @Override
     public Double findMaterialCountByMonth1(Map<String, Object> map) {
         Integer type = ObjectFormatUtil.toInteger(map.get("type"));
+        Map<String,Object> param = new HashMap<>();
+        param.put("tname",map.get("tname"));
+        List<MaterialType> materialTypeByCondition = materialTypeMapper.findMaterialTypeByCondition(param);
+        MaterialType mt = new MaterialType();
+        if(materialTypeByCondition.size() > 0){
+            // 获取当前类型
+            mt = materialTypeByCondition.get(0);
+        }
+        Double sumCount = 0.0;
+        List<MaterialType> allMtByParent = findChildForMaterialTypeByParent(mt);
         if (type == 1) {
             // 如果入库
-            return depositoryRecordMapper.findApplicationInByMonth(map);
+            for (int i = 0; i < allMtByParent.size(); i++) {
+                map.put("tname",allMtByParent.get(i).getTname());
+                sumCount += depositoryRecordMapper.findApplicationInByMonth(map);
+            }
         } else {
             // 如果出库
-            return depositoryRecordMapper.findApplicationOutByMonth(map);
+            for (int i = 0; i < allMtByParent.size(); i++) {
+                map.put("tname",allMtByParent.get(i).getTname());
+                sumCount += depositoryRecordMapper.findApplicationOutByMonth(map);
+            }
         }
+        return sumCount;
     }
 
     /**
@@ -1717,5 +1738,22 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         return code;
     }
 
+    // 根据id获取子类
+    public List<MaterialType> findChildForMaterialTypeByParent(MaterialType mt){
+        Map<String,Object> param = new HashMap<>();
+        List<MaterialType> result = new ArrayList<>();
+        result.add(mt);
+        param.put("parentId",mt.getId());
+        // 获取当前父类的子类
+        List<MaterialType> materialTypeByCondition = materialTypeMapper.findMaterialTypeByCondition(param);
+        if(materialTypeByCondition.size() > 0){
+            for (int i = 0; i < materialTypeByCondition.size(); i++) {
+                MaterialType mts = materialTypeByCondition.get(i);
+                List<MaterialType> childForMaterialTypeByParent = findChildForMaterialTypeByParent(mts);
+                result.addAll(childForMaterialTypeByParent);
+            }
+        }
+        return result;
+    }
 
 }

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java

@@ -12,6 +12,7 @@ import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import com.dreamchaser.depository_manage.utils.WordUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.thymeleaf.util.ArrayUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,6 +32,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据条件插入数据
+     *
      * @param map 参数map
      * @return 影响条数
      */
@@ -109,6 +111,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据条件查询数据
+     *
      * @param map
      * @return 影响条数
      */
@@ -136,6 +139,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据条件查询对应的总条数
+     *
      * @param map 条件参数
      * @return 查询条数
      */
@@ -146,6 +150,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据主键id删除数据
+     *
      * @param id
      * @return 影响条数
      */
@@ -163,6 +168,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据多个主键id删除多条数据
+     *
      * @param list
      * @return 影响条数
      */
@@ -173,6 +179,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据主键id获取数据信息
+     *
      * @param id
      * @return 查询结果
      */
@@ -183,6 +190,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据条件修改对应数据信息
+     *
      * @param map
      * @return 影响条数
      */
@@ -193,6 +201,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据条件修改状态
+     *
      * @param map
      * @return
      */
@@ -203,6 +212,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 查询所有数据信息
+     *
      * @return 所有数据
      */
     @Override
@@ -212,6 +222,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据主键id将仓库状态改为删除
+     *
      * @param id
      * @return 受影响数目
      */
@@ -222,6 +233,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据多个主键id将对应仓库状态改为删除
+     *
      * @param ids
      * @return 受影响数目
      */
@@ -232,6 +244,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 计算未删除仓库综合
+     *
      * @return
      */
     @Override
@@ -241,6 +254,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 获取本部门以及个人管理仓库的名称和id
+     *
      * @return
      */
     @Override
@@ -277,9 +291,9 @@ public class DepositoryServiceImpl implements DepositoryService {
     }
 
 
-
     /**
      * 根据仓库名称获取当前仓库库存容量
+     *
      * @param dname
      * @return
      */
@@ -298,6 +312,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据父级获取子类
+     *
      * @param id
      * @return
      */
@@ -307,10 +322,9 @@ public class DepositoryServiceImpl implements DepositoryService {
     }
 
 
-
-
     /**
      * 根据多个主键id获取对应数据
+     *
      * @param ids
      * @return 搜索结果
      */
@@ -321,6 +335,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 构造树形选择框
+     *
      * @return
      */
     @Override
@@ -340,6 +355,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据部门构造树形选择框
+     *
      * @param adminorg
      * @return
      */
@@ -360,9 +376,9 @@ public class DepositoryServiceImpl implements DepositoryService {
     }
 
 
-
     /**
      * 获取当前部门以及公共仓库
+     *
      * @param adminorg
      * @return
      */
@@ -374,6 +390,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 根据仓库编码获取仓库
+     *
      * @param code
      * @return
      */
@@ -384,6 +401,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
     /**
      * 获取当前用户与其部门所管理的仓库
+     *
      * @param userByPort
      * @return
      */
@@ -394,23 +412,23 @@ public class DepositoryServiceImpl implements DepositoryService {
 
         // 仓库id列表
         List<Depository> depositoryList = new ArrayList<>();
-        // 添加到id列表
-        for (Depository depository : depositoryByAdminorg) {
-            depositoryList.add(depository);
-        }
+        // 添加到列表
+        depositoryList.addAll(depositoryByAdminorg);
 
         // 获取当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleMapper.findDepositoryAndRole(userByPort.getId());
 
         for (int i = 0; i < depositoryAndRole.size(); i++) {
             RoleAndDepository roleAndDepository = depositoryAndRole.get(i);
+            Depository depositoryRecordById = depositoryMapper.findDepositoryRecordById(roleAndDepository.getDepositoryId());
             // 如果重复则跳过
-            if(depositoryList.get(i).getId().compareTo(roleAndDepository.getDepositoryId()) == 0){
+            if (hasDepository(depositoryList,depositoryRecordById)) {
                 continue;
-            }
-            Depository depositoryRecordById = depositoryMapper.findDepositoryRecordById(roleAndDepository.getDepositoryId());
+            } else {
                 depositoryList.add(depositoryRecordById);
             }
+
+        }
         return depositoryList;
     }
 
@@ -425,7 +443,6 @@ public class DepositoryServiceImpl implements DepositoryService {
     }
 
 
-
     // 根据id获取子类
     public List<Object> findChildForDepositoryByParent(Integer id, String adminorg) {
         Map<String, Object> param = new HashMap<>();
@@ -510,8 +527,7 @@ public class DepositoryServiceImpl implements DepositoryService {
                 }
             }
             return result;
-        }
-        else {
+        } else {
             return null;
         }
     }
@@ -525,10 +541,21 @@ public class DepositoryServiceImpl implements DepositoryService {
             map.put("id", d.getId());
             map.put("children", children);
             return map;
-        }
-        else{
+        } else {
             return null;
         }
     }
 
+
+    private boolean hasDepository(List<Depository> list,Depository o){
+        boolean flag = false;
+        for (Depository depository : list) {
+            if (depository.getCode().equals(o.getCode())) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
+
 }

src/main/resources/templates/pages/chart/chart-in_back.html

@@ -284,7 +284,7 @@
             legend: {},
             tooltip: {
                 trigger: 'axis',
-                showContent: false
+                showContent: true
             },
             dataset: {
                 source: []
@@ -293,21 +293,6 @@
             yAxis: {gridIndex: 0},
             grid: {top: '55%'},
             series: [
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {
-                    type: 'pie',
-                    id: 'pie',
-                    radius: '30%',
-                    center: ['50%', '25%'],
-                    label: {
-                        formatter: '{b}: {@8月} ({d}%)'
-                    },
-                    encode: {
-                        itemName: 'product',
-                        value: '8月',
-                        tooltip: '8月'
-                    }
-                }
             ]
         };
 
@@ -329,6 +314,7 @@
             success: function (result) {
                 layer.close(this.layerIndex);
                 if (result.code === 0) {
+
                     echartsRecords.setOption(optionRecords);
                     echartsPies.setOption(optionPies);
                     echartsDataset.setOption(optionDataset);
@@ -387,9 +373,13 @@
                     }
 
                     for (let i = 0; i < result.data.depository_data.mapData.mapDataList.length; i++) {
-                        optionMap.dataset.source.push(result.data.depository_data.mapData.mapDataList[i])
+                        optionMap.dataset.source.push(result.data.depository_data.mapData.mapDataList[i]);
+                        if(i < result.data.depository_data.mapData.mapDataList.length - 1) {
                             optionMap.series.push({type: 'line', smooth: true, seriesLayoutBy: 'row'})
                         }
+                    }
+
+                    var month = new Date().getMonth() + 1;
 
                     optionMap.series.push(
                         {
@@ -398,12 +388,12 @@
                             radius: '30%',
                             center: ['50%', '25%'],
                             label: {
-                                formatter: '{b}: {@8月} ({d}%)'
+                                formatter: '{b}: {@'+month+'月} ({d}%)'
                             },
                             encode: {
                                 itemName: 'product',
-                                value: '8月',
-                                tooltip: '8月'
+                                value: month+'月',
+                                tooltip: month+'月'
                             }
                         }
                     );
@@ -470,7 +460,7 @@
                     echartsMap.setOption(optionMap);
                 }
             }
-        })
+        });
 
 
         // echarts 窗口缩放自适应

src/main/resources/templates/pages/chart/chart-out_back.html

@@ -292,21 +292,6 @@
             yAxis: {gridIndex: 0},
             grid: {top: '55%'},
             series: [
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {
-                    type: 'pie',
-                    id: 'pie',
-                    radius: '30%',
-                    center: ['50%', '25%'],
-                    label: {
-                        formatter: '{b}: {@8月} ({d}%)'
-                    },
-                    encode: {
-                        itemName: 'product',
-                        value: '8月',
-                        tooltip: '8月'
-                    }
-                }
             ]
         };
 
@@ -374,20 +359,21 @@
                             name: result.data.depository_name[i]
                         })
                     }
-                    var dimensions = result.data.depository_data.sourceList[result.data.depository_data.sourceList.length - 1]
-                    optionDataset.dataset.dimensions = dimensions
+                    var dimensions = result.data.depository_data.sourceList[result.data.depository_data.sourceList.length - 1];
+                    optionDataset.dataset.dimensions = dimensions;
                     for (let i = result.data.depository_data.sourceList.length - 2; i >= 0; i--) {
                         optionDataset.dataset.source.push(result.data.depository_data.sourceList[i])
                     }
                     for (let i = 0; i < dimensions.length - 1; i++) {
                         optionDataset.series.push({type: 'bar'})
                     }
-
                     for (let i = 0; i < result.data.depository_data.mapData.mapDataList.length; i++) {
-                        optionMap.dataset.source.push(result.data.depository_data.mapData.mapDataList[i])
-                        optionMap.series.push({type: 'line', smooth: true, seriesLayoutBy: 'row'})
-
+                        optionMap.dataset.source.push(result.data.depository_data.mapData.mapDataList[i]);
+                        if(i < result.data.depository_data.mapData.mapDataList.length - 1) {
+                            optionMap.series.push({type: 'line', smooth: true, seriesLayoutBy: 'row'});
+                        }
                     }
+                    var month = new Date().getMonth() + 1;
                     optionMap.series.push(
                         {
                             type: 'pie',
@@ -395,17 +381,15 @@
                             radius: '30%',
                             center: ['50%', '25%'],
                             label: {
-                                formatter: '{b}: {@8月} ({d}%)'
+                                formatter: '{b}: {@'+month+'月} ({d}%)'
                             },
                             encode: {
                                 itemName: 'product',
-                                value: '8月',
-                                tooltip: '8月'
+                                value: month+'月',
+                                tooltip: month+'月'
                             }
                         }
-                    )
-
-
+                    );
                     optionRecords = {
                         title: {
                             text: '出库仓库-报表图'
@@ -469,15 +453,16 @@
                     echartsMap.setOption(optionMap);
                 }
             }
-        })
+        });
 
 
         // echarts 窗口缩放自适应
         window.onresize = function () {
             echartsRecords.resize();
-        }
+        };
 
 
+        // 获取本周
         form.on('submit(thisWeek)', function () {
             $.ajax({
                 url: '/repository/layui/echart_back?type=2',
@@ -548,6 +533,7 @@
             })
         })
 
+        // 获取上周
         form.on('submit(lastWeek)', function () {
             $.ajax({
                 url: '/repository/layui/echart_back?type=2&last=1',

src/main/resources/templates/pages/chart/chart-stock_back.html

@@ -215,21 +215,6 @@
             yAxis: {gridIndex: 0},
             grid: {top: '55%'},
             series: [
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {
-                    type: 'pie',
-                    id: 'pie',
-                    radius: '30%',
-                    center: ['50%', '25%'],
-                    label: {
-                        formatter: '{b}: {@3月} ({d}%)'
-                    },
-                    encode: {
-                        itemName: 'product',
-                        value: '3月',
-                        tooltip: '3月'
-                    }
-                }
                 ]
         };
 
@@ -307,28 +292,28 @@
 
                     for (let i = 0; i < result.data.depository_data.MapInventory.mapDataList.length ; i++) {
                         optionMap.dataset.source.push(result.data.depository_data.MapInventory.mapDataList[i])
+                        if(i < result.data.depository_data.MapInventory.mapDataList.length - 1) {
                             optionMap.series.push({type: 'line', smooth: true, seriesLayoutBy: 'row'})
+                        }
 
                     }
-                    /*optionMap.series.push(
+                    var month = new Date().getMonth() + 1;
+                    optionMap.series.push(
                         {
                             type: 'pie',
                             // id: 'pie',
                             radius: '30%',
                             center: ['50%', '25%'],
                             label: {
-                                formatter: '{b}: {@8月} ({d}%)'
+                                formatter: '{b}: {@'+month+'月} ({d}%)'
                             },
                             encode: {
                                 itemName: 'product',
-                                value: '8月',
-                                tooltip: '8月'
+                                value: month+'月',
+                                tooltip: month+'月'
                             }
                         }
-                    )*/
-
-
-
+                    );
                     optionRecords = {
                         title: {
                             text: '仓库库存-报表图'

src/test/java/com/dreamchaser/depository_manage/Test.java

@@ -73,38 +73,12 @@ public class Test {
     @Autowired
     MaterialService materialService;
 
+    @Autowired
+    DepositoryService depositoryService;
     @org.junit.Test
     public void test1() throws AesException, IOException, ParserConfigurationException, SAXException {
-        Map<String,Object> map = new HashMap<>();
-       /* map.put("mid",0);
-        map.put("mcode","code");*/
-        map.put("mid1",1);
-        map.put("mcode1","code1");
-        map.put("mid2",2);
-        map.put("mcode2","code2");
-        Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator();
-        Set<String> strings = map.keySet();
-        String key = "";
-        for (String tempKey :
-                strings) {
-            if(tempKey.contains("mid")){
-                key = tempKey;
-                break;
-            }
-        }
-        Map.Entry<String, Object> entry;
-        String keyNumber = key.split("mid")[1];
-        while (iterator.hasNext()){
-            entry = iterator.next();
-            // 放入新的Entry
-            if(entry.toString().contains(keyNumber)){
-                map.put(entry.toString().replace(keyNumber,""),entry.getValue());
-//            iterator.remove();
-            }
-            // 删除老的Entry
-        }
+        List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg("102");
 
-        System.out.println(map);
 
     }
 

target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -1077,7 +1077,14 @@
         <if test="depositoryId != null">
             and depositoryId = #{depositoryId}
         </if>
+        <if test="state != null and state != ''">
+            <if test="state == '已出库'">
+                and aormcheckId is not null
+            </if>
+            <if test="state != '已出库'">
                 and aorstate = #{state}
+            </if>
+        </if>
         and depositoryManagerTime between #{start} and #{end}
     </select>
 
@@ -1122,8 +1129,13 @@
         from applicationoutrecordinfo
         where 1 = 1
         <if test="state != null and state != ''">
+            <if test="state == '已出库'">
+                and aormcheckId is not null
+            </if>
+            <if test="state != '已出库'">
                 and aorstate = #{state}
             </if>
+        </if>
         <if test="depository_id != null and depository_id != ''">
             and depositoryId = #{depository_id}
         </if>

target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml

@@ -79,6 +79,14 @@
         FROM material_type mt WHERE mt.id = #{id}
     </select>
 
+    <!-- 根据父类查询数据 -->
+    <select id="findMaterialTypeByParent" resultMap="materialTypeMap" parameterType="int">
+        SELECT
+        <include refid="allColumns" />
+        FROM material_type mt
+         WHERE mt.parentId = #{parentId}
+    </select>
+
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeById" resultMap="materialTypeMap" parameterType="integer">
         SELECT

target/classes/templates/pages/chart/chart-out_back.html

@@ -292,21 +292,6 @@
             yAxis: {gridIndex: 0},
             grid: {top: '55%'},
             series: [
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {
-                    type: 'pie',
-                    id: 'pie',
-                    radius: '30%',
-                    center: ['50%', '25%'],
-                    label: {
-                        formatter: '{b}: {@8月} ({d}%)'
-                    },
-                    encode: {
-                        itemName: 'product',
-                        value: '8月',
-                        tooltip: '8月'
-                    }
-                }
             ]
         };
 
@@ -374,20 +359,21 @@
                             name: result.data.depository_name[i]
                         })
                     }
-                    var dimensions = result.data.depository_data.sourceList[result.data.depository_data.sourceList.length - 1]
-                    optionDataset.dataset.dimensions = dimensions
+                    var dimensions = result.data.depository_data.sourceList[result.data.depository_data.sourceList.length - 1];
+                    optionDataset.dataset.dimensions = dimensions;
                     for (let i = result.data.depository_data.sourceList.length - 2; i >= 0; i--) {
                         optionDataset.dataset.source.push(result.data.depository_data.sourceList[i])
                     }
                     for (let i = 0; i < dimensions.length - 1; i++) {
                         optionDataset.series.push({type: 'bar'})
                     }
-
                     for (let i = 0; i < result.data.depository_data.mapData.mapDataList.length; i++) {
-                        optionMap.dataset.source.push(result.data.depository_data.mapData.mapDataList[i])
-                        optionMap.series.push({type: 'line', smooth: true, seriesLayoutBy: 'row'})
-
+                        optionMap.dataset.source.push(result.data.depository_data.mapData.mapDataList[i]);
+                        if(i < result.data.depository_data.mapData.mapDataList.length - 1) {
+                            optionMap.series.push({type: 'line', smooth: true, seriesLayoutBy: 'row'});
+                        }
                     }
+                    var month = new Date().getMonth() + 1;
                     optionMap.series.push(
                         {
                             type: 'pie',
@@ -395,17 +381,15 @@
                             radius: '30%',
                             center: ['50%', '25%'],
                             label: {
-                                formatter: '{b}: {@8月} ({d}%)'
+                                formatter: '{b}: {@'+month+'月} ({d}%)'
                             },
                             encode: {
                                 itemName: 'product',
-                                value: '8月',
-                                tooltip: '8月'
+                                value: month+'月',
+                                tooltip: month+'月'
                             }
                         }
-                    )
-
-
+                    );
                     optionRecords = {
                         title: {
                             text: '出库仓库-报表图'
@@ -469,15 +453,16 @@
                     echartsMap.setOption(optionMap);
                 }
             }
-        })
+        });
 
 
         // echarts 窗口缩放自适应
         window.onresize = function () {
             echartsRecords.resize();
-        }
+        };
 
 
+        // 获取本周
         form.on('submit(thisWeek)', function () {
             $.ajax({
                 url: '/repository/layui/echart_back?type=2',
@@ -548,6 +533,7 @@
             })
         })
 
+        // 获取上周
         form.on('submit(lastWeek)', function () {
             $.ajax({
                 url: '/repository/layui/echart_back?type=2&last=1',

target/classes/templates/pages/chart/chart-stock_back.html

@@ -215,21 +215,6 @@
             yAxis: {gridIndex: 0},
             grid: {top: '55%'},
             series: [
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {
-                    type: 'pie',
-                    id: 'pie',
-                    radius: '30%',
-                    center: ['50%', '25%'],
-                    label: {
-                        formatter: '{b}: {@3月} ({d}%)'
-                    },
-                    encode: {
-                        itemName: 'product',
-                        value: '3月',
-                        tooltip: '3月'
-                    }
-                }
                 ]
         };
 
@@ -307,28 +292,28 @@
 
                     for (let i = 0; i < result.data.depository_data.MapInventory.mapDataList.length ; i++) {
                         optionMap.dataset.source.push(result.data.depository_data.MapInventory.mapDataList[i])
+                        if(i < result.data.depository_data.MapInventory.mapDataList.length - 1) {
                             optionMap.series.push({type: 'line', smooth: true, seriesLayoutBy: 'row'})
+                        }
 
                     }
-                    /*optionMap.series.push(
+                    var month = new Date().getMonth() + 1;
+                    optionMap.series.push(
                         {
                             type: 'pie',
                             // id: 'pie',
                             radius: '30%',
                             center: ['50%', '25%'],
                             label: {
-                                formatter: '{b}: {@8月} ({d}%)'
+                                formatter: '{b}: {@'+month+'月} ({d}%)'
                             },
                             encode: {
                                 itemName: 'product',
-                                value: '8月',
-                                tooltip: '8月'
+                                value: month+'月',
+                                tooltip: month+'月'
                             }
                         }
-                    )*/
-
-
-
+                    );
                     optionRecords = {
                         title: {
                             text: '仓库库存-报表图'