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