仅七天玉米价格，添加默认从粮食单价获取

sgj

12 小时以前 9dcc346205e2c96b28f2f561f439a29bc6c2a6dc

 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,33 +36,46 @@
     *
     * @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
     */
    public FoodPrice getDataByBankAndFood(String bankId, String foodVariety) {
        if(StringUtils.isBlank(bankId) || StringUtils.isBlank(foodVariety)  ){
            return null;
        }
        SysUser user = ContextUtil.getLoginUser();

        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;