修改bug#40956

jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java

@@ -82,9 +82,12 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<PayPackCompany> queryWrapper = QueryGenerator.initQueryWrapper(payPackCompany, req.getParameterMap());
+		// QueryWrapper<PayPackCompany> queryWrapper = QueryGenerator.initQueryWrapper(payPackCompany, req.getParameterMap());
 		Page<PayPackCompany> page = new Page<PayPackCompany>(pageNo, pageSize);
-		IPage<PayPackCompany> pageList = payPackCompanyService.page(page, queryWrapper);
+		if(!StringUtils.isEmpty(payPackCompany.getCompanyTemporaryName())){
+			payPackCompany.setPhone(PasswordUtil.encrypt(payPackCompany.getCompanyTemporaryName()));
+		}
+		IPage<PayPackCompany> pageList = payPackCompanyService.queryPageList(page, payPackCompany);
 		if(!CollectionUtils.isEmpty(pageList.getRecords())){
 			List<PayPackCompany> list = pageList.getRecords();
 			// 获取 打包费用，实际到账金额

jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java

@@ -2,9 +2,12 @@ package com.jero.pack.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.pack.entity.PayPackCompany;
 import com.jero.pack.vo.PayPackCompanyProjectInput;
 import com.jero.project.entity.PayCommonProject;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,6 +19,16 @@ import java.util.List;
  */
 public interface PayPackCompanyMapper extends BaseMapper<PayPackCompany> {
 
+    /**
+     * @Description 打包列表
+     * @Author  lqt
+     * @Date   2021/10/20
+     * @Param
+     * @Return
+     * @Exception
+     */
+    IPage<PayPackCompany> queryPageList(Page<PayPackCompany> page,@Param("payPackCompany") PayPackCompany payPackCompany);
+
     /**
      * @Description 查询金额
      * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml

@@ -14,4 +14,17 @@
         </where>
         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
+        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>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java

@@ -1,5 +1,7 @@
 package com.jero.pack.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.pack.entity.PayPackCompany;
 import com.jero.pack.vo.PayPackCompanyProjectInput;
@@ -14,6 +16,15 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IPayPackCompanyService extends IService<PayPackCompany> {
+    /**
+    * @Description 打包列表
+    * @Author  lqt
+    * @Date   2021/10/20
+    * @Param
+    * @Return
+    * @Exception
+    */
+    IPage<PayPackCompany> queryPageList(Page<PayPackCompany> page,PayPackCompany payPackCompany);
     /**
     * @Description 添加
     * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java

@@ -1,6 +1,8 @@
 package com.jero.pack.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
@@ -33,15 +35,20 @@ import java.util.Objects;
 @Service
 public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper, PayPackCompany> implements IPayPackCompanyService {
 
-    @Autowired
+    @Resource
     private IPayPackCompanyService payPackCompanyService;
-    @Autowired
+    @Resource
     private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
     @Resource
     private PayPackCompanyMapper payPackCompanyMapper;
 
+    @Override
+    public IPage<PayPackCompany> queryPageList(Page<PayPackCompany> page, PayPackCompany payPackCompany) {
+        return payPackCompanyMapper.queryPageList(page,payPackCompany);
+    }
+
     @Override
     @Transactional
     public PayPackCompany addPayPackCompany(PayPackCompany payPackCompany) {