Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/unis/vis/mapper/InboundMaterialInfoMapper.java
#	src/main/java/com/unis/vis/service/InboundMaterialInfoService.java
#	src/main/java/com/unis/vis/service/impl/InboundMaterialInfoServiceImpl.java
#	src/main/resources/mapper/vis/InboundMaterialInfoMapper.xml

src/main/java/com/unis/vis/controller/InboundMaterialInfoController.java

@@ -0,0 +1,34 @@
+package com.unis.vis.controller;
+
+import com.unis.vis.model.InboundMaterialInfo;
+import com.unis.vis.service.InboundMaterialInfoService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * ClassName: InboundMaterialInfoController
+ * Package: com.unis.vis.controller
+ * Description:
+ *
+ * @Author zlq
+ * @Create 2024/3/5 11:06
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/Material")
+public class InboundMaterialInfoController {
+    @Resource
+    private InboundMaterialInfoService inboundMaterialInfoService;
+
+    /*应用物资大类*/
+    @GetMapping("/getWzsyqkpm")
+    public HashMap<String, List<InboundMaterialInfo>> getEmergencySuppliesCategory() {
+        HashMap<String, List<InboundMaterialInfo>> wzsyqkpmMap = inboundMaterialInfoService.getWzsyqkpm();
+        return wzsyqkpmMap;
+    }
+}

src/main/java/com/unis/vis/mapper/InboundMaterialInfoMapper.java

@@ -13,10 +13,4 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
      List<InboundMaterialInfo> getEmergencySuppliesCategory();
 
      List<InboundMaterialInfo> getMaterialSituation();
-
-     /**
-      * 入库
-      * @return
-      */
-     List<InboundMaterialInfo> getInventoryReceiptStatus();
 }

src/main/java/com/unis/vis/service/InboundMaterialInfoService.java

@@ -12,10 +12,5 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
 
     List<InboundMaterialInfo> getMaterialSituation();
 
-    /**
-     * 物资入库情况
-     * @return
-     */
-    List<InboundMaterialInfo> getInventoryReceiptStatus();
 
 }

src/main/java/com/unis/vis/service/impl/InboundMaterialInfoServiceImpl.java

@@ -8,7 +8,10 @@ import com.unis.vis.service.InboundMaterialInfoService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialInfoMapper, InboundMaterialInfo> implements InboundMaterialInfoService {
@@ -31,6 +34,26 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
     public List<InboundMaterialInfo> getInventoryReceiptStatus() {
         return inboundMaterialInfoMapper.getInventoryReceiptStatus();
     }
+    @Override
+    public HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm() {
+        HashMap<String, List<InboundMaterialInfo>> wzsyqkpmMap = new HashMap<>();
+        List<InboundMaterialInfo> wzsyqkpm = inboundMaterialInfoMapper.getWzsyqkpm();
+        //按数量排序
+        List<InboundMaterialInfo> quantityList = wzsyqkpm.stream()
+                .sorted(Comparator.comparing(InboundMaterialInfo::getQuantity).reversed())
+                .collect(Collectors.toList());
+
+        wzsyqkpmMap.put("quantitySort",quantityList);
+        //按价值排序
+        List<InboundMaterialInfo> collect = wzsyqkpm.stream()
+                .sorted(Comparator.comparing(InboundMaterialInfo::getTotalPrice).reversed())
+                .collect(Collectors.toList());
+
+        wzsyqkpmMap.put("TotalPriceSort",collect);
+
+
+        return wzsyqkpmMap;
+    }
 
 
 }

src/main/resources/mapper/vis/InboundMaterialInfoMapper.xml

@@ -23,19 +23,5 @@
         where b."status"=5
         GROUP BY dic.NAME_
     </select>
-    <!-- 物资入库情况 -->
-    <select id="getInventoryReceiptStatus" resultType="com.unis.vis.model.InboundMaterialInfo">
-        SELECT std.NAME_            as material_type,
-               SUM(imi.quantity)    as quantity,
-               SUM(imi.total_price) as total_price
-        FROM "inbound_material_info" imi
-                 LEFT JOIN "inbound_info" ii ON imi."inbound_id" = ii."inbound_id"
-                 LEFT JOIN "SYS_TREE_DICT" std ON std."id" = ii."material_type"
-        WHERE ii."status" = 5
-          AND ii."is_available" = 0
-          AND ii."material_type" in (SELECT id FROM SYS_TREE_DICT std WHERE std.DIFFERENCE_ = 2)
-        GROUP BY std.NAME_
-    </select>
-
 
 </mapper>