Merge branch 'master' of http://101.36.160.140:21044/emergency-report/vsualization-report

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

@@ -98,8 +98,8 @@ public class VisController {
      * 物资储备情况
      */
     @GetMapping("/get-material-situation")
-    public Map<String,List<MaterialReserveSituationVO>> selectWarehouseForMaterialType() {
-        return inboundMaterialInfoService.selectWarehouseForMaterialType();
+    public Map<String,List<MaterialReserveSituationVO>> selectWarehouseForMaterialType(@RequestParam String warehouse) {
+        return inboundMaterialInfoService.selectWarehouseForMaterialType(warehouse);
     }
     /**
      * 出入库记录

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

@@ -18,7 +18,7 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
      List<InboundMaterialInfo> getMaterialSituation();
 
 
-    List<MaterialReserveSituationVO> selectWarehouseForMaterialType();
+    List<MaterialReserveSituationVO> selectWarehouseForMaterialType(@Param("warehouse") String warehouse);
 
      List<InboundMaterialInfo> getInventoryReceiptStatus();
 

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

@@ -21,5 +21,5 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
     HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm();
 
     List<OutAndInboundRecord> getEnterExitRecords(Integer type);
-    Map<String,List<MaterialReserveSituationVO>> selectWarehouseForMaterialType();
+    Map<String,List<MaterialReserveSituationVO>> selectWarehouseForMaterialType(String warehouse);
 }

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

@@ -35,8 +35,8 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
     }
 
     @Override
-    public Map<String, List<MaterialReserveSituationVO>> selectWarehouseForMaterialType() {
-        List<MaterialReserveSituationVO> situationVOS = inboundMaterialInfoMapper.selectWarehouseForMaterialType();
+    public Map<String, List<MaterialReserveSituationVO>> selectWarehouseForMaterialType(String warehouse) {
+        List<MaterialReserveSituationVO> situationVOS = inboundMaterialInfoMapper.selectWarehouseForMaterialType(warehouse);
         Map<String, List<MaterialReserveSituationVO>> collect =new HashMap<>();
         if (situationVOS!=null&&!situationVOS.isEmpty()){
              collect = situationVOS.stream().collect(Collectors.groupingBy(MaterialReserveSituationVO::getMaterialTypeZn));

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

@@ -114,7 +114,10 @@
                  left JOIN SYS_TREE_DICT d on a.material_name=d.ID
                  left JOIN SYS_TREE_DICT e on a.unit=e.ID
         where b.status=5  AND  b.is_available=0 AND  a.is_available=0
-        group  by  b.warehouse,a.material_type,a.material_name
+        <if test="warehouse!=null and warehouse!=''">
+            AND b.warehouse =#{warehouse}
+        </if>
+        group  by  a.material_type,a.material_name,a.specs
     </select>
 
 </mapper>