解决雪花id重复问题

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.SnowFlake;
@@ -73,8 +75,9 @@ public class CmcContractCommentController extends BaseController
      */
     @Log(title = "cmc合同意见", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcContractComment cmcContractComment)
+    public AjaxResult add(@RequestBody CmcContractComment cmcContractComment) throws InterruptedException
     {
+        Thread.sleep(1);
         cmcContractComment.setCommentId(new SnowFlake().generateId());
         return toAjax(cmcContractCommentService.insertCmcContractComment(cmcContractComment));
     }
@@ -86,6 +89,8 @@ public class CmcContractCommentController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcContractComment cmcContractComment)
     {
+        if (Objects.equals(cmcContractComment.getUserId(), getLoginUser().getUserId()))
+            cmcContractComment.setCommentTime(new Date());
         return toAjax(cmcContractCommentService.updateCmcContractComment(cmcContractComment));
     }
 

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +83,10 @@ public class CmcContractController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcContract cmcContract)
     {
+        if (cmcContract.getManagerComment() != null && cmcContract.getSignDate() == null) {
+            cmcContract.setManagerUserId(getLoginUser().getUserId());
+            cmcContract.setManagerTime(new Date());
+        }
         return toAjax(cmcContractService.updateCmcContract(cmcContract));
     }
 

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

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

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

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

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

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

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

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

oa-ui/src/views/flowable/form/contractForm.vue

@@ -136,7 +136,7 @@
             <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain></el-button>
           </el-form-item>
           <el-form-item label="合同备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入合同备注" />
+            <el-input v-model="form.remark" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -189,11 +189,11 @@
                 </td>
                 <td>
                   <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
-                    :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input>
                 </td>
                 <td>
                   <el-input v-model="comment.document" clearable
-                    :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input>
                 </td>
                 <td>
                   <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : '' }} </span>
@@ -265,7 +265,7 @@
             </table>
           </el-form-item>
           <el-form-item label="分管审批意见" prop="remark">
-            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
+            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" :disabled="taskName != '分管审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -281,14 +281,15 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
+              :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
-            <el-input v-model="form.signRemark" placeholder="请输入签订备注" />
+            <el-input v-model="form.signRemark" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
-            <el-input v-model="form.signScan" placeholder="请输入签订扫描件" />
+            <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" />
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
@@ -315,7 +316,7 @@ import { listUser } from '@/api/system/user'
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { getContractWork, addContractWork } from "@/api/oa/contract/contractWork";
 import { getContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
-import { getContractComment, addContractComment, delContractComment } from "@/api/oa/contract/contractComment";
+import { getContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
 import { getContractMeeting, addContractMeeting } from "@/api/oa/contract/contractMeeting";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
@@ -501,11 +502,14 @@ export default {
             if (res.data)
               this.commentList = res.data;
             for (let comment of this.commentList) {
-              if (comment.userId != this.$store.getters.userId) {
-                comment.commentUser = undefined;
+              if (comment.commentTime == undefined) {
+                if (comment.userId != this.$store.getters.userId) {
+                  comment.commentUser = undefined;
+                }
+                else {
+                  comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+                }
               }
-              else
-                comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
             }
           });
           getContractMeeting(this.taskForm.formId).then(res => {
@@ -759,12 +763,10 @@ export default {
                 });
               }
               else if (this.taskName == '线上会审') {
-                delContractComment([this.form.contractId]).then(res => {
-                  for (let comment of this.commentList) {
-                    commment.contractId = this.form.contractId
-                    addContractComment(comment);
-                  }
-                })
+                console.log(this.commentList);
+                for (let comment of this.commentList) {
+                  updateContractComment(comment);
+                }
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
                   let userId = res.data.userId;
                   this.$set(this.taskForm.variables, "approval", userId);