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

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

@@ -1,6 +1,11 @@
 package com.unis.vis.controller;
 
 import com.unis.vis.model.*;
+import com.unis.vis.controller.vo.MaterialReserveSituationVO;
+import com.unis.vis.model.InboundMaterialInfo;
+import com.unis.vis.model.OutboundMaterialInfo;
+import com.unis.vis.model.SysDept;
+import com.unis.vis.model.SysTreeDict;
 import com.unis.vis.service.InboundMaterialInfoService;
 import com.unis.vis.service.OutboundMaterialInfoService;
 import com.unis.vis.service.SysDeptService;
@@ -12,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author qingsong.han
@@ -88,8 +94,13 @@ public class VisController {
         List<SysDept> list = sysDeptService.getMapPoint();
         return list;
     }
-
-
+    /**
+     * 物资储备情况
+     */
+    @GetMapping("/get-material-situation")
+    public Map<String,List<MaterialReserveSituationVO>> selectWarehouseForMaterialType() {
+        return inboundMaterialInfoService.selectWarehouseForMaterialType();
+    }
     /**
      * 出入库记录
      * type: 1入库 2出库

src/main/java/com/unis/vis/controller/vo/MaterialReserveSituationVO.java

@@ -0,0 +1,31 @@
+package com.unis.vis.controller.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MaterialReserveSituationVO {
+
+    /**
+     * 物资类别
+     */
+    private String materialTypeZn;
+    /**
+     * 物资名称
+     */
+    private String materialNameZn;
+    /**
+     * 规格
+     */
+    private String specs;
+    /**
+     * 数量+单位
+     */
+    private String quantityAll;
+    /**
+     * 总价
+     */
+    private String totalPriceAll;
+}

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

@@ -1,6 +1,7 @@
 package com.unis.vis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.unis.vis.controller.vo.MaterialReserveSituationVO;
 import com.unis.vis.model.InboundMaterialInfo;
 import com.unis.vis.model.OutAndInboundRecord;
 import org.apache.ibatis.annotations.Param;
@@ -16,6 +17,9 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
 
      List<InboundMaterialInfo> getMaterialSituation();
 
+
+    List<MaterialReserveSituationVO> selectWarehouseForMaterialType();
+
      List<InboundMaterialInfo> getInventoryReceiptStatus();
 
      List<InboundMaterialInfo> getWzsyqkpm();

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

@@ -1,11 +1,13 @@
 package com.unis.vis.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.unis.vis.controller.vo.MaterialReserveSituationVO;
 import com.unis.vis.model.InboundMaterialInfo;
 import com.unis.vis.model.OutAndInboundRecord;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 public interface InboundMaterialInfoService extends IService<InboundMaterialInfo> {
@@ -19,5 +21,5 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
     HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm();
 
     List<OutAndInboundRecord> getEnterExitRecords(Integer type);
-
+    Map<String,List<MaterialReserveSituationVO>> selectWarehouseForMaterialType();
 }

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

@@ -2,6 +2,7 @@ package com.unis.vis.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.unis.vis.controller.vo.MaterialReserveSituationVO;
 import com.unis.vis.mapper.InboundMaterialInfoMapper;
 import com.unis.vis.model.InboundMaterialInfo;
 import com.unis.vis.model.OutAndInboundRecord;
@@ -12,6 +13,8 @@ import javax.annotation.Resource;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 @Service
@@ -32,6 +35,15 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
     }
 
     @Override
+    public Map<String, List<MaterialReserveSituationVO>> selectWarehouseForMaterialType() {
+        List<MaterialReserveSituationVO> situationVOS = inboundMaterialInfoMapper.selectWarehouseForMaterialType();
+        Map<String, List<MaterialReserveSituationVO>> collect =new HashMap<>();
+        if (situationVOS!=null&&!situationVOS.isEmpty()){
+             collect = situationVOS.stream().collect(Collectors.groupingBy(MaterialReserveSituationVO::getMaterialTypeZn));
+        }
+        return collect;
+    }
+    @Override
     public List<InboundMaterialInfo> getInventoryReceiptStatus() {
         return inboundMaterialInfoMapper.getInventoryReceiptStatus();
     }

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

@@ -39,10 +39,9 @@
                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"
+                 INNER JOIN "SYS_TREE_DICT" std ON std."id" = ii."material_type" AND std.DIFFERENCE_ = 2
         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>
     <!-- 出入库记录 -->
@@ -98,4 +97,17 @@
         ORDER BY record.bound_time desc
     </select>
 
+
+    <select id="selectWarehouseForMaterialType" resultType="com.unis.vis.controller.vo.MaterialReserveSituationVO">
+        SELECT c.NAME_ as materialTypeZn,d.NAME_ as materialNameZn,a.specs as specs
+             ,concat(TO_CHAR(sum(to_number(a.quantity))),e.NAME_)  as quantityAll ,sum(TO_NUMBER(a.total_price)) as totalPriceAll
+        from inbound_material_info a
+                 left join inbound_info b ON a.inbound_id=b.inbound_id
+                 left JOIN SYS_TREE_DICT c on a.material_type=c.ID
+                 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
+    </select>
+
 </mapper>

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

@@ -52,17 +52,16 @@
         GROUP BY dic.NAME_
 
     </select>
-    <!-- 物资出库 -->
+    <!-- 物资出库情况 -->
     <select id="getInventoryDispatchStatus" resultType="com.unis.vis.model.OutboundMaterialInfo">
         SELECT std.NAME_            as material_type,
                SUM(imi.quantity)    as quantity,
                SUM(imi.total_price) as total_price
         FROM "outbound_material_info" imi
                  LEFT JOIN "outbound_info" ii ON imi."outbound_id" = ii."outbound_id"
-                 LEFT JOIN "SYS_TREE_DICT" std ON std."id" = ii."material_type"
+                 INNER JOIN "SYS_TREE_DICT" std ON std."id" = ii."material_type" AND std.DIFFERENCE_ = 2
         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>