提交

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/service/entity/po/ServiceContractRecord.java

@@ -1,10 +1,11 @@
 package com.fjhx.service.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import org.springblade.core.mp.base.BasicsEntity;
 import lombok.Getter;
 import lombok.Setter;
+import org.springblade.core.mp.base.BasicsEntity;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -22,7 +23,7 @@ public class ServiceContractRecord extends BasicsEntity {
     /**
      * 服务合同id
      */
-    private Long serviceContractId;
+    private String serviceContractId;
 
     /**
      * 服务合同编号

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/shipment/controller/ShipmentPackingController.java

@@ -216,4 +216,5 @@ public class ShipmentPackingController extends BladeController {
     public R shipmentNotification(@RequestBody ShipmentPacking entity) {
         return R.details(iPackingBillPdfService.shipmentNotification(entity.getBillProveId()));
     }
+
 }

bladex-tool/blade-starter-mybatis/src/main/java/org/springblade/core/mp/base/BasicsServiceImpl.java

@@ -1,18 +1,14 @@
 package org.springblade.core.mp.base;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.SneakyThrows;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.ClassUtil;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.ReflectUtil;
-import org.springblade.core.tool.utils.id.IdUtils;
+import org.springblade.core.tool.utils.*;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
@@ -40,7 +36,7 @@ public class BasicsServiceImpl<M extends BaseMapper<T>, T extends BasicsEntity>
 
         // id如果为空默认添加
         if (StringUtils.isBlank(entity.getId())) {
-            entity.setId(IdUtils.fastSimpleUUID());
+            entity.setId(IdWorker.getIdStr());
         }
 
         if (StringUtils.isBlank(entity.getCreateUser())) {
@@ -64,7 +60,7 @@ public class BasicsServiceImpl<M extends BaseMapper<T>, T extends BasicsEntity>
         for (T t : entityList) {
             // id如果为空默认添加
             if (StringUtils.isBlank(t.getId())) {
-                t.setId(IdUtils.fastSimpleUUID());
+                t.setId(IdWorker.getIdStr());
             }
 
             if (StringUtils.isBlank(t.getCreateUser())) {