From 49af43c50d6dfc5c90592f05ed7905c23aa6c403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 21 Oct 2021 16:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9#41221?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pack/controller/PayPackCompanyController.java |  8 ++++----
 .../jero/pack/mapper/PayPackCompanyMapper.java    |  6 +++---
 .../jero/pack/mapper/xml/PayPackCompanyMapper.xml | 15 ++++++++++++++-
 .../jero/pack/service/IPayPackCompanyService.java | 10 ++++++++++
 .../service/impl/PayPackCompanyServiceImpl.java   |  5 +++++
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
index c23c7e65..7c545adf 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
@@ -265,11 +265,11 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	@RequiresPermissions("packCompany:export")
     public ModelAndView exportXls(HttpServletRequest request, PayPackCompany payPackCompany) {
 		// Step.1 组装查询条件
-		QueryWrapper<PayPackCompany> queryWrapper = QueryGenerator.initQueryWrapper(payPackCompany, request.getParameterMap());
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
+		if(!StringUtils.isEmpty(payPackCompany.getCompanyTemporaryName())){
+			payPackCompany.setPhone(PasswordUtil.encrypt(payPackCompany.getCompanyTemporaryName()));
+		}
 		// Step.2 获取导出数据
-		List<PayPackCompany> pageList = payPackCompanyService.list(queryWrapper);
+		List<PayPackCompany> pageList = payPackCompanyService.queryPageListExport(payPackCompany);
 		List<PayPackCompany> exportList = null;
 
 		// 过滤选中数据
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java
index df1abac4..bfab7291 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java
@@ -40,13 +40,13 @@ public interface PayPackCompanyMapper extends BaseMapper<PayPackCompany> {
     List<PayCommonProject> queryPackListCount(List<String> listPackIds);
 
     /**
-     * @Description 导出excel数据
+     * @Description 打包列表excel导出
      * @Author  lqt
-     * @Date   2021/9/13
+     * @Date   2021/10/20
      * @Param
      * @Return
      * @Exception
      */
-    void getExportXls(List<String> list);
+    List<PayPackCompany> queryPageListExport(@Param("payPackCompany") PayPackCompany payPackCompany);
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
index e1da82d9..84977045 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
@@ -15,7 +15,20 @@
         group by ppcp.pack_id
     </select>
     <select id="queryPageList" resultType="com.jero.pack.entity.PayPackCompany">
-        select pcm.create_time,ppc.* from pay_pack_company ppc
+        select ppc.* from pay_pack_company ppc
+        LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
+        <where>
+            <if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
+                AND ppc.company_temporary_name like concat('%',concat(#{payPackCompany.companyTemporaryName},'%'))
+            </if>
+            <if test="payPackCompany.packYear != null and payPackCompany.packYear != ''">
+                AND ppc.pack_year = #{payPackCompany.packYear}
+            </if>
+        </where>
+        ORDER BY pcm.create_time desc,ppc.pack_year desc
+    </select>
+    <select id="queryPageListExport" resultType="com.jero.pack.entity.PayPackCompany">
+        select ppc.* from pay_pack_company ppc
         LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
         <where>
             <if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java
index 2098cb4e..510a1292 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java
@@ -52,4 +52,14 @@ public interface IPayPackCompanyService extends IService<PayPackCompany> {
     * @Exception
     */
     List<PayCommonProject> queryPackListCount(List<String> listPackIds);
+
+    /**
+     * @Description 打包列表excel导出
+     * @Author  lqt
+     * @Date   2021/10/20
+     * @Param
+     * @Return
+     * @Exception
+     */
+    List<PayPackCompany> queryPageListExport(PayPackCompany payPackCompany);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
index 2e9ada10..527b6931 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
@@ -100,6 +100,11 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
         return payPackCompanyMapper.queryPackListCount(listPackIds);
     }
 
+    @Override
+    public List<PayPackCompany> queryPageListExport(PayPackCompany payPackCompany) {
+        return payPackCompanyMapper.queryPageListExport(payPackCompany) ;
+    }
+
     /**
      * @Description 插入企业信息，联系人信息到临时表，更新项目记录
      * @Author  lqt