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/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

@@ -16,6 +16,8 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
 
      List<InboundMaterialInfo> getMaterialSituation();
 
+     List<InboundMaterialInfo> getWzsyqkpm();
+
     /**
      * 出入库记录
      * @return

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.unis.vis.model.InboundMaterialInfo;
 import com.unis.vis.model.OutAndInboundRecord;
 
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -13,6 +14,7 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
 
     List<InboundMaterialInfo> getMaterialSituation();
 
+    HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm();
 
     /**
      * 出入库记录

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

@@ -9,7 +9,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 {
@@ -28,6 +31,26 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
         return inboundMaterialInfoMapper.getMaterialSituation();
     }
 
+    @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;
+    }
     /**
      * 出入库记录
      * @return

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

@@ -23,6 +23,14 @@
         where b."status"=5
         GROUP BY dic.NAME_
     </select>
+    <select id="getWzsyqkpm" resultType="com.unis.vis.model.InboundMaterialInfo">
+        select dic.NAME_ as material_type,SUM(iif.quantity)as quantity,SUM(iif.total_price)as total_price
+        from outbound_material_info iif
+        left JOIN SYS_TREE_DICT dic on iif.material_type=dic.ID
+        left join outbound_info b ON iif."outbound_id"=B."outbound_id"
+        where b."status"=5 and dic.DIFFERENCE_=2
+        GROUP BY dic.NAME_
+    </select>
 
     <!-- 出入库记录 -->
     <select id="getEnterExitRecords" parameterType="integer" resultType="com.unis.vis.model.OutAndInboundRecord">