报表问题修改

sgj

2026-02-13 1cd2e610fdbd581f609e002e738b0e5cea97ad40

 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java

@@ -2,11 +2,13 @@

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.FoodVariety;
import com.fzzy.igds.data.GrainDataReport;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.domain.Grain;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotConfService;
import com.fzzy.igds.service.GrainService;
import com.fzzy.igds.service.SysDeptService;
@@ -31,6 +33,8 @@
    @Resource
    private GrainService grainService;
    @Resource
    private CoreDeptService deptService;
    @Resource
    private SysDeptService sysDeptService;
    @Resource
    private DepotConfService depotConfService;
@@ -47,7 +51,10 @@
        result.put("title", "粮情汇总表");
        if (null != subDept) {
            result.put("title", subDept.getDeptName() + "粮情汇总表");
            result.put("deptId", subDept.getDeptId());

            if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
                result.put("deptId", subDept.getDeptId());
            }
        }

        result.put("timeDesc", "检测时间");
@@ -59,11 +66,11 @@
        result.put("start", start);

        result.put("timeDesc",
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   截至："
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   至   "
                        + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));

        result.put("createUser", ContextUtil.getLoginUserName());
        result.put("createTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        result.put("createTime", new Date());

        return result;
    }
@@ -91,7 +98,7 @@

        // 调整数据
        int maxZ = 3;
        int hour = 0;
        //int hour = 0;
        List<GrainDataReport> dataList = new ArrayList<>();
        GrainDataReport report;
        DepotConf depotConf;