蓄水方式查询条件调整

zhongrj

2023-10-19 5e0261b4ea6c6079683a17d6c3c71fbdeef17e04

蓄水方式查询条件调整

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/excel/SkxsQkTjExcel.java

@@ -9,6 +9,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@ColumnWidth(25)
@@ -185,4 +186,11 @@
    @ExcelProperty("当前有效比去年同期（%）")
    private String nowValidLastPro;

    /**
     * 依据时间
     */
    @ColumnWidth(15)
    @ExcelProperty("依据时间")
    private String statisticTime;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/excel/XsfsQktjExcel.java

@@ -171,4 +171,11 @@
    @ExcelProperty("小型水库有效蓄水")
    private Double xxskYxxs;

    /**
     * 依据时间
     */
    @ColumnWidth(15)
    @ExcelProperty("依据时间")
    private String statisticTime;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java

@@ -14,6 +14,8 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.stereotype.Service;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -99,6 +101,11 @@
                // 查询库中是否包含当前日期，当前行政区的数据，如果有，则更新，没有则新增
                SkxsQkTj qkTj = baseMapper.selectSkxsQkTj(skxsQkTjExcel);
                // 设置更新人员，更新时间，来源信息
                try {
                    skxsQkTj.setStatisticTime(new SimpleDateFormat("yyyy-MM-dd").parse(skxsQkTjExcel.getStatisticTime()));
                } catch (ParseException e) {
                    e.printStackTrace();
                }
                skxsQkTj.setUpdateTime(new Date());
                skxsQkTj.setUpdateUser(AuthUtil.getUserId());
                skxsQkTj.setSysResource("sb");

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/XsfsQktjServiceImpl.java

@@ -13,6 +13,8 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.stereotype.Service;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -91,11 +93,13 @@
            data.forEach(xsfsQktjExcel -> {
                XsfsQktj xsfsQktj = Objects.requireNonNull(BeanUtil.copy(xsfsQktjExcel, XsfsQktj.class));
                // 查询库中是否包含当前日期，当前行政区的数据，如果有，则更新，没有则新增
                QueryWrapper<XsfsQktj> wrapper = new QueryWrapper<>();
                wrapper.eq("\"statistic_time\"",xsfsQktj.getStatisticTime())
                    .eq("\"ad_code\"",xsfsQktj.getAdCode());
                XsfsQktj qkTj = baseMapper.selectXsfsQktj(xsfsQktjExcel);
                // 设置更新人员，更新时间，来源信息
                try {
                    xsfsQktj.setStatisticTime(new SimpleDateFormat("yyyy-MM-dd").parse(xsfsQktjExcel.getStatisticTime()));
                } catch (ParseException e) {
                    e.printStackTrace();
                }
                xsfsQktj.setUpdateTime(new Date());
                xsfsQktj.setUpdateUser(AuthUtil.getUserId());
                xsfsQktj.setSysResource("sb");