合并 代码

This commit is contained in:
GYJ
2025-01-02 21:52:39 +08:00
parent ea2e8a5d2b
commit c9b9bb1a58

View File

@@ -42,6 +42,7 @@ import com.sqx.modules.utils.ParamPageUtils;
import com.sqx.modules.utils.excel.ExcelData; import com.sqx.modules.utils.excel.ExcelData;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -105,12 +106,11 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
} }
@Override @Override
public PageUtils selectCashOutList(Integer page, Integer limit, CashOut cashOut) { public PageUtils selectCashOutList(Integer page, Integer limit, CashOut cashOut,@Param("isApp") boolean isApp) {
PageHelper.startPage(page, limit); PageHelper.startPage(page, limit);
return PageUtils.page(new PageInfo<>(baseMapper.selectCashOutPage(cashOut))); return PageUtils.page(new PageInfo<>(baseMapper.selectCashOutPage(cashOut, isApp)));
} }
@Override @Override
public ExcelData excelPayDetails(CashOut cashOut1) { public ExcelData excelPayDetails(CashOut cashOut1) {
List<CashOut> cashOutList = baseMapper.selectCashOutList(cashOut1); List<CashOut> cashOutList = baseMapper.selectCashOutList(cashOut1);