Commit 34085050 authored by hezhuozhi's avatar hezhuozhi

【web端-还款管理】列表数据和导出不一致【gtr0723】

parent 727d40d3
...@@ -30,4 +30,6 @@ public interface RepaymentMapper extends BaseMapper<Repayment> { ...@@ -30,4 +30,6 @@ public interface RepaymentMapper extends BaseMapper<Repayment> {
List<String> getTodoTelephones(@Param("userIds") List<String> userIds); List<String> getTodoTelephones(@Param("userIds") List<String> userIds);
@UserEmpower(field = {"regional_companies_code"}, dealerField = {"regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
List<Repayment> getAllData();
} }
...@@ -47,4 +47,9 @@ ...@@ -47,4 +47,9 @@
</foreach> </foreach>
</select> </select>
<select id="getAllData" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.Repayment">
select * from hygf_repayment
order by create_time DESC,sequence_nbr DESC
</select>
</mapper> </mapper>
...@@ -359,10 +359,13 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R ...@@ -359,10 +359,13 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
public void exportRepaymentExcel(List<String> sequenceNbrList, HttpServletResponse response) { public void exportRepaymentExcel(List<String> sequenceNbrList, HttpServletResponse response) {
LambdaQueryWrapper<Repayment> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Repayment> wrapper = new LambdaQueryWrapper<>();
//如果是空值导出全部 //如果是空值导出全部
List<Repayment> repaymentList;
if (CollectionUtil.isNotEmpty(sequenceNbrList)) { if (CollectionUtil.isNotEmpty(sequenceNbrList)) {
wrapper.in(Repayment::getSequenceNbr, sequenceNbrList); wrapper.in(Repayment::getSequenceNbr, sequenceNbrList);
repaymentList = list(wrapper);
}else {
repaymentList = baseMapper.getAllData();
} }
List<Repayment> repaymentList = list(wrapper);
if (CollectionUtil.isNotEmpty(repaymentList)) { if (CollectionUtil.isNotEmpty(repaymentList)) {
List<RepaymentExcelVO> dataList = new ArrayList<>(); List<RepaymentExcelVO> dataList = new ArrayList<>();
for (Repayment repayment : repaymentList) { for (Repayment repayment : repaymentList) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment