dcs 1 天之前
父节点
当前提交
0620ed3932

+ 2 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/dao/OrderInfoDao.java

@@ -43,4 +43,6 @@ public interface OrderInfoDao {
 
     List<Map<String, Object>> countPay(OrderInfo orderInfo);
 
+    OrderInfo getByOrganizationName(long id);
+
 }

+ 26 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/OrderInfo.java

@@ -115,6 +115,16 @@ public class OrderInfo {
      */
     private long payOrganizationId;
 
+    /**
+     * 组织名称-DTO
+     */
+    private String organizationName;
+
+    /**
+     * 购买组织名称-DTO
+     */
+    private String payOrganizationName;
+
     /**
      * 发票
      */
@@ -298,6 +308,22 @@ public class OrderInfo {
         this.payOrganizationId = payOrganizationId;
     }
 
+    public String getOrganizationName() {
+        return organizationName;
+    }
+
+    public void setOrganizationName(String organizationName) {
+        this.organizationName = organizationName;
+    }
+
+    public String getPayOrganizationName() {
+        return payOrganizationName;
+    }
+
+    public void setPayOrganizationName(String payOrganizationName) {
+        this.payOrganizationName = payOrganizationName;
+    }
+
     public Invoice getInvoice() {
         return invoice;
     }

+ 5 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/OrderInfoService.java

@@ -66,7 +66,11 @@ public class OrderInfoService {
     }
 
     public OrderInfo get(long id){
-        return orderInfoDao.get(id);
+        OrderInfo orderInfo = orderInfoDao.get(id);
+        OrderInfo oi = orderInfoDao.getByOrganizationName(id);
+        orderInfo.setOrganizationName(oi.getOrganizationName());
+        orderInfo.setPayOrganizationName(oi.getPayOrganizationName());
+        return orderInfo;
     }
 
     @Transactional

+ 14 - 0
virgo.api/src/main/resources/mapper/OrderInfoMapper.xml

@@ -31,6 +31,14 @@
         <collection property="invoice" ofType="com.bosshand.virgo.api.workark.model.Invoice" resultMap="com.bosshand.virgo.api.workark.dao.InvoiceDao.result" columnPrefix="invoice_"/>
     </resultMap>
 
+    <resultMap type="com.bosshand.virgo.api.workark.model.OrderInfo" id="resultName">
+        <id column="id" property="id"/>
+        <result column="organizationId" property="organizationId"/>
+        <result column="payOrganizationId" property="payOrganizationId"/>
+        <result column="organizationName" property="organizationName"/>
+        <result column="payOrganizationName" property="payOrganizationName"/>
+    </resultMap>
+
     <sql id="query">
         select a.*,
                b.id                           as invoice_id,
@@ -286,4 +294,10 @@
         </where> GROUP BY a.productId ORDER BY orders DESC
     </select>
 
+    <select id="getByOrganizationName" resultMap="resultName">
+        SELECT a.*, b.name as organizationName, c.name as payOrganizationName FROM workark_orderInfo a
+                          left join mgr_organization b on a.organizationId = b.id
+                          left join mgr_organization c on a.payOrganizationId = c.id
+        WHERE a.id = #{id}
+    </select>
 </mapper>