大屏2

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

@@ -10,6 +10,7 @@ import com.unis.vis.service.SysDeptService;
 import com.unis.vis.service.SysTreeDictService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -58,8 +59,10 @@ public class VisController {
 
     /*物资调用情况*/
     @GetMapping("/getMaterialCallSituation")
-    public List<OutboundMaterialInfo> getMaterialCallSituation() {
-        List<OutboundMaterialInfo> list = outboundMaterialInfoService.getMaterialCallSituation();
+    public List<OutboundMaterialInfo> getMaterialCallSituation(@RequestParam("type") String type,
+                                                               @RequestParam("action")String action) {
+
+        List<OutboundMaterialInfo> list = outboundMaterialInfoService.getMaterialCallSituation(type,action);
         return list;
     }
     /*地图点位*/

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

@@ -10,7 +10,7 @@ import java.util.List;
 @Repository
 public interface OutboundMaterialInfoMapper extends BaseMapper<OutboundMaterialInfo> {
 
-    List<OutboundMaterialInfo> getMaterialCallSituation();
+    List<OutboundMaterialInfo> getMaterialCallSituation(String type,String action);
 
 
 }

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

@@ -9,6 +9,6 @@ import java.util.List;
 public interface OutboundMaterialInfoService extends IService<OutboundMaterialInfo> {
 
 
-    List<OutboundMaterialInfo>  getMaterialCallSituation();
+    List<OutboundMaterialInfo>  getMaterialCallSituation(String type,String action);
 
 }

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

@@ -17,9 +17,9 @@ public class OutboundMaterialInfoServiceImpl extends ServiceImpl<OutboundMateria
     private OutboundMaterialInfoMapper outboundMaterialInfoMapper;
 
     @Override
-    public List<OutboundMaterialInfo> getMaterialCallSituation() {
+    public List<OutboundMaterialInfo> getMaterialCallSituation(String type,String action) {
 
-        return outboundMaterialInfoMapper.getMaterialCallSituation();
+        return outboundMaterialInfoMapper.getMaterialCallSituation(type,action);
     }
 
 

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

@@ -22,6 +22,7 @@
                  left join inbound_info b ON iif."inbound_id"=B."inbound_id"
         where b."status"=5
         GROUP BY dic.NAME_
+
     </select>
 
 </mapper>