zhongrj
2023-08-22 b7d5b529707e5bd98ec334c1be4b13c21e69f6e6
水库填报修改
23 files modified
78 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java 29 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBuildInfoServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResInformationProjectServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResMgrSysBServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResStagCharServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
@@ -281,12 +281,21 @@
    /**
     * 前汛期开始时间
     */
    @ApiModelProperty(value = "前汛期开始时间 ")
    @TableField("\"before_flood_start\"")
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd")
    private Date beforeFloodStart;
    /**
     * 前汛期结束时间
     */
    @ApiModelProperty(value = "前汛期结束时间 ")
    @TableField("\"before_flood_end\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd")
    private Date beforeFloodEnd;
    /**
@@ -294,8 +303,8 @@
     */
    @ApiModelProperty(value = "中汛期开始时间 ")
    @TableField("\"mid_flood_start\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd")
    private Date midFloodStart;
    /**
@@ -303,8 +312,8 @@
     */
    @ApiModelProperty(value = "中汛期结束时间 ")
    @TableField("\"mid_flood_end\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd")
    private Date midFloodEnd;
    /**
@@ -312,8 +321,8 @@
     */
    @ApiModelProperty(value = "后汛期开始时间 ")
    @TableField("\"after_flood_start\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd")
    private Date afterFloodStart;
    /**
@@ -321,8 +330,8 @@
     */
    @ApiModelProperty(value = "后汛期结束时间 ")
    @TableField("\"after_flood_end\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd")
    private Date afterFloodEnd;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBuildInfoServiceImpl.java
@@ -93,6 +93,7 @@
    private int addOrUpdateByGuid(TbAttResBuildInfo oldAbAttResBase,TbAttResBuildInfo tbAttResBuildInfo){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResBuildInfo.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResBuildInfo);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResEngBene oldAbAttResBase,TbAttResEngBene tbAttResEngBene){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResEngBene.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResEngBene);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResInformationProjectServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResInformationProject oldAbAttResBase,TbAttResInformationProject tbAttResInformationProject){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResInformationProject.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResInformationProject);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResMgrSysBServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResMgrSysB oldAbAttResBase,TbAttResMgrSysB tbAttResMgrSysB){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResMgrSysB.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResMgrSysB);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResPowerStation oldAbAttResBase,TbAttResPowerStation tbAttResPowerStation){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResPowerStation.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResPowerStation);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResProjectUtilize oldAbAttResBase,TbAttResProjectUtilize tbAttResProjectUtilize){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResProjectUtilize.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResProjectUtilize);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResRsbNorspi oldAbAttResBase,TbAttResRsbNorspi tbAttResRsbNorspi){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResRsbNorspi.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResRsbNorspi);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResRsbSpillway oldAbAttResBase,TbAttResRsbSpillway tbAttResRsbSpillway){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResRsbSpillway.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResRsbSpillway);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResRsbVerspi oldAbAttResBase,TbAttResRsbVerspi tbAttResRsbVerspi){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResRsbVerspi.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResRsbVerspi);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResSafetyMonitor oldAbAttResBase,TbAttResSafetyMonitor tbAttResSafetyMonitor){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResSafetyMonitor.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResSafetyMonitor);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResStagCharServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResStagChar oldAbAttResBase,TbAttResStagChar tbAttResStagChar){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResStagChar.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResStagChar);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResWaterBlock oldAbAttResBase,TbAttResWaterBlock tbAttResWaterBlock){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResWaterBlock.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResWaterBlock);
        }else {
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
@@ -92,6 +92,7 @@
    private int addOrUpdateByGuid(TbAttResWaterDelivery oldAbAttResBase,TbAttResWaterDelivery tbAttResWaterDelivery){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResWaterDelivery.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResWaterDelivery);
        }else {