Commit 4b21da27 authored by neo's avatar neo

[dev] fixed some filed type error

parent 158e0c4c
...@@ -432,8 +432,8 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe ...@@ -432,8 +432,8 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
Dimension entity = new Dimension(); Dimension entity = new Dimension();
CommonUtils.copyProperties(model, entity); CommonUtils.copyProperties(model, entity);
entity.setId(CommonUtils.getUUID()); entity.setId(CommonUtils.getUUID());
boolean orderIndex = dimensionMapper.selectByExample(null).stream().map(Dimension::getOrderIndex) Short orderIndex = dimensionMapper.selectByExample(null).stream().map(Dimension::getOrderIndex)
.filter(Objects::nonNull).max(Comparator.naturalOrder()).orElse(false); .filter(Objects::nonNull).max(Comparator.naturalOrder()).orElse(Short.valueOf("0"));
entity.setOrderIndex(orderIndex); entity.setOrderIndex(orderIndex);
entity.setIsSystemDimension(false); entity.setIsSystemDimension(false);
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<table tableName="DIMENSION" schema="tax_admin" domainObjectName="Dimension"> <table tableName="DIMENSION" schema="tax_admin" domainObjectName="Dimension">
<property name="useActualColumnNames" value="false"/> <property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/> <property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="ORDER_INDEX" javaType="java.lang.Boolean" /> <columnOverride column="ORDER_INDEX" javaType="java.lang.Short" />
<columnOverride column="IS_MANDATORY" javaType="java.lang.Boolean" /> <columnOverride column="IS_MANDATORY" javaType="java.lang.Boolean" />
<columnOverride column="IS_ACTIVE" javaType="java.lang.Boolean" /> <columnOverride column="IS_ACTIVE" javaType="java.lang.Boolean" />
<columnOverride column="IS_SYSTEM_DIMENSION" javaType="java.lang.Boolean" /> <columnOverride column="IS_SYSTEM_DIMENSION" javaType="java.lang.Boolean" />
...@@ -340,8 +340,8 @@ ...@@ -340,8 +340,8 @@
<property name="useActualColumnNames" value="false"/> <property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/> <property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="LEVEL_TYPE" javaType="java.lang.Integer" /> <columnOverride column="LEVEL_TYPE" javaType="java.lang.Integer" />
<columnOverride column="LONGITUDE" javaType="Double" /> <columnOverride column="LONGITUDE" javaType="java.lang.Float" />
<columnOverride column="LATITUDE" javaType="Double" /> <columnOverride column="LATITUDE" javaType="java.lang.Float" />
<columnOverride column="IS_ACTIVE" javaType="java.lang.Boolean" /> <columnOverride column="IS_ACTIVE" javaType="java.lang.Boolean" />
</table> </table>
......
...@@ -45,7 +45,7 @@ public class Dimension extends BaseEntity implements Serializable { ...@@ -45,7 +45,7 @@ public class Dimension extends BaseEntity implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
private Boolean orderIndex; private Short orderIndex;
/** /**
* *
...@@ -198,7 +198,7 @@ public class Dimension extends BaseEntity implements Serializable { ...@@ -198,7 +198,7 @@ public class Dimension extends BaseEntity implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public Boolean getOrderIndex() { public Short getOrderIndex() {
return orderIndex; return orderIndex;
} }
...@@ -210,7 +210,7 @@ public class Dimension extends BaseEntity implements Serializable { ...@@ -210,7 +210,7 @@ public class Dimension extends BaseEntity implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public void setOrderIndex(Boolean orderIndex) { public void setOrderIndex(Short orderIndex) {
this.orderIndex = orderIndex; this.orderIndex = orderIndex;
} }
......
...@@ -87,7 +87,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable { ...@@ -87,7 +87,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* *
* @mbg.generated * @mbg.generated
*/ */
private Double longitude; private Float longitude;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
...@@ -95,7 +95,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable { ...@@ -95,7 +95,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* *
* @mbg.generated * @mbg.generated
*/ */
private Double latitude; private Float latitude;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
...@@ -318,7 +318,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable { ...@@ -318,7 +318,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @return the value of REGION.LONGITUDE * @return the value of REGION.LONGITUDE
* @mbg.generated * @mbg.generated
*/ */
public Double getLongitude() { public Float getLongitude() {
return longitude; return longitude;
} }
...@@ -329,7 +329,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable { ...@@ -329,7 +329,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @param longitude the value for REGION.LONGITUDE * @param longitude the value for REGION.LONGITUDE
* @mbg.generated * @mbg.generated
*/ */
public void setLongitude(Double longitude) { public void setLongitude(Float longitude) {
this.longitude = longitude; this.longitude = longitude;
} }
...@@ -340,7 +340,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable { ...@@ -340,7 +340,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @return the value of REGION.LATITUDE * @return the value of REGION.LATITUDE
* @mbg.generated * @mbg.generated
*/ */
public Double getLatitude() { public Float getLatitude() {
return latitude; return latitude;
} }
...@@ -351,7 +351,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable { ...@@ -351,7 +351,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @param latitude the value for REGION.LATITUDE * @param latitude the value for REGION.LATITUDE
* @mbg.generated * @mbg.generated
*/ */
public void setLatitude(Double latitude) { public void setLatitude(Float latitude) {
this.latitude = latitude; this.latitude = latitude;
} }
......
...@@ -18,7 +18,7 @@ public class Dimension { ...@@ -18,7 +18,7 @@ public class Dimension {
private String id; private String id;
private String name; private String name;
private String attributeId; private String attributeId;
private Boolean orderIndex; private Short orderIndex;
private Boolean isMandatory; private Boolean isMandatory;
private Boolean isActive; private Boolean isActive;
private Boolean isSystemDimension; private Boolean isSystemDimension;
...@@ -61,11 +61,11 @@ public class Dimension { ...@@ -61,11 +61,11 @@ public class Dimension {
@Basic @Basic
@Column(name = "ORDER_INDEX", nullable = false) @Column(name = "ORDER_INDEX", nullable = false)
public Boolean getOrderIndex() { public Short getOrderIndex() {
return orderIndex; return orderIndex;
} }
public void setOrderIndex(Boolean orderIndex) { public void setOrderIndex(Short orderIndex) {
this.orderIndex = orderIndex; this.orderIndex = orderIndex;
} }
......
...@@ -23,8 +23,8 @@ public class Region { ...@@ -23,8 +23,8 @@ public class Region {
private String telCode; private String telCode;
private String zipCode; private String zipCode;
private String pinYin; private String pinYin;
private Double longitude; private Float longitude;
private Double latitude; private Float latitude;
private Boolean isActive; private Boolean isActive;
@Id @Id
...@@ -128,22 +128,22 @@ public class Region { ...@@ -128,22 +128,22 @@ public class Region {
@Basic @Basic
@Column(name = "LONGITUDE", nullable = false, precision = 0) @Column(name = "LONGITUDE", nullable = false, precision = 0)
@ColumnDefault(DEF_DEFAULT_BIG_DECIMAL) @ColumnDefault(DEF_DEFAULT_BIG_DECIMAL)
public Double getLongitude() { public Float getLongitude() {
return longitude; return longitude;
} }
public void setLongitude(Double longitude) { public void setLongitude(Float longitude) {
this.longitude = longitude; this.longitude = longitude;
} }
@Basic @Basic
@Column(name = "LATITUDE", nullable = false, precision = 0) @Column(name = "LATITUDE", nullable = false, precision = 0)
@ColumnDefault(DEF_DEFAULT_BIG_DECIMAL) @ColumnDefault(DEF_DEFAULT_BIG_DECIMAL)
public Double getLatitude() { public Float getLatitude() {
return latitude; return latitude;
} }
public void setLatitude(Double latitude) { public void setLatitude(Float latitude) {
this.latitude = latitude; this.latitude = latitude;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment