From 3072791fa37912bc1f944a798e6ff11b0bc35b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sat, 9 Oct 2021 11:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/mapper/xml/ProjectDetailMapper.xml | 10 ++--
 .../common/service/ProjectDetailService.java  |  9 ++++
 .../impl/ProjectDetailServiceImpl.java        |  5 ++
 .../PayCommonProjectController.java           | 52 ++++++++++++++++++-
 .../entity/PayCompanyCommonProject.java       | 31 +++++++++++
 5 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCompanyCommonProject.java

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
index ac7154af..5791c07a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
@@ -4,7 +4,7 @@
 
     <select id="queryProject" resultType="com.jero.project.entity.PayCommonProject">
         <!-- 普通项目-->
-        select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way,c.files
+        select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way,c.files,c.charge_notice_no,c.charge_notice_id
         from pay_common_project c
         <where>
             <if test="projectId != null and projectId != ''">
@@ -13,7 +13,7 @@
         </where>
         <!--工作组项目-->
         UNION ALL
-        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,''
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id
         from pay_working_group g
         inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
         <where>
@@ -23,7 +23,7 @@
         </where>
         <!-- 会议项目-->
         UNION ALL
-        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_id,sit.pay_mode,''
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_id,sit.pay_mode,'','',''
         from pay_meeting meeting
         inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
         <where>
@@ -33,7 +33,7 @@
         </where>
         <!-- 会员项目-->
         UNION ALL
-        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',msub.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method,''
+        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',msub.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method,'',msub.charge_notice_no,msub.charge_notice_file_id
         from pay_member_project pmp
         inner join pay_member_project_subitem msub on pmp.id = msub.project_id
         <where>
@@ -43,7 +43,7 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
+        select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,'','',''
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         <where>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java
index 6695a50f..4b6712c8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java
@@ -48,4 +48,13 @@ public interface ProjectDetailService {
      * @Exception
      */
     Integer getMonthProjectCount(String time);
+    /**
+     * @Description 查询项目信息
+     * @Author  lqt
+     * @Date   2021/9/14
+     * @Param  projectId 项目id
+     * @Return
+     * @Exception
+     */
+    PayCommonProject queryProject(String projectId);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index b4e263d7..1de59439 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -316,4 +316,9 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
     public Integer getMonthProjectCount(String time) {
         return projectDetailMapper.getMonthProjectCount(time);
     }
+
+    @Override
+    public PayCommonProject queryProject(String projectId) {
+        return projectDetailMapper.queryProject(projectId);
+    }
 }
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 82ab1fc2..4a3d44ee 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
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
@@ -22,6 +23,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ValidUtil;
+import com.jero.common.vo.PayMailBillVO;
 import com.jero.common.vo.ProjectDetailVO;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.entity.PayIncomeContractAssociated;
@@ -37,7 +39,10 @@ import com.jero.pack.entity.PayPackCompany;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
 import com.jero.pack.service.IPayPackCompanyService;
+import com.jero.payment.entity.PayPaymentRecord;
+import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
+import com.jero.project.entity.PayCompanyCommonProject;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,7 +53,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
@@ -85,6 +89,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private IPayPackCompanyService payPackCompanyService;
 	@Resource
 	private IPayMailBillProjectService payMailBillProjectService;
+	@Resource
+	private IPayPaymentRecordService payPaymentRecordService;
 	 /**
 	 * 分页列表查询
 	 *
@@ -379,6 +385,50 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		payCommonProjectService.deleteBatch(ids);
 		return Result.OK("批量删除成功!");
 	}
+
+	 /**
+	  * 企业端-通过id查询
+	  *
+	  * @param id 普通项目管理id
+	  * @return
+	  */
+	 @ApiOperation(value="普通项目管理-企业端-通过id查询", notes="普通项目管理-企业端-通过id查询")
+	 @GetMapping(value = "/queryCompanyById")
+	 public Result<?> queryCompanyById(@RequestParam(name="id") String id) {
+		 if(StringUtils.isBlank(id)){
+			 return Result.error("id不能为空!");
+		 }
+		 PayCompanyCommonProject payCompanyCommonProject = null;
+		 PayCommonProject payCommonProject = payCommonProjectService.getById(id);
+		 if(Objects.isNull(payCommonProject)){
+			 return Result.error("项目不存在!");
+		 }
+		 String strProject = JSON.toJSONString(payCommonProject);
+		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
+		 // 到账信息
+		 LambdaQueryWrapper<PayPaymentRecord> queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>();
+		 queryWrapperPayPaymentRecord.eq(PayPaymentRecord::getProjectId,id);
+		 List<PayPaymentRecord> payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord);
+		 if(!CollectionUtils.isEmpty(payPaymentRecordList)){
+			 payCompanyCommonProject.setPaymentRecord(payPaymentRecordList);
+		 }
+		 // 开票邮寄记录
+		 List<PayMailBill> listMailBillVO = payMailBillService.selectMailBillVO(id);
+		 if(!CollectionUtils.isEmpty(listMailBillVO)){
+			 String str = JSON.toJSONString(listMailBillVO);
+			 List<PayMailBillVO> listPayMailBillVO = JSONArray.parseArray(str,PayMailBillVO.class);
+			 listPayMailBillVO.forEach(p->{
+				 if(!Objects.isNull(p.getPostStatus())){
+					 p.setPostStatus_dictText(sysBaseAPI.translateDict("mail_type",String.valueOf(p.getPostStatus())));
+				 }
+				 if(!Objects.isNull(p.getSendMethod())){
+					 p.setSendMethod_dictText(sysBaseAPI.translateDict("mail_send",String.valueOf(p.getSendMethod())));
+				 }
+			 });
+			 payCompanyCommonProject.setMailBill(listPayMailBillVO);
+		 }
+		 return Result.OK(payCompanyCommonProject);
+	 }
 	
 	/**
 	 * 通过id查询
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCompanyCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCompanyCommonProject.java
new file mode 100644
index 00000000..2f0c872b
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCompanyCommonProject.java
@@ -0,0 +1,31 @@
+package com.jero.project.entity;
+
+import com.jero.common.vo.PayMailBillVO;
+import com.jero.payment.entity.PayPaymentRecord;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: pay_common_project
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Data
+public class PayCompanyCommonProject extends PayCommonProject implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 到账信息
+     */
+    @ApiModelProperty(value = "到账信息")
+    private List<PayPaymentRecord> paymentRecord;
+    /**
+     * 开票邮寄记录
+     */
+    @ApiModelProperty(value = "开票邮寄记录")
+    private List<PayMailBillVO> mailBill;
+
+}