From c688decad4852d178ded0bc953ab339ca563dc68 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Wed, 10 Sep 2025 10:54:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/include.html |  2 +-
 .../templates/project/order/edit.html         | 17 +++++++----
 .../project/order/selectPartner.html          |  7 +++++
 .../templates/system/partner/add.html         | 28 ++++++++++++++-----
 .../sip/controller/PartnerInfoController.java |  7 +++--
 .../service/impl/PartnerInfoServiceImpl.java  |  2 ++
 .../impl/ProjectOrderInfoServiceImpl.java     |  4 ++-
 7 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index 3e1a2ace..d375c2d5 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -28,7 +28,7 @@
     <script th:src="@{/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js?v=1.22.6}"></script>
     <!-- jquery-validate 表单验证插件 -->
     <script th:src="@{/ajax/libs/validate/jquery.validate.min.js?v=1.21.0}"></script>
-    <script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.21.0}"></script>
+    <script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.22.0}"></script>
     <script th:src="@{/ajax/libs/validate/messages_zh.js?v=1.21.0}"></script>
     <!-- bootstrap-table 表格树插件 -->
     <script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js?v=1.22.6}"></script>
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/edit.html b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
index 2110f0b8..1283c57a 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
@@ -129,6 +129,16 @@
     .padding-top-20{
         padding-top: 20px;
     }
+    label.error {
+        position: relative;
+        color: #ef392b;
+        right: 0px;
+        font-size: 12px;
+        z-index: 99;
+    }
+    .select2-hidden-accessible + label.error, select.error + label.error{
+        right: 0px;
+    }
 </style>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -621,7 +631,7 @@
             jsonValue: 'v',
             data: data??[
                 {
-                    n: '直签合同',
+                    n: '销售合同',
                     v: '0',
                     s:[{
                         n: '电子订单',
@@ -636,10 +646,7 @@
                 {
                     n: '定制开发合同',
                     v: '2',
-                    s:[{
-                        n: '电子订单',
-                        v: '0'
-                    },
+                    s:[
                         {
                             n: '纸质合同',
                             v: '1'
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/selectPartner.html b/ruoyi-admin/src/main/resources/templates/project/order/selectPartner.html
index dc34427e..34a97676 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/selectPartner.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/selectPartner.html
@@ -39,6 +39,9 @@
                                     class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-success btn-rounded btn-sm" onclick="addPartner()">
+                                <i class="fa fa-plus"></i> 添加
+                            </a>
                         </li>
                     </ul>
                 </div>
@@ -55,9 +58,13 @@
 <script>
     var prefix = ctx + "system/partner";
 
+    function addPartner() {
+        $.modal.open("添加代理商", prefix + "/add?level=04");
+    }
     $(function () {
         var options = {
             url: prefix + "/list",
+            createUrl: prefix + "/add",
             showSearch: true,
             showColumns: false,
             showToggle: false,
diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/add.html b/ruoyi-admin/src/main/resources/templates/system/partner/add.html
index 7c5e5701..694ef821 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/add.html
@@ -5,8 +5,7 @@
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <div class="col-xs-12"><label class="col-sm-12 control-label" style="    text-align: c
-        \enter;
+        <div id="showTitle" class="col-xs-12"><label class="col-sm-12 control-label" style="    text-align: center;
     font-size: 20px;
     color: #f8ac59;">创建代理商之前请先创建代理商用户</label></div>
         <form class="form-horizontal m" id="form-partner-add">
@@ -60,18 +59,18 @@
             </div>
             <div class="col-xs-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">邮件：</label>
+                    <label id="contactEmailLabel" class="col-sm-4 control-label is-required contact-email">邮件：</label>
                     <div class="col-sm-8">
-                        <input name="contactEmail" class="form-control" required type="text">
+                        <input id="contactEmail" name="contactEmail" class="form-control contact-email" required type="text">
                     </div>
                 </div>
             </div>
             <div class="col-xs-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">系统用户：</label>
+                    <label class="col-sm-4 control-label is-required system-user">系统用户：</label>
                     <div class="col-sm-8">
-                        <input name="systemUserName"  onclick="selectPeople()" class="form-control" required type="text">
-                        <input name="systemUserId"  class="form-control" required type="hidden">
+                        <input  name="systemUserName"  onclick="selectPeople()" class="form-control system-user" required type="text">
+                        <input name="systemUserId"  class="form-control system-user" required type="hidden">
                     </div>
                 </div>
             </div>
@@ -105,6 +104,7 @@
     <th:block th:include="include :: jquery-cxselect-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/partner"
+        const initLevel=[[${level}]]
         $("#form-partner-add").validate({
             focusCleanup: true
         });
@@ -118,8 +118,22 @@
 
         });
 
+        $(function (){
+            if(initLevel){
+                $("#showTitle").css("display","none");
+                $("select[name='level']").val(initLevel);
+                $("select[name='level']").attr("disabled",true);
+                $(".contact-email").removeClass("is-required")
+                $(".contact-email").attr("required",false)
+                $(".system-user").attr("required",false)
+                $(".system-user").removeClass("is-required")
+            }
+        })
+
+
         function submitHandler() {
             if ($.validate.form()) {
+                $("select[name='level']").attr("disabled",false);
                 $.operate.save(prefix + "/add", $('#form-partner-add').serialize());
             }
         }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/PartnerInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/PartnerInfoController.java
index 625fd273..aceea83d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/PartnerInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/PartnerInfoController.java
@@ -86,17 +86,18 @@ public class PartnerInfoController extends BaseController
     /**
      * 新增供应商管理
      */
-    @RequiresPermissions("system:partner:add")
+//    @RequiresPermissions("system:partner:add")
     @GetMapping("/add")
-    public String add()
+    public String add(String level,ModelMap modelMap)
     {
+        modelMap.put("level",level);
         return prefix + "/add";
     }
 
     /**
      * 新增保存供应商管理
      */
-    @RequiresPermissions("system:partner:add")
+//    @RequiresPermissions("system:partner:add")
     @Log(title = "供应商管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/PartnerInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/PartnerInfoServiceImpl.java
index a0599298..d44b48d7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/PartnerInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/PartnerInfoServiceImpl.java
@@ -2,6 +2,8 @@ package com.ruoyi.sip.service.impl;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.common.exception.ServiceException;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 78687df9..f63074ae 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -387,7 +387,8 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
         }
         if (ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus())) {
             List<PartnerInfo> partnerInfos = partnerInfoService.selectPartnerInfoByCode(Collections.singletonList(projectOrderInfo.getPartnerCode()));
-            if (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId())) {
+            //线下合同不走省代审批
+            if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType()) && (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId()))) {
                 throw new ServiceException(StrUtil.format("代理商配置[{}]未指定系统用户,无法提交审批", existProjectOrderInfo.getPartnerName()));
             }
             List<ProcessInstance> processInstanceList = todoService.listProcessInstance(existProjectOrderInfo.getOrderCode());
@@ -405,6 +406,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
             //启动流程
             todoService.startProcess(getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType()), new HashMap<String, Object>() {{
                 put("processTemplate", projectOrderInfo.getProcessTemplate());
+                put("processType", projectOrderInfo.getProcessType());
                 put("applyUserName", ShiroUtils.getSysUser().getUserName());
                 put("applyUser", ShiroUtils.getUserId());
                 put("partnerUser",partnerInfos.get(0).getSystemUserId());
