From 533aa825dbac121ceb56f9ab5acc174c9daee297 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Wed, 24 Apr 2024 19:54:14 +0800
Subject: [PATCH] =?UTF-8?q?[update]=E4=B8=9A=E5=8A=A1=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=EF=BC=9A=E5=9B=A2=E9=98=9F=E7=BB=A9=E6=95=88=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=983~=E4=B8=9A=E5=8A=A1=E5=91=988,?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=9C=8D=E5=8A=A1=E5=91=981~=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=9C=8D=E5=8A=A1=E5=91=984=E5=AD=97.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/erp/domain/ErpUtbItem.java | 205 +++++++++++++-----
 .../resources/mapper/erp/ErpUtbItemMapper.xml |  87 ++++++--
 .../main/resources/templates/erp/utb/utb.html |  34 +--
 3 files changed, 232 insertions(+), 94 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java
index 6f0f8075..2b37721c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java
@@ -37,6 +37,33 @@ public class ErpUtbItem extends BaseEntity
     /** 业务员3 */
     @Excel(name = "业务员3")
     private String salesman3;
+    /** 业务员4 */
+    @Excel(name = "业务员4")
+    private String salesman4;
+
+    /** 业务员5 */
+    @Excel(name = "业务员5")
+    private String salesman5;
+
+    /** 业务员6 */
+    @Excel(name = "业务员6")
+    private String salesman6;
+    /** 业务员7 */
+    @Excel(name = "业务员7")
+    private String salesman7;
+
+    /** 业务员8 */
+    @Excel(name = "业务员8")
+    private String salesman8;
+
+    @Excel(name = "业务服务员1")
+    private String serverPeople1;
+    @Excel(name = "业务服务员2")
+    private String serverPeople2;
+    @Excel(name = "业务服务员1")
+    private String serverPeople3;
+    @Excel(name = "业务服务员2")
+    private String serverPeople4;
 
     /** 经理 */
     @Excel(name = "经理")
@@ -46,95 +73,159 @@ public class ErpUtbItem extends BaseEntity
     @Excel(name = "主管")
     private String manager;
 
-    public void setId(Long id) 
-    {
+    private String salesman;
+
+    private String serverPeople;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public String getUtbId() {
+        return utbId;
     }
-    public void setUtbId(String utbId) 
-    {
+
+    public void setUtbId(String utbId) {
         this.utbId = utbId;
     }
 
-    public String getUtbId() 
-    {
-        return utbId;
+    public String getUtbName() {
+        return utbName;
     }
-    public void setUtbName(String utbName) 
-    {
+
+    public void setUtbName(String utbName) {
         this.utbName = utbName;
     }
 
-    public String getUtbName() 
-    {
-        return utbName;
+    public String getSalesman1() {
+        return salesman1;
     }
-    public void setSalesman1(String salesman1) 
-    {
+
+    public void setSalesman1(String salesman1) {
         this.salesman1 = salesman1;
     }
 
-    public String getSalesman1() 
-    {
-        return salesman1;
+    public String getSalesman2() {
+        return salesman2;
     }
-    public void setSalesman2(String salesman2) 
-    {
+
+    public void setSalesman2(String salesman2) {
         this.salesman2 = salesman2;
     }
 
-    public String getSalesman2() 
-    {
-        return salesman2;
+    public String getSalesman3() {
+        return salesman3;
     }
-    public void setSalesman3(String salesman3) 
-    {
+
+    public void setSalesman3(String salesman3) {
         this.salesman3 = salesman3;
     }
 
-    public String getSalesman3() 
-    {
-        return salesman3;
+    public String getSalesman4() {
+        return salesman4;
     }
-    public void setManage(String manage) 
-    {
-        this.manage = manage;
+
+    public void setSalesman4(String salesman4) {
+        this.salesman4 = salesman4;
+    }
+
+    public String getSalesman5() {
+        return salesman5;
     }
 
-    public String getManage() 
-    {
+    public void setSalesman5(String salesman5) {
+        this.salesman5 = salesman5;
+    }
+
+    public String getSalesman6() {
+        return salesman6;
+    }
+
+    public void setSalesman6(String salesman6) {
+        this.salesman6 = salesman6;
+    }
+
+    public String getSalesman7() {
+        return salesman7;
+    }
+
+    public void setSalesman7(String salesman7) {
+        this.salesman7 = salesman7;
+    }
+
+    public String getSalesman8() {
+        return salesman8;
+    }
+
+    public void setSalesman8(String salesman8) {
+        this.salesman8 = salesman8;
+    }
+
+    public String getServerPeople1() {
+        return serverPeople1;
+    }
+
+    public void setServerPeople1(String serverPeople1) {
+        this.serverPeople1 = serverPeople1;
+    }
+
+    public String getServerPeople2() {
+        return serverPeople2;
+    }
+
+    public void setServerPeople2(String serverPeople2) {
+        this.serverPeople2 = serverPeople2;
+    }
+
+    public String getServerPeople3() {
+        return serverPeople3;
+    }
+
+    public void setServerPeople3(String serverPeople3) {
+        this.serverPeople3 = serverPeople3;
+    }
+
+    public String getServerPeople4() {
+        return serverPeople4;
+    }
+
+    public void setServerPeople4(String serverPeople4) {
+        this.serverPeople4 = serverPeople4;
+    }
+
+    public String getManage() {
         return manage;
     }
-    public void setManager(String manager) 
-    {
-        this.manager = manager;
+
+    public void setManage(String manage) {
+        this.manage = manage;
     }
 
-    public String getManager() 
-    {
+    public String getManager() {
         return manager;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("utbId", getUtbId())
-            .append("utbName", getUtbName())
-            .append("salesman1", getSalesman1())
-            .append("salesman2", getSalesman2())
-            .append("salesman3", getSalesman3())
-            .append("manage", getManage())
-            .append("manager", getManager())
-            .append("remark", getRemark())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+    public void setManager(String manager) {
+        this.manager = manager;
+    }
+
+    public String getSalesman() {
+        return salesman;
+    }
+
+    public void setSalesman(String salesman) {
+        this.salesman = salesman;
+    }
+
+    public String getServerPeople() {
+        return serverPeople;
+    }
+
+    public void setServerPeople(String serverPeople) {
+        this.serverPeople = serverPeople;
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml
index ffa27f5b..81832c13 100644
--- a/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml
@@ -5,23 +5,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.erp.mapper.ErpUtbItemMapper">
     
     <resultMap type="ErpUtbItem" id="ErpUtbItemResult">
-        <result property="id"    column="id"    />
-        <result property="utbId"    column="utbId"    />
-        <result property="utbName"    column="utbName"    />
-        <result property="salesman1"    column="salesman1"    />
-        <result property="salesman2"    column="salesman2"    />
-        <result property="salesman3"    column="salesman3"    />
-        <result property="manage"    column="manage"    />
-        <result property="manager"    column="manager"    />
-        <result property="remark"    column="remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id"               column="id"    />
+        <result property="utbId"            column="utbId"    />
+        <result property="utbName"          column="utbName"    />
+        <result property="salesman1"        column="salesman1"    />
+        <result property="salesman2"        column="salesman2"    />
+        <result property="salesman3"        column="salesman3"    />
+        <result property="salesman4"        column="salesman4"    />
+        <result property="salesman5"        column="salesman5"    />
+        <result property="salesman6"        column="salesman6"    />
+        <result property="salesman7"        column="salesman7"    />
+        <result property="salesman8"        column="salesman8"    />
+        <result property="serverPeople1"    column="server_people1"    />
+        <result property="serverPeople2"    column="server_people2"    />
+        <result property="serverPeople3"    column="server_people3"    />
+        <result property="serverPeople4"    column="server_people4"    />
+        <result property="manage"           column="manage"    />
+        <result property="manager"          column="manager"    />
+        <result property="remark"           column="remark"    />
+        <result property="createBy"         column="create_by"    />
+        <result property="createTime"       column="create_time"    />
+        <result property="updateBy"         column="update_by"    />
+        <result property="updateTime"       column="update_time"    />
     </resultMap>
 
     <sql id="selectErpUtbItemVo">
-        select id, utbId, utbName, salesman1, salesman2, salesman3, manage, manager, remark, create_by, create_time, update_by, update_time from erp_utb_item
+        select id, utbId, utbName, salesman1, salesman2, salesman3, salesman4, salesman5, salesman6, salesman7, salesman8,
+               server_people1, server_people2, server_people3, server_people4,
+               manage, manager, remark, create_by, create_time, update_by, update_time from erp_utb_item
     </sql>
 
     <select id="selectErpUtbItemList" parameterType="ErpUtbItem" resultMap="ErpUtbItemResult">
@@ -29,12 +40,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="utbId != null  and utbId != ''"> and utbId = #{utbId}</if>
             <if test="utbName != null  and utbName != ''"> and utbName like concat('%', #{utbName}, '%')</if>
-            <if test="salesman1 != null  and salesman1 != ''"> and salesman1  like concat('%', #{salesman1}, '%') </if>
-            <if test="salesman2 != null  and salesman2 != ''"> and salesman2  like concat('%', #{salesman2}, '%') </if>
-            <if test="salesman3 != null  and salesman3 != ''"> and salesman3  like concat('%',#{salesman3}, '%') </if>
-            <if test="manage != null  and manage != ''"> and manage like concat('%', #{manage}, '%') </if>
-            <if test="manager != null  and manager != ''"> and manager like concat('%', #{manager}, '%') </if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="salesman != null  and salesman != ''"> or salesman1  like concat('%', #{salesman}, '%') </if>
+            <if test="salesman != null  and salesman != ''"> or salesman2  like concat('%', #{salesman}, '%') </if>
+            <if test="salesman != null  and salesman != ''"> or salesman3  like concat('%',#{salesman}, '%') </if>
+             <if test="salesman != null  and salesman != ''"> or salesman4  like concat('%', #{salesman}, '%') </if>
+              <if test="salesman != null  and salesman != ''"> or salesman5  like concat('%', #{salesman}, '%') </if>
+               <if test="salesman != null  and salesman != ''"> or salesman6  like concat('%', #{salesman}, '%') </if>
+                <if test="salesman != null  and salesman != ''"> or salesman7  like concat('%', #{salesman}, '%') </if>
+                 <if test="salesman != null  and salesman != ''"> or salesman8  like concat('%', #{salesman}, '%') </if>
+             <if test="serverPeople != null  and serverPeople != ''"> and server_people1  like concat('%', #{serverPeople}, '%') </if>
+              <if test="serverPeople != null  and serverPeople != ''"> or server_people2  like concat('%', #{serverPeople}, '%') </if>
+               <if test="serverPeople != null  and serverPeople != ''"> or server_people3  like concat('%', #{serverPeople}, '%') </if>
+                <if test="serverPeople != null  and serverPeople != ''"> or server_people4  like concat('%', #{serverPeople}, '%') </if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
+                and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+             </if>
         </where>
     </select>
     
@@ -52,6 +72,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salesman1 != null">salesman1,</if>
             <if test="salesman2 != null">salesman2,</if>
             <if test="salesman3 != null">salesman3,</if>
+            <if test="salesman4 != null">salesman4,</if>
+            <if test="salesman5 != null">salesman5,</if>
+            <if test="salesman6 != null">salesman6,</if>
+            <if test="salesman7 != null">salesman7,</if>
+            <if test="salesman8 != null">salesman8,</if>
+            <if test="serverPeople1 != null">server_people1,</if>
+            <if test="serverPeople2 != null">server_people2,</if>
+            <if test="serverPeople3 != null">server_people3,</if>
+            <if test="serverPeople4 != null">server_people4,</if>
             <if test="manage != null">manage,</if>
             <if test="manager != null">manager,</if>
             <if test="remark != null">remark,</if>
@@ -67,6 +96,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salesman1 != null">#{salesman1},</if>
             <if test="salesman2 != null">#{salesman2},</if>
             <if test="salesman3 != null">#{salesman3},</if>
+            <if test="salesman4 != null">#{salesman4},</if>
+            <if test="salesman5 != null">#{salesman5},</if>
+            <if test="salesman6 != null">#{salesman6},</if>
+            <if test="salesman7 != null">#{salesman7},</if>
+            <if test="salesman8 != null">#{salesman8},</if>
+            <if test="serverPeople1 != null">#{serverPeople1},</if>
+            <if test="serverPeople2 != null">#{serverPeople2},</if>
+            <if test="serverPeople3 != null">#{serverPeople3},</if>
+            <if test="serverPeople4 != null">#{serverPeople4},</if>
             <if test="manage != null">#{manage},</if>
             <if test="manager != null">#{manager},</if>
             <if test="remark != null">#{remark},</if>
@@ -85,6 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salesman1 != null">salesman1 = #{salesman1},</if>
             <if test="salesman2 != null">salesman2 = #{salesman2},</if>
             <if test="salesman3 != null">salesman3 = #{salesman3},</if>
+            <if test="salesman4 != null">salesman4 = #{salesman4},</if>
+            <if test="salesman5 != null">salesman5 = #{salesman5},</if>
+            <if test="salesman6 != null">salesman6 = #{salesman6},</if>
+            <if test="salesman7 != null">salesman7 = #{salesman7},</if>
+            <if test="salesman8 != null">salesman8 = #{salesman8},</if>
+            <if test="serverPeople1 != null">server_people1 = #{serverPeople1},</if>
+            <if test="serverPeople2 != null">server_people2 = #{serverPeople2},</if>
+            <if test="serverPeople3 != null">server_people3 = #{serverPeople3},</if>
+            <if test="serverPeople4 != null">server_people4 = #{serverPeople4},</if>
             <if test="manage != null">manage = #{manage},</if>
             <if test="manager != null">manager = #{manager},</if>
             <if test="remark != null">remark = #{remark},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
index 6302e2be..b76f1de2 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
@@ -19,24 +19,12 @@
                                 <input type="text" name="utbName"/>
                             </li>
                             <li>
-                                <label>业务员1：</label>
-                                <input type="text" name="salesman1"/>
+                                <label>业务员：</label>
+                                <input type="text" name="salesMan"/>
                             </li>
                             <li>
-                                <label>业务员2：</label>
-                                <input type="text" name="salesman2"/>
-                            </li>
-                            <li>
-                                <label>业务员3：</label>
-                                <input type="text" name="salesman3"/>
-                            </li>
-                            <li>
-                                <label>经理：</label>
-                                <input type="text" name="manage"/>
-                            </li>
-                            <li>
-                                <label>主管：</label>
-                                <input type="text" name="manager"/>
+                                <label>业务服务员2：</label>
+                                <input type="text" name="serverMan"/>
                             </li>
                             <li class="select-time">
                                 <label>录入时间：</label>
@@ -57,6 +45,9 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:utb:add">
                     <i class="fa fa-plus"></i> 添加业务团队
                 </a>
+                <a class="btn btn-success" onclick="showUtbCodf()" shiro:hasPermission="erp:utb:add">
+                    <i class="fa fa-plus"></i> 业务绩效系数配置
+                </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -70,7 +61,6 @@
         var cancelFlag = [[${@permission.hasPermi('erp:utb:cancel')}]];
         var restoreFlag = [[${@permission.hasPermi('erp:utb:restore')}]];
         var prefix = ctx + "erp/utb";
-
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -81,6 +71,8 @@
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "业务团队",
+                fixedColumns: true,
+                rightFixedColumns:1,
                 columns: [{
                     checkbox: true
                 },
@@ -109,6 +101,14 @@
                     field: 'salesman3',
                     title: '业务员3'
                 },
+                {
+                    field: 'serverPeople1',
+                    title: '业务服务员1'
+                },
+                {
+                    field: 'serverPeople2',
+                    title: '业务服务员2'
+                },
                 {
                     field: 'manage',
                     title: '经理'