修改雪花id引起的重复错误

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowDetailController.java

@@ -72,10 +72,9 @@ public class CmcBorrowDetailController extends BaseController
      */
     @Log(title = "cmc借款明细", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcBorrowDetail cmcBorrowDetail) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcBorrowDetail cmcBorrowDetail)
     {
-        Thread.sleep(1);
-        cmcBorrowDetail.setBorrowDetailId(new SnowFlake().generateId());
+        cmcBorrowDetail.setBorrowDetailId(new SnowFlake().nextId());
         return toAjax(cmcBorrowDetailService.insertCmcBorrowDetail(cmcBorrowDetail));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBrandPaymentController.java

@@ -72,9 +72,9 @@ public class CmcBrandPaymentController extends BaseController
      */
     @Log(title = "cmc品牌项目支付记录", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcBrandPayment cmcBrandPayment) throws InterruptedException {
-        Thread.sleep(1);
-        cmcBrandPayment.setBrandPaymentId(new SnowFlake().generateId());
+    public AjaxResult add(@RequestBody CmcBrandPayment cmcBrandPayment)
+    {
+        cmcBrandPayment.setBrandPaymentId(new SnowFlake().nextId());
         return toAjax(cmcBrandPaymentService.insertCmcBrandPayment(cmcBrandPayment));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetCarController.java

@@ -73,10 +73,9 @@ public class CmcBudgetCarController extends BaseController
      */
     @Log(title = "cmc车辆预算", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcBudgetCar cmcBudgetCar) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcBudgetCar cmcBudgetCar)
     {
-        Thread.sleep(1);
-        cmcBudgetCar.setBudgetCarId(new SnowFlake().generateId());
+        cmcBudgetCar.setBudgetCarId(new SnowFlake().nextId());
         return toAjax(cmcBudgetCarService.insertCmcBudgetCar(cmcBudgetCar));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetDeviceController.java

@@ -73,10 +73,8 @@ public class CmcBudgetDeviceController extends BaseController
      */
     @Log(title = "cmc设备预算", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcBudgetDevice cmcBudgetDevice) throws InterruptedException
-    {
-        Thread.sleep(1);
-        cmcBudgetDevice.setBudgetDeviceId(new SnowFlake().generateId());
+    public AjaxResult add(@RequestBody CmcBudgetDevice cmcBudgetDevice){
+        cmcBudgetDevice.setBudgetDeviceId(new SnowFlake().nextId());
         return toAjax(cmcBudgetDeviceService.insertCmcBudgetDevice(cmcBudgetDevice));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetSettleController.java

@@ -73,10 +73,9 @@ public class CmcBudgetSettleController extends BaseController
      */
     @Log(title = "cmc预结算", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcBudgetSettle cmcBudgetSettle) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcBudgetSettle cmcBudgetSettle)
     {
-        Thread.sleep(1);
-        cmcBudgetSettle.setBudgetSettleId(new SnowFlake().generateId());
+        cmcBudgetSettle.setBudgetSettleId(new SnowFlake().nextId());
         return toAjax(cmcBudgetSettleService.insertCmcBudgetSettle(cmcBudgetSettle));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetStaffController.java

@@ -73,10 +73,9 @@ public class CmcBudgetStaffController extends BaseController
      */
     @Log(title = "cmc人员预算", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcBudgetStaff cmcBudgetStaff) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcBudgetStaff cmcBudgetStaff)
     {
-        Thread.sleep(1);
-        cmcBudgetStaff.setBudgetStaffId(new SnowFlake().generateId());
+        cmcBudgetStaff.setBudgetStaffId(new SnowFlake().nextId());
         return toAjax(cmcBudgetStaffService.insertCmcBudgetStaff(cmcBudgetStaff));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractCommentController.java

@@ -74,10 +74,9 @@ public class CmcContractCommentController extends BaseController
      */
     @Log(title = "cmc合同意见", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcContractComment cmcContractComment) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcContractComment cmcContractComment)
     {
-        Thread.sleep(1);
-        cmcContractComment.setCommentId(new SnowFlake().generateId());
+        cmcContractComment.setCommentId(new SnowFlake().nextId());
         return toAjax(cmcContractCommentService.insertCmcContractComment(cmcContractComment));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractPaymentController.java

@@ -72,10 +72,9 @@ public class CmcContractPaymentController extends BaseController
      */
     @Log(title = "cmc合同回款", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcContractPayment cmcContractPayment) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcContractPayment cmcContractPayment)
     {
-        Thread.sleep(1);
-        cmcContractPayment.setPaymentId(new SnowFlake().generateId());
+        cmcContractPayment.setPaymentId(new SnowFlake().nextId());
         return toAjax(cmcContractPaymentService.insertCmcContractPayment(cmcContractPayment));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractWorkController.java

@@ -72,10 +72,9 @@ public class CmcContractWorkController extends BaseController
      */
     @Log(title = "cmc合同内容", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcContractWork cmcContractWork) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcContractWork cmcContractWork)
     {
-        Thread.sleep(1);
-        cmcContractWork.setWorkId(new SnowFlake().generateId());
+        cmcContractWork.setWorkId(new SnowFlake().nextId());
         return toAjax(cmcContractWorkService.insertCmcContractWork(cmcContractWork));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java

@@ -72,10 +72,9 @@ public class CmcProjectProgressController extends BaseController
      */
     @Log(title = "cmc项目进度", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
     {
-        Thread.sleep(1);
-        cmcProjectProgress.setProgressId(new SnowFlake().generateId());
+        cmcProjectProgress.setProgressId(new SnowFlake().nextId());
         return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectWorkController.java

@@ -72,10 +72,9 @@ public class CmcProjectWorkController extends BaseController
      */
     @Log(title = "cmc项目内容", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcProjectWork cmcProjectWork) throws InterruptedException
+    public AjaxResult add(@RequestBody CmcProjectWork cmcProjectWork)
     {
-        Thread.sleep(1);
-        cmcProjectWork.setWorkId(new SnowFlake().generateId());
+        cmcProjectWork.setWorkId(new SnowFlake().nextId());
         return toAjax(cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSettleSummaryController.java

@@ -72,9 +72,9 @@ public class CmcSettleSummaryController extends BaseController
      */
     @Log(title = "cmc结算汇总", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcSettleSummary cmcSettleSummary) throws InterruptedException {
-        Thread.sleep(2);
-        cmcSettleSummary.setSummaryId(new SnowFlake().generateId());
+    public AjaxResult add(@RequestBody CmcSettleSummary cmcSettleSummary)
+    {
+        cmcSettleSummary.setSummaryId(new SnowFlake().nextId());
         return toAjax(cmcSettleSummaryService.insertCmcSettleSummary(cmcSettleSummary));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSettleWorkController.java

@@ -72,9 +72,9 @@ public class CmcSettleWorkController extends BaseController
      */
     @Log(title = "cmc经费计算", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcSettleWork cmcSettleWork) throws InterruptedException {
-        Thread.sleep(2);
-        cmcSettleWork.setWorkId(new SnowFlake().generateId());
+    public AjaxResult add(@RequestBody CmcSettleWork cmcSettleWork)
+    {
+        cmcSettleWork.setWorkId(new SnowFlake().nextId());
         return toAjax(cmcSettleWorkService.insertCmcSettleWork(cmcSettleWork));
     }
 

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/SnowFlake.java

@@ -14,7 +14,7 @@ import java.util.concurrent.ThreadLocalRandom;
 @Component
 public class SnowFlake {
     /* 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动） */
-    private final long twepoch = 1288834974657L;
+    private final long twepoch = 1715236540000L;
     private final long workerIdBits = 5L;/* 机器标识位数 */
     private final long datacenterIdBits = 5L;
     private final long maxWorkerId = -1L ^ (-1L << workerIdBits);

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBorrowDetail.java

@@ -17,7 +17,7 @@ public class CmcBorrowDetail extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 借款明细id */
-    private String borrowDetailId;
+    private Long borrowDetailId;
 
     /** 借款id */
     @Excel(name = "借款id")
@@ -51,12 +51,12 @@ public class CmcBorrowDetail extends BaseEntity
     @Excel(name = "分管审核金额")
     private BigDecimal managerAmount;
 
-    public void setBorrowDetailId(String borrowDetailId) 
+    public void setBorrowDetailId(Long borrowDetailId)
     {
         this.borrowDetailId = borrowDetailId;
     }
 
-    public String getBorrowDetailId() 
+    public Long getBorrowDetailId()
     {
         return borrowDetailId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBrandPayment.java

@@ -18,7 +18,7 @@ public class CmcBrandPayment extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 品牌项目支付记录id */
-    private String brandPaymentId;
+    private Long brandPaymentId;
 
     /** 品牌项目支付审批id */
     @Excel(name = "品牌项目支付审批id")
@@ -33,12 +33,12 @@ public class CmcBrandPayment extends BaseEntity
     @Excel(name = "到账情况")
     private String cwComment;
 
-    public void setBrandPaymentId(String brandPaymentId) 
+    public void setBrandPaymentId(Long brandPaymentId)
     {
         this.brandPaymentId = brandPaymentId;
     }
 
-    public String getBrandPaymentId() 
+    public Long getBrandPaymentId()
     {
         return brandPaymentId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetCar.java

@@ -19,7 +19,7 @@ public class CmcBudgetCar extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 车辆预算id */
-    private String budgetCarId;
+    private Long budgetCarId;
 
     /** 预算id */
     @Excel(name = "预算id")
@@ -53,12 +53,12 @@ public class CmcBudgetCar extends BaseEntity
     @Excel(name = "使用成本")
     private BigDecimal expense;
 
-    public void setBudgetCarId(String budgetCarId) 
+    public void setBudgetCarId(Long budgetCarId)
     {
         this.budgetCarId = budgetCarId;
     }
 
-    public String getBudgetCarId() 
+    public Long getBudgetCarId()
     {
         return budgetCarId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetDevice.java

@@ -17,7 +17,7 @@ public class CmcBudgetDevice extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 设备预算id */
-    private String budgetDeviceId;
+    private Long budgetDeviceId;
 
     /** 预算id */
     @Excel(name = "预算id")
@@ -37,12 +37,12 @@ public class CmcBudgetDevice extends BaseEntity
     @Excel(name = "折旧成本")
     private BigDecimal depreciation;
 
-    public void setBudgetDeviceId(String budgetDeviceId) 
+    public void setBudgetDeviceId(Long budgetDeviceId)
     {
         this.budgetDeviceId = budgetDeviceId;
     }
 
-    public String getBudgetDeviceId() 
+    public Long getBudgetDeviceId()
     {
         return budgetDeviceId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetSettle.java

@@ -17,7 +17,7 @@ public class CmcBudgetSettle extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 预结算id */
-    private String budgetSettleId;
+    private Long budgetSettleId;
 
     /** 预算id */
     @Excel(name = "预算id")
@@ -45,12 +45,12 @@ public class CmcBudgetSettle extends BaseEntity
     @Excel(name = "结算金额")
     private BigDecimal settle;
 
-    public void setBudgetSettleId(String budgetSettleId) 
+    public void setBudgetSettleId(Long budgetSettleId)
     {
         this.budgetSettleId = budgetSettleId;
     }
 
-    public String getBudgetSettleId() 
+    public Long getBudgetSettleId()
     {
         return budgetSettleId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.java

@@ -20,7 +20,7 @@ public class CmcBudgetStaff extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 人员预算id */
-    private String budgetStaffId;
+    private Long budgetStaffId;
 
     /** 预算id */
     @Excel(name = "预算id")
@@ -50,12 +50,12 @@ public class CmcBudgetStaff extends BaseEntity
     @Excel(name = "进出场费用")
     private BigDecimal inOutExpense;
 
-    public void setBudgetStaffId(String budgetStaffId) 
+    public void setBudgetStaffId(Long budgetStaffId)
     {
         this.budgetStaffId = budgetStaffId;
     }
 
-    public String getBudgetStaffId() 
+    public Long getBudgetStaffId()
     {
         return budgetStaffId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContractComment.java

@@ -19,7 +19,7 @@ public class CmcContractComment extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 合同会审意见id */
-    private String commentId;
+    private Long commentId;
 
     /** 合同id */
     @Excel(name = "合同id")
@@ -48,12 +48,12 @@ public class CmcContractComment extends BaseEntity
     @Excel(name = "会审日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date commentTime;
 
-    public void setCommentId(String commentId)
+    public void setCommentId(Long commentId)
     {
         this.commentId = commentId;
     }
 
-    public String getCommentId()
+    public Long getCommentId()
     {
         return commentId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContractPayment.java

@@ -18,7 +18,7 @@ public class CmcContractPayment extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 合同回款id */
-    private String paymentId;
+    private Long paymentId;
 
     /** 合同id */
     @Excel(name = "合同id")
@@ -41,12 +41,12 @@ public class CmcContractPayment extends BaseEntity
     @Excel(name = "回款预计时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date paymentTime;
 
-    public void setPaymentId(String paymentId) 
+    public void setPaymentId(Long paymentId)
     {
         this.paymentId = paymentId;
     }
 
-    public String getPaymentId() 
+    public Long getPaymentId()
     {
         return paymentId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContractWork.java

@@ -18,7 +18,7 @@ public class CmcContractWork extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 工作内容id */
-    private String workId;
+    private Long workId;
 
     /** 合同id */
     @Excel(name = "合同id")
@@ -45,12 +45,12 @@ public class CmcContractWork extends BaseEntity
     @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deadline;
 
-    public void setWorkId(String workId) 
+    public void setWorkId(Long workId)
     {
         this.workId = workId;
     }
 
-    public String getWorkId() 
+    public Long getWorkId()
     {
         return workId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProjectProgress.java

@@ -18,7 +18,7 @@ public class CmcProjectProgress extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 项目进度id */
-    private String progressId;
+    private Long progressId;
 
     /** 项目id */
     @Excel(name = "项目id")
@@ -37,12 +37,12 @@ public class CmcProjectProgress extends BaseEntity
     @Excel(name = "情况说明")
     private String situation;
 
-    public void setProgressId(String progressId) 
+    public void setProgressId(Long progressId)
     {
         this.progressId = progressId;
     }
 
-    public String getProgressId() 
+    public Long getProgressId()
     {
         return progressId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProjectWork.java

@@ -18,7 +18,7 @@ public class CmcProjectWork extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 工作内容id */
-    private String workId;
+    private Long workId;
 
     /** 项目id */
     private String projectId;
@@ -49,12 +49,12 @@ public class CmcProjectWork extends BaseEntity
     @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date finishTime;
 
-    public void setWorkId(String workId)
+    public void setWorkId(Long workId)
     {
         this.workId = workId;
     }
 
-    public String getWorkId()
+    public Long getWorkId()
     {
         return workId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettleSummary.java

@@ -17,7 +17,7 @@ public class CmcSettleSummary extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 结算汇总id */
-    private String summaryId;
+    private Long summaryId;
 
     /** 结算id */
     @Excel(name = "结算id")
@@ -35,12 +35,12 @@ public class CmcSettleSummary extends BaseEntity
     @Excel(name = "结算金额")
     private BigDecimal amount;
 
-    public void setSummaryId(String summaryId) 
+    public void setSummaryId(Long summaryId)
     {
         this.summaryId = summaryId;
     }
 
-    public String getSummaryId() 
+    public Long getSummaryId()
     {
         return summaryId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettleWork.java

@@ -17,7 +17,7 @@ public class CmcSettleWork extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 工作内容id */
-    private String workId;
+    private Long workId;
 
     /** 结算id */
     @Excel(name = "结算id")
@@ -55,12 +55,12 @@ public class CmcSettleWork extends BaseEntity
     @Excel(name = "项目经费", readConverterExp = "分=管")
     private BigDecimal settleManager;
 
-    public void setWorkId(String workId) 
+    public void setWorkId(Long workId)
     {
         this.workId = workId;
     }
 
-    public String getWorkId() 
+    public Long getWorkId()
     {
         return workId;
     }

oa-back/sql/sql.sql

@@ -1513,7 +1513,7 @@ INSERT INTO cmc_project VALUES ('116', '2024W11', '国网拉萨发电公司2024
 -- ----------------------------
 drop table if exists `cmc_project_work`;
 create table `cmc_project_work`  (
-  `work_id`			char(19)		not null		comment '工作内容id',
+  `work_id`			bigint not null  auto_increment comment '工作内容id',
   `project_id`		char(19)		default null	comment '项目id',
   `content`			varchar(255)	default null	comment '工作内容',
   `scale`			varchar(10)		default null	comment '等级或比例尺',
@@ -3114,7 +3114,7 @@ create table `cmc_contract`  (
 -- ----------------------------
 drop table if exists `cmc_contract_comment`;
 create table `cmc_contract_comment`  (
-  `comment_id` 		char(19)  		not null 	 comment '合同会审意见id',
+  `comment_id` 		bigint not null  auto_increment comment '合同会审意见id',
   `contract_id` 	char(19)  		default null comment '合同id',
   `dept_id` 		bigint  		default null comment '会审部门',
   `user_id` 		bigint 			default null comment '会审人',
@@ -3154,7 +3154,7 @@ create table `cmc_contract_meeting`  (
 -- ----------------------------
 drop table if exists `cmc_contract_payment`;
 create table `cmc_contract_payment`  (
-  `payment_id` 			char(19)  		not null 	 comment '合同回款id',
+  `payment_id` 			bigint not null  auto_increment comment '合同回款id',
   `contract_id` 		char(19)  		default null comment '合同id',
   `payment_condition` 	varchar(255)  	default null comment '回款条件',
   `payment_percentage` 	varchar(5)  	default null comment '回款比例',
@@ -3173,7 +3173,7 @@ create table `cmc_contract_payment`  (
 -- ----------------------------
 drop table if exists `cmc_contract_work`;
 create table `cmc_contract_work`  (
-  `work_id` 			char(19)  		not null 	 comment '工作内容id',
+  `work_id` 			bigint not null  auto_increment comment '工作内容id',
   `contract_id` 		char(19)  		default null comment '合同id',
   `content` 			varchar(255)  	default null comment '工作内容',
   `scale` 				varchar(10)  	default null comment '等级或比例尺',
@@ -3621,7 +3621,7 @@ create table `cmc_budget`  (
 -- ----------------------------
 drop table if exists `cmc_budget_car`;
 create table `cmc_budget_car`  (
-  `budget_car_id` 	char(19)		not null 	comment '车辆预算id',
+  `budget_car_id` 	bigint not null  auto_increment comment '车辆预算id',
   `budget_id` 		char(19) 		default null comment '预算id',
   `car_id` 			int 			default null comment '车辆id',
   `days` 			int 			default null comment '天数',
@@ -3642,7 +3642,7 @@ create table `cmc_budget_car`  (
 -- ----------------------------
 drop table if exists `cmc_budget_device`;
 create table `cmc_budget_device`  (
-  `budget_device_id` 	char(19) 		not null 	comment '设备预算id',
+  `budget_device_id` 	bigint not null  auto_increment comment '设备预算id',
   `budget_id` 			char(19) 		default null comment '预算id',
   `device_id` 			int 			default null comment '设备id',
   `days` 				int 			default null comment '天数',
@@ -3660,7 +3660,7 @@ create table `cmc_budget_device`  (
 -- ----------------------------
 drop table if exists `cmc_budget_settle`;
 create table `cmc_budget_settle`  (
-  `budget_settle_id` 	char(19) 		not null 	comment '预结算id',
+  `budget_settle_id` 	bigint not null  auto_increment comment '预结算id',
   `budget_id` 			char(19) 		default null comment '预算id',
   `price_id` 			int 			default null comment '结算单价id',
   `workload` 			double 			default null comment '工作量',
@@ -3680,7 +3680,7 @@ create table `cmc_budget_settle`  (
 -- ----------------------------
 drop table if exists `cmc_budget_staff`;
 create table `cmc_budget_staff`  (
-  `budget_staff_id` 	char(19) 		not null 	comment '人员预算id',
+  `budget_staff_id` 	bigint not null  auto_increment comment '人员预算id',
   `budget_id` 			char(19) 		default null comment '预算id',
   `user_id` 			bigint 			default null comment '人员id',
   `days` 				int 			default null comment '天数',
@@ -3738,7 +3738,7 @@ create table `cmc_project_comment`  (
 -- ----------------------------
 drop table if exists `cmc_project_progress`;
 create table `cmc_project_progress`  (
-  `progress_id` 	char(19)  		not null 	comment '项目进度id',
+  `progress_id` 	bigint not null  auto_increment comment '项目进度id',
   `project_id` 		char(19)		default null comment '项目id',
   `percentage` 		varchar(5)		default null comment '累计进度',
   `date` 			date			default null comment '截止日期',
@@ -3846,7 +3846,7 @@ create table `cmc_borrow`  (
 -- ----------------------------
 drop table if exists `cmc_borrow_detail`;
 create table `cmc_borrow_detail`  (
-  `borrow_detail_id`	char(19)  		not null 	comment '借款明细id',
+  `borrow_detail_id`	bigint not null  auto_increment comment '借款明细id',
   `borrow_id` 			char(19)  		default null comment '借款id',
   `borrow_item` 		varchar(50)  	default null comment '开支项',
   `unit` 				varchar(10)  	default null comment '单位',
@@ -3968,7 +3968,7 @@ create table `cmc_brand`  (
 -- ----------------------------
 drop table if exists `cmc_brand_payment`;
 create table `cmc_brand_payment`  (
-  `brand_payment_id` 	char(19)  		not null 	 comment '品牌项目支付记录id',
+  `brand_payment_id` 	bigint not null  auto_increment comment '品牌项目支付记录id',
   `brand_id` 			char(19)  		default null comment '品牌项目支付审批id',
   `payment_time` 		date  			default null comment '到账时间',
   `cw_comment` 			varchar(255)  	default null comment '到账情况',
@@ -4087,7 +4087,7 @@ create table `cmc_settle`  (
 -- ----------------------------
 drop table if exists `cmc_settle_work`;
 create table `cmc_settle_work`  (
-  `work_id`			char(19)		not null		comment '工作内容id',
+  `work_id`			bigint not null  auto_increment comment '工作内容id',
   `settle_id`		char(19)		default null	comment '结算id',
   `content`			varchar(255)	default null	comment '工作内容',
   `price_id` 		int 			default null 	comment '结算单价id',
@@ -4110,7 +4110,7 @@ create table `cmc_settle_work`  (
 -- ----------------------------
 drop table if exists `cmc_settle_summary`;
 create table `cmc_settle_summary`  (
-  `summary_id`		char(19)		not null		comment '结算汇总id',
+  `summary_id`		bigint not null  auto_increment comment '结算汇总id',
   `settle_id`		char(19)		default null	comment '结算id',
   `content`			varchar(255)	default null	comment '结算内容',
   `amount`			decimal(10,2)	default null	comment '结算金额',