Merge remote-tracking branch 'origin/master'

jiazx0107

2026-02-08 e7ab049344b954b044fc474992c378fcbbeeba33

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

@@ -2,6 +2,7 @@

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.QuantityParam;
import com.fzzy.igds.domain.Quantity;
import com.fzzy.igds.service.QuantityService;
@@ -16,11 +17,10 @@
import java.util.Date;

/**
 *
 * 数量检测数据报表
 *
 * @author sgj
 * @date 2025/12/18

 */
@Component
public class QuantityDataPR {
@@ -40,17 +40,21 @@
    public QuantityParam getQuery(String type) {
        QuantityParam result = new QuantityParam();
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
        result.setTitle("数量检测数据");
        result.setTitle("数量检测汇总表");
        if (null != subDept) {
            result.setTitle(subDept.getDeptName() + "数量检测数据");
            result.setDepotId(String.valueOf(subDept.getDeptId()));
            result.setTitle(subDept.getDeptName() + "数量检测汇总表");
            if (Constant.DEPT_TYPE_20.equals(subDept.getType())) {
                result.setDeptId(String.valueOf(subDept.getDeptId()));
            }
        }
        result.setEnd(new Date());
        Date start = DateUtil.getNewByDay(new Date(), -90);
        Date start = DateUtil.getNewByDay(new Date(), -30);
        result.setStart(start);
        result.setTimeDesc(DateFormatUtils.format(start, "yyyy-MM-dd") + "   截至："
                + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
        result.setTimeDesc(
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   至   "
                        + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
        result.setCreateUser(ContextUtil.getLoginUserName());
        result.setCreateTime(new Date());
        return result;
    }