diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportParam.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportParam.java index 4226b7d9..d4dfcd75 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportParam.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/entity/OnlCgreportParam.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 org.springframework.format.annotation.DateTimeFormat; @TableName("onl_cgreport_param") @@ -138,133 +140,95 @@ public class OnlCgreportParam implements Serializable { if (!var2.canEqual(this)) { return false; } else { - Integer var3 = this.getOrderNum(); - Integer var4 = var2.getOrderNum(); - if (var3 == null) { - if (var4 != null) { - return false; - } - } else if (!var3.equals(var4)) { - return false; - } - - String var5 = this.getId(); - String var6 = var2.getId(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { - return false; - } - - String var7 = this.getCgrheadId(); - String var8 = var2.getCgrheadId(); - if (var7 == null) { - if (var8 != null) { - return false; - } - } else if (!var7.equals(var8)) { - return false; - } - - label110: { - String var9 = this.getParamName(); - String var10 = var2.getParamName(); - if (var9 == null) { - if (var10 == null) { - break label110; - } - } else if (var9.equals(var10)) { - break label110; - } - - return false; - } - - label103: { - String var11 = this.getParamTxt(); - String var12 = var2.getParamTxt(); - if (var11 == null) { - if (var12 == null) { - break label103; - } - } else if (var11.equals(var12)) { - break label103; - } - - return false; - } - - String var13 = this.getParamValue(); - String var14 = var2.getParamValue(); - if (var13 == null) { - if (var14 != null) { - return false; - } - } else if (!var13.equals(var14)) { - return false; - } - - label89: { - String var15 = this.getCreateBy(); - String var16 = var2.getCreateBy(); - if (var15 == null) { - if (var16 == null) { - break label89; - } - } else if (var15.equals(var16)) { - break label89; - } - - return false; - } - - label82: { - Date var17 = this.getCreateTime(); - Date var18 = var2.getCreateTime(); - if (var17 == null) { - if (var18 == null) { - break label82; - } - } else if (var17.equals(var18)) { - break label82; - } - - return false; - } - - String var19 = this.getUpdateBy(); - String var20 = var2.getUpdateBy(); - if (var19 == null) { - if (var20 != null) { - return false; - } - } else if (!var19.equals(var20)) { - return false; - } - - Date var21 = this.getUpdateTime(); - Date var22 = var2.getUpdateTime(); - if (var21 == null) { - if (var22 != null) { - return false; - } - } else if (!var21.equals(var22)) { - return false; - } - - return true; + return !getReturn(var2); } } } + private boolean getReturn(OnlCgreportParam var2) { + if (getReturnInteger(var2)) { + return true; + } + + if (getReturnString(this.getId(), var2.getId())) { + return true; + } + + if (getReturnString(this.getCgrheadId(), var2.getCgrheadId())) { + return true; + } + + if (getReturnString(this.getParamName(), var2.getParamName())) { + return true; + } + + if (getReturnString(this.getParamTxt(), var2.getParamTxt())) { + return true; + } + + if (getReturnString(this.getParamValue(), var2.getParamValue())) { + return true; + } + + if (getReturnString(this.getCreateBy(), var2.getCreateBy())) { + return true; + } + + if (getReturnDate(this.getCreateTime(), var2.getCreateTime())) { + return true; + } + + if (getReturnString(this.getUpdateBy(), var2.getUpdateBy())) { + return true; + } + + return getReturnDate(this.getUpdateTime(), var2.getUpdateTime()); + } + + private boolean getReturnDate(Date createTime, Date createTime2) { + Date var17 = createTime; + Date var18 = createTime2; + if (var17 == null) { + if (var18 != null) { + return true; + } + } else if (!Objects.equals(var17, var18)) { + return true; + } + return false; + } + + private boolean getReturnString(String id, String id2) { + String var5 = id; + String var6 = id2; + if (var5 == null) { + if (var6 != null) { + return true; + } + } else if (!Objects.equals(var5, var6)) { + return true; + } + return false; + } + + private boolean getReturnInteger(OnlCgreportParam var2) { + Integer var3 = this.getOrderNum(); + Integer var4 = var2.getOrderNum(); + 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 OnlCgreportParam; } public int hashCode() { - boolean var1 = true; byte var2 = 1; Integer var3 = this.getOrderNum(); int var13 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());