From 6394cfa7587217eee01278426bae969a5f5c0298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 31 Aug 2021 18:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/mailBill/mapper/PayMailBillMapper.java | 13 +++++++++++++
 .../jero/mailBill/mapper/xml/PayMailBillMapper.xml  | 13 ++++++++++++-
 .../jero/mailBill/service/IPayMailBillService.java  |  4 +++-
 .../service/impl/PayMailBillServiceImpl.java        |  6 +++---
 .../controller/PayCommonProjectController.java      |  3 ++-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java
index 25f0b47f..1da3cec5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java
@@ -3,6 +3,9 @@ package com.jero.mailBill.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.mailBill.entity.PayMailBill;
+import com.jero.mailBill.vo.MailBillVO;
+
+import java.util.List;
 
 /**
  * @Description: pay_mail_bill
@@ -11,5 +14,15 @@ import com.jero.mailBill.entity.PayMailBill;
  * @Version: V1.0
  */
 public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
+    /**
+     * @Description
+     * @Author  lqt
+     * @Date   2021/8/31
+     * @Param  projectId 项目id
+     * @Param  projectType 项目类型
+     * @Return
+     * @Exception
+     */
+    List<MailBillVO> selectMailBillVO(String projectId, String projectType);
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml
index 9665762a..b3e6165f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.mailBill.mapper.PayMailBillMapper">
+<mapper namespace="com.jero.mailBill.mapper.PayMailBillMapper">
+    <resultMap id="MailBillVO" type="com.jero.mailBill.vo.MailBillVO">
+        <collection property="list" ofType="java.lang.String">
+            <result ></result>
+        </collection>
+    </resultMap>
 
+    <select id="selectMailBillVO" resultMap="MailBillVO">
+        select pmb.*,pcp.charge_project from pay_mail_bill pmb
+        LEFT JOIN pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id
+        LEFT JOIN pay_common_project pcp on pcp.id = pmbp.project_id
+        where pmb.id = (select id from pay_mail_bill_project where project_id='1432636878326165505')
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java
index 2abd9b69..8bd2f1ca 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.mailBill.entity.PayMailBill;
 import com.jero.mailBill.vo.MailBillVO;
 
+import java.util.List;
+
 /**
  * @Description: pay_mail_bill
  * @Author: jeecg-boot
@@ -20,6 +22,6 @@ public interface IPayMailBillService extends IService<PayMailBill> {
     * @Return
     * @Exception
     */
-    MailBillVO selectMailBillVO(String projectId,String projectType);
+    List<MailBillVO> selectMailBillVO(String projectId, String projectType);
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java
index ef6d3c02..ca007a83 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.mailBill.vo.MailBillVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Description: pay_mail_bill
@@ -22,8 +23,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private PayMailBillMapper payMailBillMapper;
 
     @Override
-    public MailBillVO selectMailBillVO(String projectId, String projectType) {
-
-        return null;
+    public List<MailBillVO> selectMailBillVO(String projectId, String projectType) {
+        return payMailBillMapper.selectMailBillVO(projectId,projectType);
     }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 7495b242..3d81a411 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -254,6 +254,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 			return Result.error("未找到对应数据");
 		}
 		JSONObject json = new JSONObject();
+		json.put("project",payCommonProject);
 		// 企业信息
 		PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyId());
 		json.put("company",payCompanyManagementTemporary);
@@ -267,7 +268,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		json.put("payPaymentRecord",payPaymentRecordList);
 		// todo 开票邮寄记录
 		// json.put("payPaymentRecord",payPaymentRecordList);
-		return Result.OK(payCommonProject);
+		return Result.OK(json);
 	}
 
 	/**