From e559427345798f8d47951545de0302aae0e4dfda Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Thu, 11 Apr 2024 09:27:35 +0800
Subject: [PATCH] '123'

---
 .../com/ruoyi/web/controller/quot/QuotController.java | 11 ++++++-----
 .../technicalConfirm/QuotJsqrController.java          |  2 +-
 .../com/ruoyi/quot/service/impl/QuotServiceImpl.java  |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index 4ab0c71..bf91b58 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -92,6 +92,7 @@ public class QuotController extends BaseController
         quot.setQuotId(UUID.fastUUID().toString());
         quot.setQuotCode(IdUtils.createNo("BJD_",2));
         quot.setCreateBy(getUsername());
+        quot.setUpdateBy(getUsername());
         return toAjax(quotService.insertQuot(quot));
     }
 
@@ -197,18 +198,17 @@ public class QuotController extends BaseController
     public AjaxResult commitQuot(@RequestBody Quot quot)
     {
         String quot_id = quot.getQuotId();
+
+        quot.setUpdateBy(getUsername());
+        quot.setQuotApprovalStatus("1");//报价单 状态设置为 协助中
+        quot.setQuotInquiryDate(DateUtils.getNowDate());//报价单 询价日期设置为 当前日期
         if(StringUtils.isEmpty(quot_id)){
             quot.setQuotId(UUID.fastUUID().toString());
             quot.setQuotCode(IdUtils.createNo("BJD_",2));
             quot.setCreateBy(getUsername());
-            quot.setQuotApprovalStatus("1");//报价单 状态设置为 协助中
-            quot.setQuotInquiryDate(DateUtils.getNowDate());//报价单 询价日期设置为 当前日期
             quotService.insertQuot(quot);
             return success();
         }else{
-            quot.setUpdateBy(getUsername());
-            quot.setQuotApprovalStatus("1");//报价单 状态设置为 协助中
-            quot.setQuotInquiryDate(DateUtils.getNowDate());//报价单 询价日期设置为 当前日期
             quotService.updateQuot(quot);
             return success();
         }
@@ -258,6 +258,7 @@ public class QuotController extends BaseController
             }
 
             quotJsqr.setCreateBy(getUsername());
+            quotJsqr.setUpdateBy(getUsername());
             quotJsqrService.insertQuotJsqr(quotJsqr);//生成报价单-技术确认单
 
             quot.setQuotJsxzConfirmId(quotJsqrId);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
index 36d7c9e..78b6caa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
@@ -322,7 +322,7 @@ public class QuotJsqrController extends BaseController
                 }
             }
             if(!qtFlag){
-                return error("其他协助还未完成");
+                return error("其他(防火、轨道、架空)协助还未完成");
             }
             quot.setQuotJsxzApprovalStatus("2");//报价单-技术协助状态 设置为 已协助
         }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
index dad5b1d..cc78edf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
@@ -63,6 +63,7 @@ public class QuotServiceImpl implements IQuotService
     public int insertQuot(Quot quot)
     {
         quot.setCreateTime(DateUtils.getNowDate());
+        quot.setUpdateTime(DateUtils.getNowDate());
         int rows = quotMapper.insertQuot(quot);
         insertQuotMaterial(quot);
         return rows;