Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -239,6 +239,10 @@ public class InsOrders implements Serializable {
     private String agreementCode;   //协议code
     @TableField(exist = false)
     private String agreementName;   //协议名称
+
+    @TableField(exist = false)
+    private String partnerCompaniesName;   //合作公司简称
+
     public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
         // 2. 组装订单
         this.setQuoteno(String.valueOf(quoteInfoVo.getQuoteno()));

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -44,7 +44,7 @@
         <result property="subOrderId" column="subOrderId" jdbcType="VARCHAR"/>
         <result property="agreementCode" column="agreementCode" jdbcType="VARCHAR"/>
         <result property="agreementName" column="agreementName" jdbcType="VARCHAR"/>
-
+        <result property="partnerCompaniesName" column="partnerCompaniesName" jdbcType="VARCHAR"/>
     </resultMap>
     <resultMap id="OrderResultMap" type="com.ydtech.modules.order.entity.vo.OrderVo">
         <id property="orderno" column="orderno" jdbcType="VARCHAR"/>
@@ -811,13 +811,16 @@
         iac.company_id as company_id,
         iac.inscompany as ins_company,
         agree.agreement_code as agreementCode,
-        agree.agreement_name as agreementName
+        agree.agreement_name as agreementName,
+        company.namesimple as partnerCompaniesName
         from
             ins_area_company iac
         left JOIN
              ins_orders io  on iac.orderno = io.orderno
         left join
             ptl_agreement   agree  on  iac.agreement_id= agree.id
+        left join
+           esm_ins_company   company  on  agree.partner_companies_id= company.id
         <where>
             <if test="agentUserIds != null and agentUserIds.size>0" >
                 AND (