1.0.67 添加合同回显字段

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java

@@ -309,4 +309,53 @@ public class ErpContractInfoVo implements Serializable {
     @ExcelProperty(value = "办公地")
     private String detailedAddress;
 
+    /**
+     * 甲方商务联系人
+     */
+    @ExcelProperty(value = "甲方商务联系人")
+    private String oneBusinessContact;
+
+    /**
+     * 甲方商务联系人电话
+     */
+    @ExcelProperty(value = "甲方商务联系人电话")
+    private String oneBusinessContactPhone;
+
+    /**
+     * 甲方技术联系人
+     */
+    @ExcelProperty(value = "甲方技术联系人")
+    private String oneTechnicalContact;
+
+    /**
+     * 甲方技术联系人电话
+     */
+    @ExcelProperty(value = "甲方技术联系人电话")
+    private String oneTechnicalContactPhone;
+
+    /**
+     * 乙方商务联系人
+     */
+    @ExcelProperty(value = "乙方商务联系人")
+    private String twoBusinessContact;
+
+    /**
+     * 乙方商务联系人电话
+     */
+    @ExcelProperty(value = "乙方商务联系人电话")
+    private String twoBusinessContactPhone;
+
+    /**
+     * 乙方技术联系人
+     */
+    @ExcelProperty(value = "乙方技术联系人")
+    private String twoTechnicalContact;
+
+    /**
+     * 乙方技术联系人电话
+     */
+    @ExcelProperty(value = "乙方技术联系人电话")
+    private String twoTechnicalContactPhone;
+
+
 }

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml

@@ -55,7 +55,15 @@
                c2.customer_name twoCustomerName,
                d.dept_name,
                u.nick_name         contractManagerName,
-               c1.detailed_address detailedAddress
+               c1.detailed_address        detailedAddress,
+               c1.business_contact        oneBusinessContact,
+               c1.business_contact_phone  oneBusinessContactPhone,
+               c1.technical_contact       oneTechnicalContact,
+               c1.technical_contact_phone oneTechnicalContactPhone,
+               c2.business_contact        twoBusinessContact,
+               c2.business_contact_phone  twoBusinessContactPhone,
+               c2.technical_contact       twoTechnicalContact,
+               c2.technical_contact_phone twoTechnicalContactPhone
         from erp_contract_info t
                  left join crm_customer_info c1 on t.one_customer_id = c1.customer_id
                  left join crm_customer_info c2 on t.two_customer_id = c2.customer_id