Merge remote-tracking branch 'origin/master' into master

@@ -181,6 +181,10 @@ public class EquipmentInController {
         if (StringUtils.isNotEmpty(equipmentInDTO.getEndTime())) {
         if (StringUtils.isNotEmpty(equipmentInDTO.getEndTime())) {
             queryWrapper.le("in_date", equipmentInDTO.getEndTime() + " 23:59:59");
             queryWrapper.le("in_date", equipmentInDTO.getEndTime() + " 23:59:59");
         }
         }
+        if (StringUtils.isNotEmpty(equipmentInDTO.getSparepartId())) {
+            String sparepartId = equipmentInDTO.getSparepartId();
+            queryWrapper.inSql("id", "select in_id from equipment_in_child where sparepart_id = '" + sparepartId + "'");
+        }
         queryWrapper.orderByDesc("in_date");
         queryWrapper.orderByDesc("in_date");
         Map<String, String> sysUserVal2KeyMap = key2ValueService.dictKey2Val("sysUser", false);
         Map<String, String> sysUserVal2KeyMap = key2ValueService.dictKey2Val("sysUser", false);
         Map<String, String> sysDepartVal2KeyMap = key2ValueService.dictKey2Val("sysDepart", false);
         Map<String, String> sysDepartVal2KeyMap = key2ValueService.dictKey2Val("sysDepart", false);
@@ -475,7 +479,7 @@ public class EquipmentInController {
         //导出文件名称
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "入库管理列表");
         mv.addObject(NormalExcelConstants.FILE_NAME, "入库管理列表");
         mv.addObject(NormalExcelConstants.CLASS, EquipmentInExcel.class);
         mv.addObject(NormalExcelConstants.CLASS, EquipmentInExcel.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("入库管理数据", "导出人:"+sysUser.getRealname(), "导出信息"));
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("入库管理数据", "导出人:" + sysUser.getRealname(), "导出信息"));
         mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
         mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
         return mv;
         return mv;
     }
     }

@@ -164,7 +164,10 @@ public class EquipmentOutController {
         if (StringUtils.isNotEmpty(equipmentOutDTO.getEndTime())) {
         if (StringUtils.isNotEmpty(equipmentOutDTO.getEndTime())) {
             queryWrapper.le("out_date", equipmentOutDTO.getEndTime() + " 23:59:59");
             queryWrapper.le("out_date", equipmentOutDTO.getEndTime() + " 23:59:59");
         }
         }
-
+        if (StringUtils.isNotEmpty(equipmentOutDTO.getSparepartId())) {
+            String sparepartId = equipmentOutDTO.getSparepartId();
+            queryWrapper.inSql("id", "select out_id from equipment_out_child where sparepart_id = '" + sparepartId + "'");
+        }
         // 按照库存更新时间倒序
         // 按照库存更新时间倒序
         queryWrapper.orderByDesc("out_date");
         queryWrapper.orderByDesc("out_date");
         Map<String, String> sysUserVal2KeyMap = key2ValueService.dictKey2Val("sysUser", false);
         Map<String, String> sysUserVal2KeyMap = key2ValueService.dictKey2Val("sysUser", false);

@@ -23,4 +23,6 @@ public class EquipmentInDTO extends EquipmentIn {
 
 
     private String sparepartName;
     private String sparepartName;
 
 
+    private String sparepartId;
+
 }
 }

@@ -27,5 +27,7 @@ public class EquipmentOutDTO extends EquipmentOut {
 
 
     private String sparepartName;
     private String sparepartName;
 
 
+    private String sparepartId;
+
 
 
 }
 }

@@ -3,10 +3,7 @@ package com.skua.modules.equipment.service.impl;
 import java.io.FileInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -46,6 +43,12 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
 	public List<TreeData> tree(int tag) {
 	public List<TreeData> tree(int tag) {
 		//获取数据列表
 		//获取数据列表
 		List<EquipmentCategory> list=queryList();
 		List<EquipmentCategory> list=queryList();
+		list.forEach(item -> {
+			if (item.getSort() == null) {
+				item.setSort(10000);
+			}
+		});
+		Collections.sort(list, Comparator.comparing(EquipmentCategory::getSort));
 		//将业务数据转换为构造树所需的数据结构
 		//将业务数据转换为构造树所需的数据结构
 		List<TransTreeModel> transTreeModels = list.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
 		List<TransTreeModel> transTreeModels = list.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
 		List<TreeData> treeList=TreeUtils.buildTreeForParentId(transTreeModels, "root");
 		List<TreeData> treeList=TreeUtils.buildTreeForParentId(transTreeModels, "root");