From ca345fabac05d617b3c4a7c7af9087ca683ad6fd Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 9 Jun 2025 09:37:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E4=B8=B0=E5=AF=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ProjectOrderInfo 模型中添加了 bgProperty、agentName、dutyName、partnerEmail、partnerUserName 和 partnerPhone 字段
- 更新了 ProjectOrderInfoMapper.xml 中的 SQL 查询，加入了对新字段的查询和关联
- 优化了查询条件，支持按新字段进行筛选和更新
---
 .../com/ruoyi/sip/domain/ProjectOrderInfo.java  |  9 ++++++++-
 .../mapper/sip/ProjectOrderInfoMapper.xml       | 17 +++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
index b33cb876..4c5f92d7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
@@ -35,6 +35,8 @@ public class ProjectOrderInfo extends BaseEntity {
     private String projectName;
     private String customerName;
     private String industryType;
+    private String bgProperty;
+    private String agentName;
 
     private String province;
 
@@ -127,8 +129,10 @@ public class ProjectOrderInfo extends BaseEntity {
     /**
      * 责任人
      */
-    @Excel(name = "责任人")
+
     private String duty;
+    @Excel(name = "责任人")
+    private String dutyName;
 
     /**
      * 责任人邮箱
@@ -154,6 +158,9 @@ public class ProjectOrderInfo extends BaseEntity {
     @Excel(name = "进货商")
     private String partnerCode;
     private String partnerName;
+    private String partnerEmail;
+    private String partnerUserName;
+    private String partnerPhone;
     private String level;
 
 
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
index 09345f02..b98e238e 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
@@ -45,12 +45,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.id, t1.project_id,t1.province, t1.city, t1.business_person, t1.business_email, t1.business_phone, t1.order_code, t1.currencyType,
                t1.shipment_amount, t1.actual_purchase_amount, t1.order_end_time, t1.delivery_time, t1.company_delivery, t1.notifier,
                t1.notifier_email, t1.notifier_phone, t1.duty, t1.duty_email, t1.duty_phone, t1.order_channel, t1.partner_code, t1.supplier,
-               t1.remark, t1.order_status, t1.create_by, t1.create_time, t1.update_by, t1.update_time
-                ,t2.project_code,t2.project_name,t2.province,t2.customer_name,t2.industry_type
+               t1.remark, t1.order_status, t1.create_by, t1.create_time, t1.update_by, t1.update_time,t1.partner_user_name,t1.partner_email,t1.partner_phone
+                ,t2.project_code,t2.project_name,t2.province,t2.customer_name,t2.customer_code,t2.industry_type,t2.bg_property,t2.agent_code
         ,t3.partner_name,t3.level
+        ,t4.agent_name
+        ,t5.user_name as duty_name
         from project_order_info t1
         left join project_info t2 on t1.project_id = t2.id
         left join partner_info t3 on t1.partner_code=t3.partner_code
+        left join agent_info t4 on t2.agent_code=t4.agent_code
+        left join sys_user t5 on t1.duty=t5.user_id
     </sql>
 
     <select id="selectProjectOrderInfoList" parameterType="ProjectOrderInfo" resultMap="ProjectOrderInfoResult">
@@ -132,6 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dutyPhone != null">duty_phone,</if>
             <if test="orderChannel != null">order_channel,</if>
             <if test="partnerCode != null">partner_code,</if>
+            <if test="partnerEmail != null">partner_email,</if>
+            <if test="partnerUserName != null">partner_user_name,</if>
+            <if test="partnerPhone != null">partner_phone,</if>
             <if test="supplier != null">supplier,</if>
             <if test="remark != null">remark,</if>
             <if test="orderStatus != null">order_status,</if>
@@ -162,6 +169,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dutyPhone != null">#{dutyPhone},</if>
             <if test="orderChannel != null">#{orderChannel},</if>
             <if test="partnerCode != null">#{partnerCode},</if>
+            <if test="partnerEmail != null">#{partnerEmail},</if>
+            <if test="partnerUserName != null">#{partnerUserName},</if>
+            <if test="partnerPhone != null">#{partnerPhone},</if>
             <if test="supplier != null">#{supplier},</if>
             <if test="remark != null">#{remark},</if>
             <if test="orderStatus != null">#{orderStatus},</if>
@@ -196,6 +206,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dutyPhone != null">duty_phone = #{dutyPhone},</if>
             <if test="orderChannel != null">order_channel = #{orderChannel},</if>
             <if test="partnerCode != null">partner_code = #{partnerCode},</if>
+            <if test="partnerEmail != null">partner_email=#{partnerEmail},</if>
+            <if test="partnerUserName != null">partner_user_name=#{partnerUserName},</if>
+            <if test="partnerPhone != null">partner_phone=#{partnerPhone},</if>
             <if test="supplier != null">supplier = #{supplier},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="orderStatus != null">order_status = #{orderStatus},</if>