diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportHead.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportHead.java index fa26a5f9..217f50dd 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportHead.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportHead.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import java.util.Date; +import java.util.Objects; + import com.jero.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; @@ -171,175 +173,98 @@ public class OnlCgreportHead implements Serializable { if (!var2.canEqual(this)) { return false; } else { - label167: { - String var3 = this.getId(); - String var4 = var2.getId(); - if (var3 == null) { - if (var4 == null) { - break label167; - } - } else if (var3.equals(var4)) { - break label167; - } - + if (getOne(var2)) { return false; } - String var5 = this.getCode(); - String var6 = var2.getCode(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { - return false; - } - - label153: { - String var7 = this.getName(); - String var8 = var2.getName(); - if (var7 == null) { - if (var8 == null) { - break label153; - } - } else if (var7.equals(var8)) { - break label153; - } - - return false; - } - - String var9 = this.getCgrSql(); - String var10 = var2.getCgrSql(); - if (var9 == null) { - if (var10 != null) { - return false; - } - } else if (!var9.equals(var10)) { - return false; - } - - label139: { - String var11 = this.getReturnValField(); - String var12 = var2.getReturnValField(); - if (var11 == null) { - if (var12 == null) { - break label139; - } - } else if (var11.equals(var12)) { - break label139; - } - - return false; - } - - String var13 = this.getReturnTxtField(); - String var14 = var2.getReturnTxtField(); - if (var13 == null) { - if (var14 != null) { - return false; - } - } else if (!var13.equals(var14)) { - return false; - } - - label125: { - String var15 = this.getReturnType(); - String var16 = var2.getReturnType(); - if (var15 == null) { - if (var16 == null) { - break label125; - } - } else if (var15.equals(var16)) { - break label125; - } - - return false; - } - - label118: { - String var17 = this.getDbSource(); - String var18 = var2.getDbSource(); - if (var17 == null) { - if (var18 == null) { - break label118; - } - } else if (var17.equals(var18)) { - break label118; - } - - return false; - } - - String var19 = this.getContent(); - String var20 = var2.getContent(); - if (var19 == null) { - if (var20 != null) { - return false; - } - } else if (!var19.equals(var20)) { - return false; - } - - label104: { - Date var21 = this.getUpdateTime(); - Date var22 = var2.getUpdateTime(); - if (var21 == null) { - if (var22 == null) { - break label104; - } - } else if (var21.equals(var22)) { - break label104; - } - - return false; - } - - label97: { - String var23 = this.getUpdateBy(); - String var24 = var2.getUpdateBy(); - if (var23 == null) { - if (var24 == null) { - break label97; - } - } else if (var23.equals(var24)) { - break label97; - } - - return false; - } - - Date var25 = this.getCreateTime(); - Date var26 = var2.getCreateTime(); - if (var25 == null) { - if (var26 != null) { - return false; - } - } else if (!var25.equals(var26)) { - return false; - } - - String var27 = this.getCreateBy(); - String var28 = var2.getCreateBy(); - if (var27 == null) { - if (var28 != null) { - return false; - } - } else if (!var27.equals(var28)) { - return false; - } - - return true; + return !getTwo(var2); } } } + private boolean getTwo(OnlCgreportHead var2) { + if (getReturnString(this.getDbSource(), var2.getDbSource())) { + return true; + } + + if (getReturnString(this.getContent(), var2.getContent())) { + return true; + } + + if (getReturnDate(this.getUpdateTime(), var2.getUpdateTime())) { + return true; + } + + if (getReturnString(this.getUpdateBy(), var2.getUpdateBy())) { + return true; + } + + if (getReturnDate(this.getCreateTime(), var2.getCreateTime())) { + return true; + } + + return getReturnString(this.getCreateBy(), var2.getCreateBy()); + } + + private boolean getOne(OnlCgreportHead var2) { + if (getReturnString(this.getId(), var2.getId())) { + return true; + } + + if (getReturnString(this.getCode(), var2.getCode())) { + return true; + } + + if (getReturnString(this.getName(), var2.getName())) { + return true; + } + + if (getReturnString(this.getCgrSql(), var2.getCgrSql())) { + return true; + } + + if (getReturnString(this.getReturnValField(), var2.getReturnValField())) { + return true; + } + + if (getReturnString(this.getReturnTxtField(), var2.getReturnTxtField())) { + return true; + } + + return getReturnString(this.getReturnType(), var2.getReturnType()); + } + + private boolean getReturnDate(Date updateTime, Date updateTime2) { + Date var21 = updateTime; + Date var22 = updateTime2; + if (var21 == null) { + if (var22 != null) { + return true; + } + } else if (!Objects.equals(var21, var22)) { + return true; + } + return false; + } + + private boolean getReturnString(String id, String id2) { + String var3 = id; + String var4 = id2; + if (var3 == null) { + if (var4 != null) { + return true; + } + } else if (!Objects.equals(var3, var4)) { + return true; + } + return false; + } + protected boolean canEqual(Object other) { return other instanceof OnlCgreportHead; } public int hashCode() { - boolean var1 = true; byte var2 = 1; String var3 = this.getId(); int var16 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());