From 437ea0e1b9d84fe7f3c1432b14f089c0e6fbea64 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Thu, 25 Apr 2024 19:53:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[update]=E6=8A=80=E6=9C=AF=E7=BB=A9?=
 =?UTF-8?q?=E6=95=88:=E6=B7=BB=E5=8A=A0=E7=94=9F=E6=88=90=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E7=BB=A9=E6=95=88ID=E7=9A=84=E6=96=B9=E6=B3=95,?=
 =?UTF-8?q?=E5=B9=B6=E5=9C=A8=E6=B7=BB=E5=8A=A0=E6=97=B6=E6=94=BE=E5=85=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E4=B8=AD,=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E7=BB=A9=E6=95=88=E5=AD=97=E6=AE=B5ID=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAString=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ErpTechniqueMeritsController.java         | 10 ++++++-
 .../system/domain/ErpTechniqueMerits.java     |  6 ++--
 .../service/IErpTechniqueMeritsService.java   |  2 ++
 .../impl/ErpTechniqueMeritsServiceImpl.java   |  9 +++++-
 .../system/ErpTechniqueMeritsMapper.xml       |  2 +-
 .../templates/system/customerQuote/edit.html  |  9 ++++--
 .../templates/system/technicalMerits/add.html | 28 +++++++++++++++----
 .../system/technicalMerits/detail.html        |  4 ++-
 .../system/technicalMerits/edit.html          |  4 ++-
 .../technicalMerits/technicalMerits.html      |  4 ++-
 10 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java
index b273e6b1..de6f422f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java
@@ -1,6 +1,9 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
+
+import com.ruoyi.ck.utils.Result;
+import com.ruoyi.common.core.redis.RedisCache;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -29,7 +32,6 @@ public class ErpTechniqueMeritsController extends BaseController
 
     @Autowired
     private IErpTechniqueMeritsService erpTechniqueMeritsService;
-
     @RequiresPermissions("system:technicalMerits:view")
     @GetMapping()
     public String technicalMerits()
@@ -154,4 +156,10 @@ public class ErpTechniqueMeritsController extends BaseController
     {
         return AjaxResult.success(erpTechniqueMeritsService.selectErpTechniqueMeritsById(id));
     }
+
+    @GetMapping("/getId")
+    @ResponseBody
+    public Result getId() throws Exception {
+        return Result.getSuccessResult(erpTechniqueMeritsService.getId());
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java
index 214fb8fb..0e57ea73 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java
@@ -22,7 +22,7 @@ public class ErpTechniqueMerits extends BaseEntity
 
     /** 技术绩效ID */
     @Excel(name = "技术绩效ID")
-    private Long techniqueId;
+    private String techniqueId;
 
     /** 员工ID */
     @Excel(name = "员工ID")
@@ -68,12 +68,12 @@ public class ErpTechniqueMerits extends BaseEntity
     {
         return id;
     }
-    public void setTechniqueId(Long techniqueId) 
+    public void setTechniqueId(String techniqueId)
     {
         this.techniqueId = techniqueId;
     }
 
-    public Long getTechniqueId() 
+    public String getTechniqueId()
     {
         return techniqueId;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IErpTechniqueMeritsService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IErpTechniqueMeritsService.java
index 21b986b1..167383cf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IErpTechniqueMeritsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IErpTechniqueMeritsService.java
@@ -72,4 +72,6 @@ public interface IErpTechniqueMeritsService
      * @return
      */
     int restoreErpTechniqueMeritsById(Long id);
+
+   public Object getId();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/ErpTechniqueMeritsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/ErpTechniqueMeritsServiceImpl.java
index f167881f..620d79cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/ErpTechniqueMeritsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/ErpTechniqueMeritsServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +23,8 @@ public class ErpTechniqueMeritsServiceImpl implements IErpTechniqueMeritsService
 {
     @Autowired
     private ErpTechniqueMeritsMapper erpTechniqueMeritsMapper;
-
+   @Autowired
+   private RedisCache redisCache;
     /**
      * 查询技术绩效列表
      * 
@@ -123,4 +126,8 @@ public class ErpTechniqueMeritsServiceImpl implements IErpTechniqueMeritsService
     {
         return erpTechniqueMeritsMapper.restoreErpTechniqueMeritsById(id);
     }
+    @Override
+    public Object getId(){
+        return redisCache.generateNo("JSJX");
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/system/ErpTechniqueMeritsMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/ErpTechniqueMeritsMapper.xml
index bfb50acc..45580386 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/ErpTechniqueMeritsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/ErpTechniqueMeritsMapper.xml
@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.system.mapper.ErpTechniqueMeritsMapper">
     
     <resultMap type="ErpTechniqueMerits" id="ErpTechniqueMeritsResult">
-        <result property="id"    column="id"    />
+        <result property="id"   column="id"    />
         <result property="techniqueId"    column="technique_id"    />
         <result property="staffNo"    column="staff_no"    />
         <result property="makeName"    column="make_name"    />
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
index abd0cfe7..7c18958b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
@@ -23,7 +23,7 @@
         <div class="form-group" shiro:hasPermission="system:customerQuote:edit">
             <label class="col-sm-4 control-label">业务员：</label>
             <div class="col-sm-8">
-                <select readonly class="form-control" name="businessMembers" required th:field="*{businessMembers}">
+                <select class="form-control" name="businessMembers"  th:field="*{businessMembers}" readonly required>
                     <option value="">请选择</option>
                 </select>
             </div>
@@ -43,7 +43,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">报价币种：</label>
             <div class="col-sm-8">
-                <select class="form-control" id="commonCurrency_edit" th:with="dictList=${@dict.getType('sys_common_currency')}" name="commonCurrency"  required>
+                <select class="form-control" id="commonCurrency_edit" th:field="*{commonCurrency}" th:with="dictList=${@dict.getType('sys_common_currency')}" name="commonCurrency"  required>
                     <option value="">请选择</option>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" ></option>
                 </select>
@@ -68,7 +68,10 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">国内税率：</label>
             <div class="col-sm-8">
-                <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}"  class="form-control" type="number" placeholder="13%" />
+                <div class="input-group">
+                    <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control"  placeholder="13" />
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/add.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/add.html
index 6c01a05b..13837c6a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/add.html
@@ -9,7 +9,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">技术绩效ID：</label>
                 <div class="col-sm-8">
-                    <input name="techniqueId" class="form-control" type="text">
+                    <input name="techniqueId" class="form-control" type="text" disabled>
                 </div>
             </div>
             <div class="form-group">    
@@ -33,7 +33,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">币种：</label>
                 <div class="col-sm-8">
-                    <input name="currency" class="form-control" type="text">
+                    <select name="currency" class="form-control" th:with="currency=${@dict.getType('sys_common_currency')}">
+                        <option th:each="dict : ${currency}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
@@ -71,10 +73,24 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var prefix = ctx + "system/technicalMerits"
-        $("#form-technicalMerits-add").validate({
-            focusCleanup: true
-        });
-
+        $("#form-technicalMerits-add").validate({focusCleanup: true});
+        $(function (){
+            $.ajax({
+                url: prefix + "/getId",
+                type: "get",
+                dateType: "json",
+                success: function (resp) {
+                    if (resp.code === 0) {
+                        $("#form-technicalMerits-add input[name='techniqueId']").val(resp.data);
+                    } else {
+                        $.modal.msgError("失败啦");
+                    }
+                },
+                error: function () {
+                    $.modal.msgError("后台出错啦！");
+                }
+            });
+        })
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-technicalMerits-add').serialize());
diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/detail.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/detail.html
index 700ef920..a4558921 100644
--- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/detail.html
@@ -34,7 +34,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">币种：</label>
                 <div class="col-sm-8">
-                    <input name="currency" th:field="*{currency}" class="form-control" type="text">
+                    <select name="currency" class="form-control" th:with="currency=${@dict.getType('sys_common_currency')}" th:field="*{currency}">
+                        <option th:each="dict : ${currency}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/edit.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/edit.html
index 700ef920..a4558921 100644
--- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/edit.html
@@ -34,7 +34,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">币种：</label>
                 <div class="col-sm-8">
-                    <input name="currency" th:field="*{currency}" class="form-control" type="text">
+                    <select name="currency" class="form-control" th:with="currency=${@dict.getType('sys_common_currency')}" th:field="*{currency}">
+                        <option th:each="dict : ${currency}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
index a4f1cd08..d793d22c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
+++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
@@ -37,7 +37,9 @@
                 </form>
             </div>
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:technicalMerits:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
                 <a class="btn btn-warning">
                     <i class="fa fa-download"></i> 导入已发放绩效
                 </a>

From b0e9f7d618db76fe324b9da04a9c399140beb440 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 26 Apr 2024 17:11:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[update]=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=9A=E4=B8=BB=E7=AE=A1=E5=8F=AF=E4=BB=A5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E4=B8=9A=E5=8A=A1=E5=91=98,?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=8F=E7=90=86=E5=8F=AF=E4=BB=A5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BD=92=E5=B1=9E=E4=B8=8B=E7=9A=84=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=91=98=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=91=98=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=87=AA=E5=B7=B1=E7=94=B3=E8=AF=B7=E7=9A=84?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysSalesOrderController.java   | 61 +++++--------------
 .../impl/SysSalesOrderServiceImpl.java        |  2 +-
 2 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
index fd3692fb..22a121da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
@@ -101,64 +101,33 @@ public class SysSalesOrderController extends BaseController
     @ResponseBody
     public TableDataInfo list(SysSalesOrderVo sysSalesOrderVo)
     {
-        startPage();
-        List<SysSalesOrderVo> list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
         try {
+            startPage();
+            List<SysSalesOrderVo> list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
             SysUser curUser = ShiroUtils.getSysUser();
+            String loginName = ShiroUtils.getLoginName();
             Long userId = curUser.getUserId();
             Set<String> roleKeys = roleService.selectRoleKeys(userId);
-            List<SysUser> sysUserlist = sysUserService.selectRoleToUserList("ywy");
-            if(roleKeys.contains("ywjlRole")){
-                sysUserlist = sysUserlist.stream().filter(item -> {
-                    return item.getDept().getDeptId() == curUser.getDeptId();
-                }).collect(Collectors.toList());
-                List<SysUser> finalSysUserlist = sysUserlist;
-                finalSysUserlist.add(curUser);
+            List<SysUser> sysUserlist = sysUserService.selectRoleToUserList("ywyRole");
+            sysUserlist.add(curUser);
+            if (roleKeys.contains("ywjlRole")) {
+                List<SysUser> findUser = sysUserlist.stream().filter(item -> (item.getDeptId().equals(curUser.getDeptId()))).collect(Collectors.toList());
+                Set<String> user = findUser.stream().map(SysUser::getLoginName).collect(Collectors.toSet());
                 startPage();
-                list = list.stream().filter(item -> {
-                    for (SysUser sysUser : finalSysUserlist) {
-                        if (sysUser.getLoginName().equals(item.getApplyUser())) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }).collect(Collectors.toList());
-
-                return getDataTable(list);
+                List<SysSalesOrderVo> list2 = list.stream().filter(item -> user.contains(item.getApplyUser())).collect(Collectors.toList());
+                return getDataTable(list2);
             }
-            if(roleKeys.contains("ywzgRole")){
-                sysUserlist = sysUserlist.stream().filter(item -> {
-                    return item.getDept().getDeptId() == curUser.getDeptId();
-                }).collect(Collectors.toList());
-                List<SysUser> finalSysUserlist = sysUserlist;
-                finalSysUserlist.add(curUser);
-                startPage();
-                list = list.stream().filter(item -> {
-                    for (SysUser sysUser : finalSysUserlist) {
-                        if (sysUser.getLoginName().equals(item.getApplyUser())) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }).collect(Collectors.toList());
-                return getDataTable(list);
-            }
-            // 业务员角色只能看到自己创建的数据
-            if(roleKeys.contains("ywyRole")){
-                sysSalesOrderVo.setApplyUser(curUser.getLoginName());
+                    // 业务员角色只能看到自己创建的数据
+            if (roleKeys.contains("ywyRole")) {
+                sysSalesOrderVo.setApplyUser(curUser.getUserName());
                 startPage();
                 list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
                 return getDataTable(list);
             }
-           if(!roleKeys.contains("ywzjRole") && !roleKeys.contains("ywzjRole") && !roleKeys.contains("ywzjRole")){
-               sysSalesOrderVo.setApplyUser(curUser.getLoginName());
-               startPage();
-               list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
-           }
-        }catch (NullPointerException e){
+            return getDataTable(list);
+        }catch(NullPointerException e){
             throw new NullPointerException("当前用户没有申请客户资料");
         }
-        return getDataTable(list);
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
index 77e5c31f..a7c0f06b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
@@ -170,7 +170,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
     public int insertSysSalesOrder(SysSalesOrder sysSalesOrder){
         String loginName = ShiroUtils.getLoginName();
         sysSalesOrder.setCreateBy(loginName);
-        sysSalesOrder.setCreateTime(new Date());
+        sysSalesOrder.setCreateTime(DateUtils.getNowDate());
         int result = sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder);
         sysSalesOrder.getSalesOrderId();
         int s = sysSalesOrder.getSysSalesOrderChildList().size();

From 204206bf2447193fec6178753267d972e1e1aecf Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 26 Apr 2024 17:45:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[update]=E5=AE=A2=E6=88=B7=E8=B5=84?=
 =?UTF-8?q?=E6=96=99:=E4=B8=9A=E5=8A=A1=E5=91=98=E5=9B=9E=E6=98=BE,?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=9A=E5=8A=A1=E5=91=98=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E9=80=89=EF=BC=8C=E4=B8=94=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BB=A5=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E5=81=9A=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E4=B8=9A=E5=8A=A1=E7=BB=84=E5=AF=B9=E8=B1=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E4=B8=9A=E5=8A=A1=E7=BB=8F=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=BB=E7=AE=A1=EF=BC=8C=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=91=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysCustomerController.java     | 18 ++++----
 .../controller/SysSalesOrderController.java   |  2 +-
 .../service/impl/SysCustomerServiceImpl.java  | 41 +++++++++----------
 .../templates/system/customer/add.html        |  9 ++--
 .../templates/system/customer/detail.html     |  2 +-
 .../templates/system/customer/edit.html       |  3 +-
 .../system/customer/taskModifyApply.html      |  2 +
 .../system/customer/taskYwjlVerify.html       |  2 +
 .../system/customer/taskYwzgVerify.html       |  2 +
 .../system/customer/taskZozjVerify.html       |  3 +-
 10 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
index a8963d89..c68589ab 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
@@ -103,11 +103,12 @@ public class SysCustomerController extends BaseController
     {
         SysUser curUser = ShiroUtils.getSysUser();
         Long userId = curUser.getUserId();
+        Set<String> roleKeys = roleService.selectRoleKeys(userId);
         // 业务员角色只能看到自己创建的数据
-        SysRole role = roleService.selectRoleById(curUser.getRoleId());
-        if (role.getRoleKey().equals("ywyRole")){
-            sysCustomerVo.setCreateBy(curUser.getUserName());
+        if (roleKeys.contains("ywyRole")) {
+            sysCustomerVo.setApplyUser(curUser.getLoginName());
         }
+
         startPage();
         List<SysCustomerVo> list = sysCustomerService.selectSysCustomerList(sysCustomerVo);
         return getDataTable(list);
@@ -148,9 +149,11 @@ public class SysCustomerController extends BaseController
     public AjaxResult addSave(SysCustomer sysCustomer)
     {
         //判断是否客户对象增加重复
+        SysUser sysUser = ShiroUtils.getSysUser();
         SysCustomerVo sysCustomer1 = new SysCustomerVo();
         sysCustomer1.setEnterpriseName(sysCustomer.getEnterpriseName());
         sysCustomer1.setCustomerPurser(sysCustomer.getCustomerPurser());
+        List<SysPost> sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId());
         SysCustomerVo sysCustomerVo2 = sysCustomerService.selectSysCustomerByCustomer(sysCustomer1);
         if(ObjectUtil.isNotNull(sysCustomerVo2)){
             return AjaxResult.error("该客户已被其他业务员添加,"+" 客户名称 :" +
@@ -158,9 +161,8 @@ public class SysCustomerController extends BaseController
                     "事业部 :  "+ sysCustomerVo2.getCustomerPurser() +
                     "  业务员 : " + sysCustomerVo2.getBusinessMembers());
         }
-        SysUser sysUser = ShiroUtils.getSysUser();
-        List<SysPost> sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId());
-        sysPostsList.get(0).getPostName();
+
+
         String operPeople = sysUser.getDept().getDeptName() + "/" + sysPostsList.get(0).getPostName()+"/" + sysUser.getUserName();
         //通过用户获取部门信息
         // 使用状态-否
@@ -233,7 +235,7 @@ public class SysCustomerController extends BaseController
         sysCustomerOper.setOperPeople(operPeople);
         sysCustomerOper.setOperStatus(sysCustomer.getAuditStatus());
         ProcessInstance processInstance = sysCustomerService.updateSysCustomerVo(sysCustomer);
-        if(processInstance != null){
+        if(processInstance.getId() != null){
             sysCustomerOper.setOperStatus("0");
         }else{
             sysCustomerOper.setOperStatus("1");
@@ -479,7 +481,7 @@ public class SysCustomerController extends BaseController
     }
     @RequestMapping("/getCustomerSelList")
     @ResponseBody
-    public AjaxResult ggetCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){
+    public AjaxResult getCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){
         SysCustomerVo sysCustomerVo = new SysCustomerVo();
         sysCustomerVo.setKeyword(keyword);
         return success(sysCustomerService.selectSysCustomerList(sysCustomerVo));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
index 22a121da..ecf36799 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
@@ -494,7 +494,7 @@ public class SysSalesOrderController extends BaseController
     @ResponseBody
     public TableDataInfo getBinessMembers(){
         startPage();
-        List<SysUser> list = sysUserService.selectRoleToUserList("ywyRole");
+        List<SysUser> list = sysUserService.selectRoleToUserList("ywyRole,ywjlRole,ywzgRole");
         return getDataTable(list);
     }
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
index 5e1ec458..6d6ef4b1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
@@ -83,28 +83,28 @@ public class SysCustomerServiceImpl implements ISysCustomerService
     /**
      * 查询客户基本信息列表
      *
-     * @param  sysCustomerVo1
+     * @param  sysCustomer
      * @return 客户基本信息
      */
     @Override
-    public List<SysCustomerVo> selectSysCustomerList(SysCustomerVo sysCustomerVo1)
+    public List<SysCustomerVo> selectSysCustomerList(SysCustomerVo sysCustomer)
     {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        Page<SysCustomerVo> list = (Page<SysCustomerVo>) sysCustomerMapper.selectSysCustomerList(sysCustomerVo1);
+        Page<SysCustomerVo> list = (Page<SysCustomerVo>) sysCustomerMapper.selectSysCustomerList(sysCustomer);
         Page<SysCustomerVo>  returnList = new Page<>();
         //PageHelper 仅对第一List分页有效
-        for(SysCustomerVo sysCustomer : list){
-            SysUser sysUser = userMapper.selectUserByLoginName(sysCustomer.getCreateBy());
+        for(SysCustomerVo sysCustomerVo : list){
+            SysUser sysUser = userMapper.selectUserByLoginName(sysCustomerVo.getCreateBy());
             if (sysUser != null) {
-                sysCustomer.setCreateBy(sysUser.getUserName());
+                sysCustomerVo.setCreateBy(sysUser.getUserName());
             }
-            SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomer.getApplyUser());
+            SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomerVo.getApplyUser());
             if (sysUser2!=null){
-                sysCustomer.setApplyUserName(sysUser2.getUserName());
+                sysCustomerVo.setApplyUserName(sysUser2.getUserName());
             }
-            String instanceId = sysCustomer.getInstanceId();
+            String instanceId = sysCustomerVo.getInstanceId();
             // 当前环节
             if (StringUtils.isNotBlank(instanceId)) {
                 List<Task> taskList = taskService.createTaskQuery()
@@ -114,27 +114,27 @@ public class SysCustomerServiceImpl implements ISysCustomerService
                 if (!CollectionUtils.isEmpty(taskList)) {
                     TaskEntityImpl task = (TaskEntityImpl) taskList.get(0);
                     String taskId = task.getId();
-                    sysCustomer.setTaskId(taskId);
+                    sysCustomerVo.setTaskId(taskId);
                     // 设置待办用户
                     List<String> todoUserList = todoItemMapper.selectUndealTodoUserList(taskId);
                     if(!CollectionUtils.isEmpty(taskList)){
-                        sysCustomer.setTodoUserId(String.join(",",todoUserList));
+                        sysCustomerVo.setTodoUserId(String.join(",",todoUserList));
                     }
                     if (task.getSuspensionState() == 2) {
-                        sysCustomer.setTaskName("已挂起");
-                        sysCustomer.setSuspendState("2");
+                        sysCustomerVo.setTaskName("已挂起");
+                        sysCustomerVo.setSuspendState("2");
                     } else {
-                        sysCustomer.setTaskName(task.getName());
-                        sysCustomer.setSuspendState("1");
+                        sysCustomerVo.setTaskName(task.getName());
+                        sysCustomerVo.setSuspendState("1");
                     }
                 } else {
                     // 已办结或者已撤销
-                    sysCustomer.setTaskName("已结束");
+                    sysCustomerVo.setTaskName("已结束");
                 }
             } else {
-                sysCustomer.setTaskName("未启动");
+                sysCustomerVo.setTaskName("未启动");
             }
-            returnList.add(sysCustomer);
+            returnList.add(sysCustomerVo);
         }
         returnList.setTotal(CollectionUtils.isEmpty(list) ? 0 : list.getTotal());
         returnList.setPageNum(pageNum);
@@ -281,7 +281,6 @@ public class SysCustomerServiceImpl implements ISysCustomerService
 
     @Override
     public int add(SysCustomer sysCustomer) {
-
         return sysCustomerMapper.insertSysCustomer(sysCustomer);
     }
 
@@ -387,8 +386,8 @@ public class SysCustomerServiceImpl implements ISysCustomerService
 
 
     private ProcessInstance startProcessInstance(String applyTitle, String instanceType, SysCustomer sysCustomer, SysUser user) {
-        Long materialId = sysCustomer.getId();
-        String businessKey = materialId.toString(); // 实体类 ID，作为流程的业务 key
+        Long customerId = sysCustomer.getId();
+        String businessKey = customerId.toString(); // 实体类 ID，作为流程的业务 key
         String key = "customer";
         Map<String,Object> variables = new HashMap<>();
         // 构造authority传参
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
index a7493023..6c182828 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -76,7 +76,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-6 control-label" is-required>法人代表：</label>
+                <label class="col-sm-6 control-label is-required" >法人代表：</label>
                 <div class="col-sm-6">
                     <input required name="legalRepresentative" class="form-control" type="text">
                 </div>
@@ -91,7 +91,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-6 control-label" is-required>开票公司名称：</label>
+                <label class="col-sm-6 control-label is-required">开票公司名称：</label>
                 <div class="col-sm-6">
                     <input required name="invoicingCompanyName" class="form-control" type="text">
                 </div>
@@ -242,7 +242,7 @@
             <div class="form-group">
                 <label class="col-sm-6 control-label">业务员：</label>
                 <div class="col-sm-6">
-                    <select name="businessMembers" class="form-control" shiro:partial="customer:selectBusinessMembers">
+                    <select name="businessMembers" class="form-control"  disabled>
                         <option value="">无</option>
                     </select>
                 </div>
@@ -261,6 +261,7 @@
     <script th:inline="javascript">
         var prefix = ctx + "system/customer"
         var userName = [[${@permission.getPrincipalProperty('userName')}]];
+        var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
         $(function() {
             //获取单号
             $.ajax({
@@ -289,7 +290,7 @@
                         for (let i in usertData) {
                             $("select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                         }
-
+                        $("select[name='businessMembers']").val(loginName);
                     } else {
                         $.modal.msgError(res.msg);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
index 8dfd76ed..6196e0a5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
@@ -307,7 +307,7 @@
             $("#form-customer-detail select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
           }
           let userName = [[${@permission.getPrincipalProperty('userName')}]];
-          $("#form-customer-detail select[name='businessMembers']").val(userName).trigger("change")
+          $("#form-customer-detail select[name='businessMembers']").val(customer.businessMembers);
         } else {
           $.modal.msgError(res.msg);
         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
index e17130a5..2461c474 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
@@ -268,8 +268,8 @@
     <script th:src="@{/ajax/libs/vue/vue.js}"></script>
     <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
     <script th:inline="javascript">
-
         var prefix = ctx + "system/customer";
+        var customer = [[${sysCustomer}]];
         $("#form-customer-edit").validate({focusCleanup: true});
 
         function submitHandler() {
@@ -289,6 +289,7 @@
                             $("select[name='businessMembers']").append("<option value='"
                                 + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                         }
+                        $("select[name='businessMembers']").val(customer.businessMembers);
                     } else {
                         $.modal.msgError(res.msg);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
index 04507666..e35e284e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
@@ -307,6 +307,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:src="javascript">
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({onkeyup: false, rules:{}, messages: {},focusCleanup: true});
     $(function(){
         $.ajax({
@@ -320,6 +321,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
index e7133a4f..b3043c32 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
@@ -308,6 +308,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({focusCleanup: true});
     $(function(){
         $.ajax({
@@ -321,6 +322,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
index a633688c..a01fc3e9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
@@ -309,6 +309,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({focusCleanup: true });
     $(function(){
         $.ajax({
@@ -322,6 +323,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
index 925450d0..ad3416c4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
@@ -307,8 +307,8 @@
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
-
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({focusCleanup: true});
     $(function(){
         $.ajax({
@@ -322,6 +322,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }