|
|
@@ -26,14 +26,11 @@ import shop.alien.mapper.LawFirmMapper;
|
|
|
import shop.alien.mapper.LawFirmPaymentMapper;
|
|
|
import shop.alien.util.excel.EasyExcelUtil;
|
|
|
|
|
|
-import org.apache.poi.ss.usermodel.DateUtil;
|
|
|
-
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
|
import java.io.OutputStream;
|
|
|
import java.lang.reflect.Field;
|
|
|
-import java.math.BigDecimal;
|
|
|
import java.net.URLEncoder;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
@@ -534,7 +531,7 @@ public class LawFirmServiceImpl extends ServiceImpl<LawFirmMapper, LawFirm> impl
|
|
|
|
|
|
Page<LawFirmPaymentVO> page = new Page<>(currentPage, size);
|
|
|
IPage<LawFirmPaymentVO> pageResult = lawFirmPaymentMapper.selectPaymentPageWithFirm(
|
|
|
- page, firmId, null, null, null, null, null, null, null, null
|
|
|
+ page, firmId, null, null, null, null, null, null, null, null,null
|
|
|
);
|
|
|
|
|
|
List<LawFirmPaymentVO> paymentList = pageResult.getRecords();
|
|
|
@@ -1394,7 +1391,7 @@ public class LawFirmServiceImpl extends ServiceImpl<LawFirmMapper, LawFirm> impl
|
|
|
|
|
|
Page<LawFirmPaymentVO> page = new Page<>(pageNum, pageSize);
|
|
|
IPage<LawFirmPaymentVO> pageResult = lawFirmPaymentMapper.selectPaymentPageWithFirm(
|
|
|
- page, firmId, paymentAccount, firmName, creditCode, status, certificationStatus, directorName, createdTimeStart, createdTimeEnd
|
|
|
+ page, firmId, paymentAccount, firmName, creditCode, status, certificationStatus, directorName,null, createdTimeStart, createdTimeEnd
|
|
|
);
|
|
|
return R.data(pageResult);
|
|
|
}
|