From b4c4649e694e1d882dd0211861a3eb8c5d18c4c6 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Thu, 5 Sep 2024 15:08:35 +0800
Subject: [PATCH] =?UTF-8?q?[feat]:=20=E4=BF=AE=E6=94=B9=EF=BC=9A=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=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

---
 .../controller/SysSalesOrderController.java   |  4 ++--
 .../mapper/system/SysSalesOrderMapper.xml     | 24 +++++++++++--------
 .../system/salesOrder/salesOrder.html         | 12 ++++++++--
 3 files changed, 26 insertions(+), 14 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 f7d0073c..00b50002 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
@@ -145,8 +145,8 @@ public class SysSalesOrderController extends BaseController
             sysSalesOrderVo.setApplyUser(loginName);
         }
         //通过用户名找到业务登录名，重新给业务员赋值
-        String tempLoginName = sysSalesOrderService.convertName(sysSalesOrderVo);
-        sysSalesOrderVo.setBusinessMembers(tempLoginName);
+//        String tempLoginName = sysSalesOrderService.convertName(sysSalesOrderVo);
+//        sysSalesOrderVo.setBusinessMembers(tempLoginName);
         List<SysSalesOrderVo> list =  sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
         return getDataTable(list);
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
index 16a792b1..ba99e8a2 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
@@ -107,11 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.apply_time,p.dict_value as instance_type_name
         from sys_sales_order as s
         left join(
-        select dict_value,dict_label from sys_dict_data
-        where dict_type = 'processType'
+            select dict_value,dict_label from sys_dict_data
+            where dict_type = 'processType'
         ) as p
         on s.instance_type = p.dict_value
-        left join sys_sales_order_child as c on s.sales_order_code = c.quoteId
         <where>
             <if test="salesOrderCode != null  and salesOrderCode != ''"> and s.sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
             <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and s.sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
@@ -131,12 +130,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginCreateTime != null  and params.beginCreatTime != ''  and params.endCreateTime != null and params.endCreateTime != '' ">
                 and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </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.sales_order_code in (
+                    select quoteId from sys_sales_order_child as child where
+                    quoteId = s.sales_order_code
+                <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.sales_order_id
         order by s.audit_status asc,s.create_time desc
     </select>
     <select id="selectSysSalesOrderById" parameterType="Long" resultMap="SysSalesOrderResult">
@@ -196,9 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </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>
+            <if test="materialName != null and materialName != ''">and c.materialName like concat('%',#{materialName},'%')</if>
         </where>
         group by s.sales_order_id
         order by s.audit_status asc,s.create_time desc
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
index b9a2f353..9ae0a79f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -248,7 +248,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);
@@ -416,7 +416,15 @@
                         return actions.join('');
                     }
                 }
-            ]
+            ],
+            rowStyle: function (row, index) {
+                if (row.auditStatus=="0") {
+                    // 如果审核状态为待审核，则设置为红色
+                    return {css:{"color":"red"}};
+                }
+                // 否则使用默认样式
+                return {};
+            }
         };
         $.table.init(options);
     });