|
|
|
@ -56,6 +56,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.*; |
|
|
|
import com.yxt.anrui.fin.api.fincollectionconfirmation.*; |
|
|
|
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; |
|
|
|
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; |
|
|
|
import com.yxt.anrui.fin.api.fincollectionconfirmation.as.*; |
|
|
|
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*; |
|
|
|
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; |
|
|
|
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; |
|
|
|
@ -78,6 +79,8 @@ import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; |
|
|
|
import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService; |
|
|
|
import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService; |
|
|
|
import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService; |
|
|
|
import com.yxt.anrui.fin.fegin.as.asbusrepairbill.AsBusrepairBillFeign; |
|
|
|
import com.yxt.anrui.fin.fegin.as.asbusrepairbill.FinBusrepairBillVo; |
|
|
|
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
@ -222,6 +225,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
private LoanRepaymentScheduleFeign loanRepaymentScheduleFeign; |
|
|
|
@Autowired |
|
|
|
private LoanSettleApplyFeign loanSettleApplyFeign; |
|
|
|
@Autowired |
|
|
|
private AsBusrepairBillFeign asBusrepairBillFeign; |
|
|
|
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
@ -449,6 +454,121 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean asSave(AsFinCollectionConfirmationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String sid = ""; |
|
|
|
//首次认款
|
|
|
|
List<AsFinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); |
|
|
|
BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AsFinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney()) ? new BigDecimal(dto.getCollectionMoney()) : BigDecimal.ZERO) != 0) { |
|
|
|
return rb.setMsg("认款总额与收款金额不符"); |
|
|
|
} |
|
|
|
List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); |
|
|
|
List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); |
|
|
|
if (finSelectedReceivablesDetailedDtos.size() > 0) { |
|
|
|
for (AsFinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) { |
|
|
|
if (StringUtils.isBlank(v.getSubscriptionMoney())) { |
|
|
|
return rb.setMsg("认款金额不允许为空"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
List<String> stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList()); |
|
|
|
stringList.removeAll(Collections.singleton(null)); |
|
|
|
if (!stringList.isEmpty()) { |
|
|
|
List<String> stringList1 = stringList.stream().distinct().collect(Collectors.toList()); |
|
|
|
if (stringList.size() != stringList1.size()) { |
|
|
|
return rb.setMsg("认款选择的数据存在问题，请检查是否重复"); |
|
|
|
} |
|
|
|
} |
|
|
|
//根据用户sid查询分公司sid
|
|
|
|
String useOrgSid = ""; |
|
|
|
if (StringUtils.isNotBlank(dto.getOrgPath())) { |
|
|
|
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); |
|
|
|
} else { |
|
|
|
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); |
|
|
|
} |
|
|
|
//对收款申请进行赋值操作
|
|
|
|
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); |
|
|
|
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid"); |
|
|
|
finCollectionConfirmation.setSource("03"); |
|
|
|
String orgPath = dto.getOrgPath(); |
|
|
|
finCollectionConfirmation.setOrgSidPath(orgPath); |
|
|
|
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); |
|
|
|
if (sysOrganizationVoResultBean.getData() != null) { |
|
|
|
finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); |
|
|
|
} |
|
|
|
sid = finCollectionConfirmation.getSid(); |
|
|
|
finCollectionConfirmation.setCreateBySid(dto.getUserSid()); |
|
|
|
finCollectionConfirmation.setUseOrgSid(useOrgSid); |
|
|
|
//附件保存:打款凭证附件
|
|
|
|
paymentVoucherAppendixs.stream().forEach(v -> { |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
BeanUtil.copyProperties(v, commonAppendixDto); |
|
|
|
String s = commonAppendixDto.getFilePath(); |
|
|
|
if (s.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
s = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid()); |
|
|
|
commonAppendixDto.setFilePath(s); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getUserSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
}); |
|
|
|
String payFilePath = paymentVoucherAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); |
|
|
|
finCollectionConfirmation.setPaymentVoucherUrl(payFilePath); |
|
|
|
//汇款确认书附件保存
|
|
|
|
remittanceConfirmationAppendixs.stream().forEach(v -> { |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
BeanUtil.copyProperties(v, commonAppendixDto); |
|
|
|
String s = commonAppendixDto.getFilePath(); |
|
|
|
if (s.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
s = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid()); |
|
|
|
commonAppendixDto.setFilePath(s); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getUserSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
}); |
|
|
|
String remFilePath = remittanceConfirmationAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); |
|
|
|
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath); |
|
|
|
if (finSelectedReceivablesDetailedDtos.size() > 0) { |
|
|
|
//认款明细保存
|
|
|
|
String finalSid = sid; |
|
|
|
String finalUseOrgSid = useOrgSid; |
|
|
|
finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选
|
|
|
|
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); |
|
|
|
BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid"); |
|
|
|
finSelectedReceivablesDetailed.setCollSid(finalSid); |
|
|
|
finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid); |
|
|
|
//设置审核状态为待审核(1待审核/2已驳回/3已审核)
|
|
|
|
finSelectedReceivablesDetailed.setAuditState(1); |
|
|
|
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid()); |
|
|
|
//认款日期默认为当天的日期
|
|
|
|
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today()); |
|
|
|
finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath()); |
|
|
|
finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName()); |
|
|
|
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); |
|
|
|
if (v.getSubscribedOf() == 0) { |
|
|
|
//应收未收减去相应的认款
|
|
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
|
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); |
|
|
|
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney()); |
|
|
|
finCollectionConfirmation.setAuditState(1); |
|
|
|
//1未认款/2部分认款/3已认款
|
|
|
|
finCollectionConfirmation.setPaymentState(1); |
|
|
|
//添加单据编号
|
|
|
|
String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid()); |
|
|
|
finCollectionConfirmation.setBillNo(billNo); |
|
|
|
baseMapper.insert(finCollectionConfirmation); |
|
|
|
return rb.success().setMsg("添加成功"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean saveAllDto(FinCollectionConfirmationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String sid = dto.getSid(); |
|
|
|
@ -641,6 +761,74 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
return rb.success().setMsg("添加成功"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<AsFinCollectionConfirmationDetailsVo> asFetchBySid(String sid) { |
|
|
|
ResultBean<AsFinCollectionConfirmationDetailsVo> rb = ResultBean.fireFail(); |
|
|
|
AsFinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new AsFinCollectionConfirmationDetailsVo(); |
|
|
|
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); |
|
|
|
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); |
|
|
|
|
|
|
|
List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>(); |
|
|
|
List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>(); |
|
|
|
CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery(); |
|
|
|
commonAppendixSelectQuery.setLinkSid(sid); |
|
|
|
//打款凭证附件
|
|
|
|
commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); |
|
|
|
ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); |
|
|
|
if (listResultBean.getSuccess()) { |
|
|
|
for (CommonAppendixVo commonApp : listResultBean.getData()) { |
|
|
|
FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo(); |
|
|
|
//commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
|
|
|
|
BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo); |
|
|
|
paymentVoucherAppendixs.add(paymentVoucherAppendixVo); |
|
|
|
} |
|
|
|
} |
|
|
|
finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs); |
|
|
|
commonAppendixSelectQuery = new CommonAppendixSelectQuery(); |
|
|
|
commonAppendixSelectQuery.setLinkSid(sid); |
|
|
|
//汇款确认书附件
|
|
|
|
commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); |
|
|
|
listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); |
|
|
|
if (listResultBean.getSuccess()) { |
|
|
|
for (CommonAppendixVo commonApp : listResultBean.getData()) { |
|
|
|
FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo(); |
|
|
|
//commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
|
|
|
|
BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo); |
|
|
|
remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo); |
|
|
|
} |
|
|
|
} |
|
|
|
finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs); |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
List<AsFinSelectedReceivablesDetailedVo> list = new ArrayList<>(); |
|
|
|
if (!finSelectedReceivablesDetailedVos.isEmpty()) { |
|
|
|
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { |
|
|
|
AsFinSelectedReceivablesDetailedVo vo = new AsFinSelectedReceivablesDetailedVo(); |
|
|
|
BeanUtil.copyProperties(finSelectedReceivablesDetailedVo, vo); |
|
|
|
if (StringUtils.isNotBlank(finSelectedReceivablesDetailedVo.getContractSid())) { |
|
|
|
String asBillSid = finSelectedReceivablesDetailedVo.getContractSid(); // 售后维修单sid
|
|
|
|
FinBusrepairBillVo busrepairBillVo = asBusrepairBillFeign.fetchVehMarkAndTypeBySid(asBillSid); |
|
|
|
if (null != busrepairBillVo) { |
|
|
|
if (StringUtils.isNotBlank(busrepairBillVo.getBillType())) { |
|
|
|
vo.setBillType(busrepairBillVo.getBillType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(busrepairBillVo.getVehMark())) { |
|
|
|
vo.setVehMark(busrepairBillVo.getVehMark()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
list.add(vo); |
|
|
|
} |
|
|
|
} |
|
|
|
finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(list); |
|
|
|
if (finCollectionConfirmation.getAuditState() == 2) { |
|
|
|
String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已驳回，原因是：" + finCollectionConfirmation.getReason(); |
|
|
|
finCollectionConfirmationDetailsVo.setReason(confirmationDetails); |
|
|
|
} else if (finCollectionConfirmation.getAuditState() == 3) { |
|
|
|
String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已确认"; |
|
|
|
finCollectionConfirmationDetailsVo.setReason(confirmationDetails); |
|
|
|
} |
|
|
|
return rb.success().setData(finCollectionConfirmationDetailsVo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<FinCollectionConfirmationDetailsVo> fetchByAllSid(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo(); |
|
|
|
@ -3977,7 +4165,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0){ |
|
|
|
} else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) { |
|
|
|
try { |
|
|
|
Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); |
|
|
|
historyEntity.setActualDate(collDate); |
|
|
|
@ -4181,7 +4369,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
} |
|
|
|
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData(); |
|
|
|
if (null != planDetails) { |
|
|
|
ResultBean<SettleFinVo> finSettleVo = loanSettleApplyFeign.getFinSettleVo(planDetails.getBusVinSid(), v.getReceivablesName(),v.getSubscriptionMoney()); |
|
|
|
ResultBean<SettleFinVo> finSettleVo = loanSettleApplyFeign.getFinSettleVo(planDetails.getBusVinSid(), v.getReceivablesName(), v.getSubscriptionMoney()); |
|
|
|
if (finSettleVo.getSuccess()) { |
|
|
|
SettleFinVo finVo = finSettleVo.getData(); |
|
|
|
voucherDetail.setPayCostTitleValue(v.getReceivablesName()); |
|
|
|
@ -5571,4 +5759,83 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
List<String> sids = baseMapper.selectSids(busVehSid); |
|
|
|
return rb.success().setData(sids); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public PagerVo<AsFinCollectionConfirmationVo> asListPagess(PagerQuery<AsFinCollectionConfirmationQuery> pq) { |
|
|
|
AsFinCollectionConfirmationQuery query = pq.getParams(); |
|
|
|
QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>(); |
|
|
|
|
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
String orgSidPath = query.getOrgPath(); |
|
|
|
orgSidPath = orgSidPath + "/"; |
|
|
|
int i1 = orgSidPath.indexOf("/"); |
|
|
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|
|
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|
|
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<AsFinCollectionConfirmationVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
} else { |
|
|
|
PagerVo<AsFinCollectionConfirmationVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
String collectionStartDate = query.getCollectionStartDate(); |
|
|
|
String collectionEndDate = query.getCollectionEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String createStartDate = query.getCreateStartDate(); |
|
|
|
String createEndDate = query.getCreateEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(createStartDate), "date_format (createDate,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(createEndDate), "date_format (createDate,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
if (StringUtils.isNotBlank(query.getCollectionBank())) { |
|
|
|
qw.eq("collectionBankKey", query.getCollectionBank()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { |
|
|
|
qw.eq("collectionTypeKey", query.getCollectionTypeKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSubscriptionState())) { |
|
|
|
qw.eq("paymentState", query.getSubscriptionState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPayerName())) { |
|
|
|
qw.like("payerName", query.getPayerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateDept())) { |
|
|
|
qw.like("createDept", query.getCreateDept()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCollectionMoney())) { |
|
|
|
qw.eq("collectionMoney", query.getCollectionMoney()); |
|
|
|
} |
|
|
|
qw.eq("source","03"); |
|
|
|
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<AsFinCollectionConfirmationVo> pagging = baseMapper.asListPagess(page, qw); |
|
|
|
PagerVo<AsFinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
} |
|
|
|
|
fanzongzhe
5 months ago