Procházet zdrojové kódy

ResourceAutoCode绑定修改如果id为空直接复用父类id,去除无用@TableId

yejian před 3 roky
rodič
revize
4db68ad339

+ 1 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/Order.java

@@ -55,7 +55,7 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 public class Order extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
-    @TableId(value = "id")
+
     private Long id;
 
     /**

+ 0 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomProcedureMeterial.java

@@ -52,7 +52,6 @@ public class BomProcedureMeterial extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id")
     private Long id;
 
     /**

+ 0 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomProcedureVersion.java

@@ -50,7 +50,6 @@ public class BomProcedureVersion extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id")
     private Long id;
 
     /**

+ 0 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomVersionInfo.java

@@ -47,7 +47,6 @@ public class BomVersionInfo extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id")
     private Long id;
 
     /**

+ 0 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MMeterial.java

@@ -47,7 +47,6 @@ public class MMeterial extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id")
     private Long id;
 
     /**

+ 0 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/Plate.java

@@ -38,7 +38,6 @@ public class Plate extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id")
     private Long id;
 
     /**

+ 2 - 0
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/ResourceAutoCode.java

@@ -28,6 +28,8 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 public class ResourceAutoCode extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
+    
+    private Long id;
 
     /**
      * 设备业务名

+ 5 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/typeHandler/ResourceAutoCodeHandler.java

@@ -25,7 +25,11 @@ public class ResourceAutoCodeHandler extends BaseTypeHandler<ResourceAutoCode> {
 
     @Override
     public ResourceAutoCode getNullableResult(ResultSet resultSet, String columnName) throws SQLException {
-        return ResourceAutoCode.builder().id(resultSet.getLong(columnName)).build();
+        ResourceAutoCode resourceAutoCode = ResourceAutoCode.builder().id(resultSet.getLong(columnName)).build();
+        if (null == resourceAutoCode.getId()){
+            resourceAutoCode.setId(resultSet.getLong(columnName));
+        }
+        return resourceAutoCode;
     }
 
     @Override