From 1c0ab53c015e084cce0e56138559db2830969e90 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Thu, 5 Sep 2024 15:04:07 +0800
Subject: [PATCH] =?UTF-8?q?[feat]:=20=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=8A=A5=E4=BB=B7=EF=BC=8C=E5=89=8D=E7=AB=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=9A=E5=8A=A1=E5=91=98=E4=B8=8B=E6=8B=89=E7=9A=84?=
 =?UTF-8?q?username=E6=94=B9=E4=B8=BA=E8=8E=B7=E5=8F=96loginName=E4=BC=A0?=
 =?UTF-8?q?=E8=BE=93=EF=BC=8Cmapper=E5=B1=82=E6=94=B9=E4=B8=BA=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E6=96=99=E5=8F=B7=E7=9A=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E4=BB=B7=E7=BC=96=E5=8F=B7=E7=9A=84=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=8A=A5=E4=BB=B7=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysCustomerQuoteController.java           |  5 -----
 .../mapper/system/SysCustomerQuoteMapper.xml  | 19 +++++++++++--------
 .../system/customerQuote/customerQuote.html   | 12 ++++++++++--
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java
index b115a659..5f386507 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java
@@ -98,11 +98,6 @@ public class SysCustomerQuoteController extends BaseController
             SysUser curUser = ShiroUtils.getSysUser();
             Long userId = curUser.getUserId();
             Set<String> roleKeys = roleService.selectRoleKeys(userId);
-            //通过用户名找到业务登录名，重新给业务员赋值
-            String tempLoginName = sysCustomerQuoteService.convertName(sysCustomerQuoteVo);
-            sysCustomerQuoteVo.setBusinessMembers(tempLoginName);
-
-
             startPage();
             List<SysCustomerQuoteVo> list = sysCustomerQuoteService.selectSysCustomerQuoteList(sysCustomerQuoteVo);
             String loginName = ShiroUtils.getLoginName();
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml
index 7c95bbe8..85fd31a2 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml
@@ -70,8 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where dict_type = 'processType'
         ) as p
         on s.instance_type = p.dict_value
-        left join sys_customer_quotechild as c
-        on s.supplierCode = c.quoteId
         <where>
             <if test="businessMembers != null and businessMembers != ''"> and s.business_members = #{businessMembers}</if>
             <if test="supplierCode!= null and supplierCode != ''"> and s.supplierCode like concat('%', #{supplierCode}, '%')</if>
@@ -94,14 +92,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </if>
             <if test="keyword != null and keyword != ''"> and ((s.customerCode like concat('%',#{keyword},'%') or s.customerName like concat('%',#{keyword},'%')))</if>
-            <if test="materialCode != null and materialCode != ''">
-                and c.materialCode like concat('%',#{materialCode},'%')
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and c.materialName like concat('%',#{materialName},'%')
+            <if test="materialCode != null and materialCode != '' || materialName!= null and materialName !=''">
+                and s.supplierCode in (
+                select quoteId from sys_customer_quotechild as child where
+                quoteId = s.supplierCode
+                <if test="materialCode != null and materialCode != ''">
+                    and child.materialCode like concat('%',#{materialCode},'%')
+                </if>
+                <if test="materialName != null and materialName != ''">
+                    and child.materialName like concat('%',#{materialName},'%')
+                </if>
+                )
             </if>
         </where>
-        group by s.id
         order by s.audit_status asc, s.create_time desc
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
index 9ad27bc8..c4b4c8a7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
@@ -114,7 +114,7 @@
                         var usertData = res.rows;
                         for (let i in usertData) {
                             $("select[name='businessMembers']").append(
-                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                                "<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
                         }
                     } else {
                         $.modal.msgError(res.msg);
@@ -232,7 +232,15 @@
                             actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> ');
                             return actions.join('');
                         }
-                    }]
+                    }],
+                rowStyle: function (row, index) {
+                    if (row.auditStatus=="0") {
+                        // 如果审核状态为待审核，则设置为红色
+                        return {css:{"color":"red"}};
+                    }
+                    // 否则使用默认样式
+                    return {};
+                }
                 };
             $.table.init(options);
         });