出库统计分析 物料/设备

@@ -21,37 +21,28 @@ public class BusinessServiceImpl implements IBusinessService {
     @Autowired
     @Autowired
     private IBaseService baseService;
     private IBaseService baseService;
 
 
+    /**
+     * table0 => (key0, value0)
+     */
+    private static final Map<String, String[]> DICT_MAP = new HashMap<String, String[]>() {{
+        put("equipment_info", new String[]{"id", "equipment_name"});
+        put("sys_user", new String[]{"id", "realname"});
+        put("sys_struct_dict", new String[]{"id", "struct_name"});
+        put("equipment_category", new String[]{"id", "des"});
+        put("evaluate_score_desc", new String[]{"id", "score_desc"});
+        put("carbon_qualitative_desc", new String[]{"id", "qualitative_desc"});
+        put("sys_depart", new String[]{"id", "depart_name"});
+        put("equipment_sparepart_type", new String[]{"id", "item_text"});
+    }};
+
     @Override
     @Override
     public Map<String, String> dictMap(String dictCode, Collection<?> inCol) {
     public Map<String, String> dictMap(String dictCode, Collection<?> inCol) {
         String key0, value0, table0;
         String key0, value0, table0;
         QueryWrapper<?> queryWrapper0 = new QueryWrapper<>();
         QueryWrapper<?> queryWrapper0 = new QueryWrapper<>();
-        if ("equipment_info".equals(dictCode)) {
-            key0 = "id";
-            value0 = "equipment_name";
-            table0 = dictCode;
-        } else if ("sys_user".equals(dictCode)) {
-            key0 = "id";
-            value0 = "realname";
-            table0 = dictCode;
-        } else if ("sys_struct_dict".equals(dictCode)) {
-            key0 = "id";
-            value0 = "struct_name";
-            table0 = dictCode;
-        } else if ("equipment_category".equals(dictCode)) {
-            key0 = "id";
-            value0 = "des";
-            table0 = dictCode;
-        } else if ("evaluate_score_desc".equals(dictCode)) {
-            key0 = "id";
-            value0 = "score_desc";
-            table0 = dictCode;
-        } else if ("carbon_qualitative_desc".equals(dictCode)) {
-            key0 = "id";
-            value0 = "qualitative_desc";
-            table0 = dictCode;
-        } else if ("sys_depart".equals(dictCode)) {
-            key0 = "id";
-            value0 = "depart_name";
+        if (DICT_MAP.containsKey(dictCode)) {
+            String[] dictArray = DICT_MAP.get(dictCode);
+            key0 = dictArray[0];
+            value0 = dictArray[1];
             table0 = dictCode;
             table0 = dictCode;
         } else {
         } else {
             // 数据字典查询
             // 数据字典查询
@@ -72,5 +63,4 @@ public class BusinessServiceImpl implements IBusinessService {
         return dictMap;
         return dictMap;
     }
     }
 
 
-
 }
 }

@@ -159,10 +159,16 @@ public class EquipmentOutController {
         EquipmentOut equipmentOut = BeanExtUtils.bean2Bean(equipmentOutDTO, EquipmentOut.class);
         EquipmentOut equipmentOut = BeanExtUtils.bean2Bean(equipmentOutDTO, EquipmentOut.class);
         QueryWrapper<EquipmentOut> queryWrapper = QueryGenerator.initQueryWrapper(equipmentOut, req.getParameterMap());
         QueryWrapper<EquipmentOut> queryWrapper = QueryGenerator.initQueryWrapper(equipmentOut, req.getParameterMap());
         if (StringUtils.isNotEmpty(equipmentOutDTO.getStartTime())) {
         if (StringUtils.isNotEmpty(equipmentOutDTO.getStartTime())) {
-            queryWrapper.ge("out_date", equipmentOutDTO.getStartTime() + " 00:00:00");
+            if (equipmentOutDTO.getStartTime().length() == 10) {
+                equipmentOutDTO.setStartTime(equipmentOutDTO.getStartTime() + " 00:00:00");
+            }
+            queryWrapper.ge("out_date", equipmentOutDTO.getStartTime());
         }
         }
         if (StringUtils.isNotEmpty(equipmentOutDTO.getEndTime())) {
         if (StringUtils.isNotEmpty(equipmentOutDTO.getEndTime())) {
-            queryWrapper.le("out_date", equipmentOutDTO.getEndTime() + " 23:59:59");
+            if (equipmentOutDTO.getEndTime().length() == 10) {
+                equipmentOutDTO.setEndTime(equipmentOutDTO.getEndTime() + " 23:59:59");
+            }
+            queryWrapper.le("out_date", equipmentOutDTO.getEndTime());
         }
         }
         if (StringUtils.isNotEmpty(equipmentOutDTO.getSparepartId())) {
         if (StringUtils.isNotEmpty(equipmentOutDTO.getSparepartId())) {
             String sparepartId = equipmentOutDTO.getSparepartId();
             String sparepartId = equipmentOutDTO.getSparepartId();