fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
@@ -2,10 +2,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.data.IgdsBaseParam; import com.fzzy.igds.domain.FoodPrice; import com.fzzy.igds.mapper.FoodPriceMapper; import com.fzzy.igds.timer.JobWarnService; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; @@ -34,22 +36,32 @@ * * @return */ public List<FoodPrice> listData() { public List<FoodPrice> listData(IgdsBaseParam param) { if(null == param){ param = new IgdsBaseParam(); } SysUser user = ContextUtil.getLoginUser(); QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("company_id", user.getCompanyId()); //银行用户查询当前银行的单价配置 if (Constant.USER_TYPE_30.equals(user.getUserType())) { queryWrapper.likeRight("bank_id", user.getUserData()); } if(StringUtils.isNotBlank(param.getKey())){ queryWrapper.eq("food_variety", param.getKey()); } if (null != param.getStart()) { queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart())); } if (null != param.getEnd()) { queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd())); } return foodPriceMapper.selectList(queryWrapper); } /** * 根据银行及品种，查询单价信息 * 根据银行及品种，查询单价信息，获取启用的，最新的一条 * @param bankId * @param foodVariety * @return @@ -62,7 +74,8 @@ QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("bank_id", bankId); queryWrapper.eq("food_variety", foodVariety); queryWrapper.eq("vld", Constant.YN_Y); queryWrapper.orderByDesc("create_time","id"); List<FoodPrice> foodPrices = foodPriceMapper.selectList(queryWrapper); if(null == foodPrices){ return null; fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java
@@ -32,7 +32,7 @@ */ @DataProvider public List<FoodPrice> getList() { return foodPriceService.listData(); return foodPriceService.listData(null); } /** fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
@@ -61,6 +61,9 @@ @Resource private GatewaySerService gatewaySerService; @Resource private FoodPriceService foodPriceService; /** * 根据库区编码获取库区网关信息 * @@ -306,6 +309,27 @@ } //近七天玉米出库价格统计 //1.默认从粮食单价中获取 IgdsBaseParam paramOfFoodPrice = new IgdsBaseParam(); //粮食品种玉米 paramOfFoodPrice.setKey("1120000"); paramOfFoodPrice.setStart(DateUtil.getNewByDay(new Date(), -6)); paramOfFoodPrice.setEnd(new Date()); List<FoodPrice> foodPrices = foodPriceService.listData(paramOfFoodPrice); if (null != foodPrices && !foodPrices.isEmpty()) { for (FoodPrice record : foodPrices) { key = DateFormatUtils.format(record.getCreateTime(), "MM-dd"); if (null != mapWeekMaizeNum.get(key)) { Double nowPrice = mapWeekMaizeNum.get(key); Double newPrice = record.getPrice(); if (nowPrice > newPrice || nowPrice == 0) { nowPrice = newPrice; } mapWeekMaizeNum.put(key, nowPrice); } } } //2.查询出入库的单价，有出库的话，用出库单价替换粮食单价 InoutParam inoutParamOfMaize = new InoutParam(); inoutParamOfMaize.setDeptId(user.getDeptId() + ""); //粮食品种玉米 @@ -324,7 +348,6 @@ nowPrice = newPrice; } mapWeekMaizeNum.put(key, nowPrice); } } } fzzy-igdss-web/src/main/resources/templates/main.html
@@ -129,16 +129,24 @@ <!-- 统计图表 --> <div class="layui-row layui-col-space15"> <div class="layui-col-md4 layui-col-sm6"> <div class="layui-card" style="overflow: hidden;"> <div class="layui-card-header">日出入库统计</div> <div class="layui-card-body"> <div id="consoleChartsDay" style="height: 300px;"></div> </div> </div> </div> <div class="layui-col-md4 layui-col-sm6"> <!-- <div class="layui-col-md4 layui-col-sm6">--> <!-- <div class="layui-card" style="overflow: hidden;">--> <!-- <div class="layui-card-header">日出入库统计</div>--> <!-- <div class="layui-card-body">--> <!-- <div id="consoleChartsDay" style="height: 300px;"></div>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!-- --> <!-- <div class="layui-col-md4 layui-col-sm6">--> <!-- <div class="layui-card" style="overflow: hidden;">--> <!-- <div class="layui-card-header">近7天出入库统计</div>--> <!-- <div class="layui-card-body">--> <!-- <div id="consoleChartsWeek" style="height: 300px;"></div>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <div class="layui-col-md8"> <div class="layui-card" style="overflow: hidden;"> <div class="layui-card-header">近7天出入库统计</div> <div class="layui-card-body"> @@ -185,26 +193,26 @@ var layer = layui.layer; /** 渲染日统计图表 */ var myCharts1 = echarts.init(document.getElementById('consoleChartsDay')); var options1 = { title: { text: '入库车次/出库车次', x: 'center', y: '32%', textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'}, subtextStyle: {fontSize: 56, color: '#10B4E8'}, itemGap: 20 }, color: ['#10B4E8', '#FFA800'], tooltip: {trigger: 'item'}, legend: { orient: 'vertical', right: '0px', top: '0px', data: ['入库车次', '出库车次'], textStyle: {color: '#595959'} }, series: [{name: '数量', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}] }; myCharts1.setOption(options1); // 赋值 myCharts1.setOption({ title: {subtext: mainData.inNumDay + "/" + mainData.outNumDay}, series: [{data: [{name: '入库车次', value: mainData.inNumDay}, {name: '出库车次', value: mainData.outNumDay}]}] }); // var myCharts1 = echarts.init(document.getElementById('consoleChartsDay')); // var options1 = { // title: { // text: '入库车次/出库车次', x: 'center', y: '32%', // textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'}, // subtextStyle: {fontSize: 56, color: '#10B4E8'}, itemGap: 20 // }, // color: ['#10B4E8', '#FFA800'], // tooltip: {trigger: 'item'}, // legend: { // orient: 'vertical', right: '0px', top: '0px', // data: ['入库车次', '出库车次'], textStyle: {color: '#595959'} // }, // series: [{name: '数量', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}] // }; // myCharts1.setOption(options1); // // 赋值 // myCharts1.setOption({ // title: {subtext: mainData.inNumDay + "/" + mainData.outNumDay}, series: [{data: [{name: '入库车次', value: mainData.inNumDay}, {name: '出库车次', value: mainData.outNumDay}]}] // }); /** 渲染周统计图表 */ var myCharts2 = echarts.init(document.getElementById('consoleChartsWeek')); @@ -423,7 +431,7 @@ /** 窗口大小改变事件 */ window.onresize = function () { myCharts1.resize(); // myCharts1.resize(); myCharts2.resize(); myCharts3.resize(); myCharts4.resize();
