From 8b35c9671618e9045762f1e3351c7b64d77aadac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 26 Feb 2026 16:24:05 +0800
Subject: [PATCH] =?UTF-8?q?id=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bms/domain/bmsInvoiceInfo/entity/BmsInvoiceInfo.java  | 4 ++--
 .../bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java  | 2 +-
 .../bmsInvoiceList/entity/BmsSettlementPartyInvoice.java  | 4 ++--
 .../repository/persistence/BmsInvoiceListServiceImpl.java | 8 ++++----
 .../bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java | 2 +-
 .../repository/todo/BmsInvoiceListQueryDTO.java           | 2 +-
 .../repository/vo/BmsInvoiceListDetailsVO.java            | 2 +-
 .../bmsInvoiceList/repository/vo/BmsInvoiceListVO.java    | 2 +-
 .../bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java       | 6 +++---
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceInfo/entity/BmsInvoiceInfo.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceInfo/entity/BmsInvoiceInfo.java
index c9e7d5714..7e19b1088 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceInfo/entity/BmsInvoiceInfo.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceInfo/entity/BmsInvoiceInfo.java
@@ -24,8 +24,8 @@ public class BmsInvoiceInfo extends BaseVOEntity {
     private static final long serialVersionUID = 1L;
     
 	/**主键*/
-	@TableId(type = IdType.ID_WORKER_STR)
-    private String id;
+	@TableId(type = IdType.AUTO)
+    private Long id;
 	/**用户ID*/
     @ApiModelProperty(value = "用户ID")
 	@Excel(name = "用户ID", width = 15)
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java
index 892c68c44..9cfee12d5 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java
@@ -24,7 +24,7 @@ public class BmsInvoiceList extends BaseVOEntity {
 
 	/**主键*/
     @TableId(type = IdType.AUTO)
-    private String id;
+    private Long id;
 	/**发票抬头*/
     @ApiModelProperty(value = "发票抬头")
 	@Excel(name = "发票抬头", width = 15)
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsSettlementPartyInvoice.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsSettlementPartyInvoice.java
index 111be1362..72fbc667c 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsSettlementPartyInvoice.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsSettlementPartyInvoice.java
@@ -18,8 +18,8 @@ import java.util.Date;
 @Data
 public class BmsSettlementPartyInvoice extends BaseVOEntity {
     private static final long serialVersionUID = 1L;
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
+    @TableId(type = IdType.AUTO)
+    private Long id;
 
     @ApiModelProperty(value = "结算方姓名")
     @Excel(name = "结算方姓名", width = 15)
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java
index d29c6528b..1b5c23c8f 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java
@@ -198,7 +198,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
         List<BmsMakeOutInvoice> bmsMakeOutInvoices = bmsInvoiceListDTO.getBmsMakeOutInvoices();
         if(ObjectUtil.isNotNull(bmsMakeOutInvoices)&&bmsMakeOutInvoices.size()>0){
             for (BmsMakeOutInvoice bmsMakeOutInvoice : bmsMakeOutInvoices) {
-                if(StringUtils.isNotBlank(bmsMakeOutInvoice.getId())){
+                if(bmsMakeOutInvoice.getId() != null){
                     //bmsMakeOutInvoice.setUpdateBy(sysUser.getId());
                     bmsMakeOutInvoice.setUpdateTime(new Date());
                     bmsMakeOutInvoice.setIsDelete(0);
@@ -208,7 +208,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
                     String invoiceCode=bmsMakeOutInvoice.getInvoiceCode();
                     BigDecimal invoiceValue=bmsMakeOutInvoice.getInvoiceValue();
                     BeanUtils.copyProperties(bmsInvoiceList, bmsMakeOutInvoice);
-                    bmsMakeOutInvoice.setId("");
+                    //bmsMakeOutInvoice.setId("");
                     //bmsMakeOutInvoice.setCreateBy(sysUser.getId());
                     bmsMakeOutInvoice.setCreateTime(new Date());
                     bmsMakeOutInvoice.setInvoiceId(bmsInvoiceList.getId());
@@ -318,7 +318,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
             String invoiceCode=bmsMakeOutInvoice.getInvoiceCode();
             BigDecimal invoiceValue=bmsMakeOutInvoice.getInvoiceValue();
             BeanUtils.copyProperties(bmsInvoiceList, bmsMakeOutInvoice);
-            bmsMakeOutInvoice.setId("");
+            //bmsMakeOutInvoice.setId("");
             //bmsMakeOutInvoice.setCreateBy(sysUser.getId());
             bmsMakeOutInvoice.setCreateTime(date);
             bmsMakeOutInvoice.setInvoiceId(bmsInvoiceList.getId());
@@ -705,7 +705,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
         if (null == sysUser) {
             throw new ServiceException("未查询到登录人信息");
         }
-        if(StringUtils.isBlank(bmsInvoiceListInvoiceStateDTO.getId())){
+        if(bmsInvoiceListInvoiceStateDTO.getId() == null){
             throw new ServiceException("未获取到发票信息");
         }
         String [] idList = bmsInvoiceListInvoiceStateDTO.getId().split(",");
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java
index 725708788..d40501262 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java
@@ -26,7 +26,7 @@ public class BmsInvoiceListDTO implements Serializable {
 
 	/**主键*/
 	@TableId(type = IdType.ID_WORKER_STR)
-    private String id;
+    private Long id;
 	/**发票抬头*/
     @ApiModelProperty(value = "发票抬头")
 	@Excel(name = "发票抬头", width = 15)
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListQueryDTO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListQueryDTO.java
index 5d20be77f..9d1b352bf 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListQueryDTO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListQueryDTO.java
@@ -24,7 +24,7 @@ public class BmsInvoiceListQueryDTO implements Serializable {
 
 	/**主键*/
 	@TableId(type = IdType.ID_WORKER_STR)
-    private String id;
+    private Long id;
 
 	/**发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）*/
     @ApiModelProperty(value = "发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）")
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListDetailsVO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListDetailsVO.java
index 2f1223012..6581b6b5d 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListDetailsVO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListDetailsVO.java
@@ -27,7 +27,7 @@ public class BmsInvoiceListDetailsVO implements Serializable {
 
 	/**主键*/
 	@TableId(type = IdType.ID_WORKER_STR)
-    private String id;
+    private Long id;
 	/**发票抬头*/
     @ApiModelProperty(value = "发票抬头")
 	@Excel(name = "发票抬头", width = 15)
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java
index ce5ccc4ca..c9df67942 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java
@@ -24,7 +24,7 @@ public class BmsInvoiceListVO implements Serializable {
 
 	/**主键*/
 	@TableId(type = IdType.ID_WORKER_STR)
-    private String id;
+    private Long id;
     /**发票申请时间*/
     @ApiModelProperty(value = "发票申请时间")
     @Excel(name = "发票申请时间", width = 25, dateFormat = "yyyy-MM-dd HH:mm:ss")
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java
index 8b7962a13..6d34522c5 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java
@@ -23,12 +23,12 @@ public class BmsMakeOutInvoice extends BaseVOEntity {
     private static final long serialVersionUID = 1L;
 
     /**主键*/
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
+    @TableId(type = IdType.AUTO)
+    private Long id;
     /**发票ID*/
     @ApiModelProperty(value = "发票ID")
     @Excel(name = "发票ID", width = 15)
-    private String invoiceId;
+    private Long invoiceId;
 	/**发票抬头*/
     @ApiModelProperty(value = "发票抬头")
 	@Excel(name = "发票抬头", width = 15)