修改#41221

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;
 
 		// 过滤选中数据

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);
 
 }

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 != ''">

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);
 }

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