From 1e6c9ab538dfb6df103696ff7591b4a16484f392 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Tue, 16 Apr 2024 17:59:58 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysCustomerQuoteServiceImpl.java       | 16 ----------------
 .../mapper/system/SysCustomerMapper.xml         |  4 ++--
 .../templates/system/customer/customer.html     | 17 -----------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
index c6e662f1..6513b7c3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
@@ -147,23 +147,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
         String loginName = ShiroUtils.getLoginName();
         sysCustomerQuote.setUpdateBy(loginName);
         SysUser user = ShiroUtils.getSysUser();
-        sysCustomerQuote.setApplyUser(user.getLoginName());
-        sysCustomerQuote.setApplyTime(DateUtils.getNowDate());
         // 启动流程
-        String applyTitle = user.getUserName()+"发起了修改客户报价信息提交审批-"+DateUtils.dateTimeNow();
-        String instanceType = "submit";
-        ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,sysCustomerQuote, user);
-        String processInstanceId = processInstance.getProcessInstanceId();
-        // 提交实例id
-        sysCustomerQuote.setSubmitInstanceId(processInstanceId);
-        // 存在提交完就流程结束的情况
-        boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId);
-        if(processIsFinish){
-            // 审核状态-审核通过
-            sysCustomerQuote.setAuditStatus("1");
-            // 使用状态-是
-            sysCustomerQuote.setUseStatus("2");
-        }
         return sysCustomerQuoteMapper.updateSysCustomerQuote(sysCustomerQuote);
 
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
index 2a728ce9..99f87465 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
@@ -217,7 +217,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryCustomerFax!=null">delivery_customer_fax,</if>
             <if test="businessMembers!=null">business_members,</if>
             <if test="identifyingPeople!=null">identifying_people,</if>
-            <if test="deginflag!=null">degin_flag,</if>
             <if test="customerRemarks!=null">customer_remarks,</if>
             <if test="instanceId != null">instance_id,</if>
             <if test="instanceType != null">instance_type,</if>
@@ -254,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taxRate !=null">#{taxRate},</if>
             <if test="integrityRating !=null">#{integrityRating},</if>
             <if test="rmbRegisteredCapital!=null">#{rmbRegisteredCapital},</if>
-            <if test="registeredCapital!=null">#{registeredCapital!=null},</if>
+            <if test="registeredCapital!=null">#{registeredCapital},</if>
             <if test="paymentTerms!=null">#{paymentTerms},</if>
             <if test="customsCode!=null">#{customsCode},</if>
             <if test="customerContactId!=null">#{customerContactId},</if>
@@ -270,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryCustomerPostal!=null">#{deliveryCustomerPostal},</if>
             <if test="deliveryCustomerFax!=null">#{deliveryCustomerFax},</if>
             <if test="businessMembers!=null">#{businessMembers},</if>
+            <if test="identifyingPeople!=null">#{identifyingPeople}},</if>
             <if test="customerRemarks!=null">#{customerRemarks},</if>
             <if test="instanceId != null">#{instanceId},</if>
             <if test="instanceType != null">#{instanceType},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
index e9cd86e8..ddceff26 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
@@ -127,23 +127,6 @@
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:customer:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
-                           shiro:hasPermission="system:customer:edit">
-                            <i class="fa fa-edit"></i> 修改
-                        </a>
-                        <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-                           shiro:hasPermission="system:customer:remove">
-                            <i class="fa fa-remove"></i> 删除
-                        </a>
-                        <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:customer:export">
-                            <i class="fa fa-download"></i> 导出
-                        </a>
-                        <a class="btn btn-warning single disabled" onclick="exportCustomerInfo()" shiro:hasPermission="system:customer:export" >
-                            <i class="fa fa-download"></i> 导出
-                       </a>
-                                    <a class="btn btn-danger" onclick="oneexport()" shiro:hasPermission="system:customer:export">
-                                        <i class="fa fa-download"></i> 单个导出
-                                    </a>-->
             <a class="btn btn-success"  onclick="addContacts()" shiro:hasPermission="system:contacts:add">
                 <i class="fa fa-plus"></i> 添加其他联系人明细
             </a>