Merge branch 'master' of http://111.30.93.211:10101/r/supipe

李旭东

2023-12-08 7efc6ed86025b610cab109a2e9f83362740d8ed4

 hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/controller/ExecProListener.java

@@ -118,21 +118,7 @@
            map1.put("mod",ProListenType.PIPEPLANACTUAL);
            map1.put("pipePlanActual",yearCountList);
            mapList.add(map1);
            Map<String,Object> map2 = new HashMap<>();
            List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
            map2.put("mod",ProListenType.PIPEMONTHPLANACTUAL);
            map2.put("pipeMonthPlanActual",pipeMonthPlanActuals);
            mapList.add(map2);
            Map<String,Object> map3 = new HashMap<>();
            List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
            map3.put("mod",ProListenType.MATERIALWEEKANDMONTHS);
            map3.put("materialWeekAndMonths",materialWeekAndMonths);
            mapList.add(map3);
            return mapList;
        }else if(dataType.equals(ProListenType.MATERIALWEEKANDMONTHS)){
            //原料消耗 周月
            List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
            map.put("materialWeekAndMonths",materialWeekAndMonths);
        }else if (dataType.equals(ProListenType.PIPEPLANACTUAL)){
            //年度生产计划和实际完成
            List<PipeYearCount> yearCountList = bigScreenMapper.queryAllProject(companyId);
@@ -141,10 +127,6 @@
                yc.setPipePlanActual(pipePlanActual);
            });
            map.put("pipePlanActual",yearCountList);
        }else if (dataType.equals(ProListenType.PIPEMONTHPLANACTUAL)){
            //月度生产计划和实际完成
            List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
            map.put("pipeMonthPlanActual",pipeMonthPlanActuals);
        }else if (dataType.equals(ProListenType.WATERCULINFO)){
            //水养池
            List<WaterCulInfo> culInfoList = bigScreenMapper.WaterCulInfo(companyId);
@@ -167,6 +149,14 @@
            mapList.add(map1);
            mapList.add(map2);
            return mapList;
        }else if (dataType.equals(ProListenType.STEELUSE)){
            //钢筋消耗
            List<HashMap<String,Object>> steelUseList = bigScreenMapper.querySteelMake();
            map.put("steelUse",steelUseList);
        }else if (dataType.equals(ProListenType.RESTINFO)){
            //缓存区
            List<HashMap<String,Object>> restInfo = bigScreenMapper.queryRestInfo();
            map.put("restInfo",restInfo);
        }
        mapList.add(map);
        return mapList;