yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

简易订单可用订金列表接口开发

zhanglei
God 2 years ago
parent
853a480368
commit
73c6df222e
11 changed files with 337 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  2. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java
  3. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java
  4. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  5. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  6. 78
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJQuery.java
  7. 73
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java
  8. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  9. 37
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  10. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  11. 116
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
View File

@ -135,5 +135,7 @@ public class FinCollectionConfirmation extends BaseEntity {
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
@ApiModelProperty("下载次数")
private String downNum; // 下载次数
private String downNum;
@ApiModelProperty("组织全路径")
private String orgSidPath;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java
View File

@ -124,6 +124,7 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
private String staffDeptName;
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
@ApiModelProperty("组织全路径")
private String orgSidPath;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java
View File

@ -131,5 +131,6 @@ public class FinCollectionConfirmationDto implements Dto {
private String staffDeptName;
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
@ApiModelProperty("组织全路径")
private String orgSidPath;
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
View File

@ -165,4 +165,10 @@ public interface FinCollectionConfirmationFeign {
@ApiOperation("欠款提车已选车辆的已认款")
@GetMapping("/selectCollectionMoneys")
ResultBean<String> selectCollectionMoneys(@RequestParam("contractId") String contractId, @RequestParam("busVinSidList") List<String> busVinSidList);
/**********************************************************************************************************/
@ApiOperation("简易订单可用订金列表 ")
@PostMapping("/jyddkydjListPage")
public ResultBean<PagerVo<FinCollectionConfirmationJYDDKYDJVo>> jyddkydjListPage(@RequestBody PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
View File

@ -177,4 +177,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
return null;
}
@Override
public ResultBean<PagerVo<FinCollectionConfirmationJYDDKYDJVo>> jyddkydjListPage(PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq) {
return null;
}
}

78
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJQuery.java
View File

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fincenter(销售相关) <br/>
* File: FinCollectionConfirmationQuery.java <br/>
* Class: com.yxt.anrui.fincenter.api.fincollectionconfirmation.FinCollectionConfirmationQuery <br/>
* Description: 收款确认表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件")
@Data
public class FinCollectionConfirmationJYDDKYDJQuery implements Query {
@ApiModelProperty("收款开始日期")
private String collectionStartDate;
@ApiModelProperty("收款结束日期")
private String collectionEndDate;
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("付款人")
private String payerName;
@ApiModelProperty("收款最小金额")
private String collectionSmallMoney;
@ApiModelProperty("收款最大金额")
private String collectionBigMoney;
private String menuUrl;
private String menuSid;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("当前组织机构分公司sid全路径")
private String orgPath;
}

73
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java
View File

@ -0,0 +1,73 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(销售相关) <br/>
* File: FinCollectionConfirmationVo.java <br/>
* Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo <br/>
* Description: 收款确认表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
@Data
public class FinCollectionConfirmationJYDDKYDJVo implements Vo {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("付款人")
private String payerName;
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("收款日期")
private String collectionDate;
@ApiModelProperty("收款金额")
private String collectionMoney;
@ApiModelProperty("余额")
private String balance;
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
View File

@ -120,4 +120,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
String selectCollectionMoney(String contractNo);
String selectCollectionMoneys(@Param("contractNo") String contractId, @Param("list") List<String> busVinSidList);
IPage<FinCollectionConfirmationJYDDKYDJVo> jyddkydjListPage(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER)QueryWrapper<FinCollectionConfirmation> qw);
}

37
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
View File

@ -168,7 +168,7 @@
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT(billNo, 4)
select RIGHT (billNo, 4)
from fin_collection_confirmation
where billNo LIKE concat(#{bill}, '%')
order by id desc
@ -176,20 +176,45 @@
</select>
<update id="updateVin">
update fin_selected_receivables_detailed set VIN = #{vinNo} where contractNo = #{contractNo} and VIN = #{temporaryNo}
update fin_selected_receivables_detailed
set VIN = #{vinNo}
where contractNo = #{contractNo}
and VIN = #{temporaryNo}
</update>
<select id="selectCollectionMoney" resultType="java.lang.String">
select sum(subscriptionMoney) from fin_selected_receivables_detailed where
contractNo = #{contractNo} and auditState = 3
select sum(subscriptionMoney)
from fin_selected_receivables_detailed
where contractNo = #{contractNo}
and auditState = 3
</select>
<select id="selectCollectionMoneys" resultType="java.lang.String">
select sum(fsd.subscriptionMoney) from fin_selected_receivables_detailed fsd left join fin_uncollected_receivables_detailed fusd on fusd.sid = fsd.receivablesSid
select sum(fsd.subscriptionMoney) from fin_selected_receivables_detailed fsd left join
fin_uncollected_receivables_detailed fusd on fusd.sid = fsd.receivablesSid
where fsd. auditState = 3 and fusd.busVinSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="jyddkydjListPage"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
SELECT
fcc.staffDeptName,
fcc.staffName,
fcc.`billNo`,
fcc.`payerName`,
bd.`draweeMobile`,
fcc.collectionDate,
fcc.collectionMoney,
fcc.balance
FROM
fin_collection_confirmation fcc
LEFT JOIN anrui_buscenter.`bus_deposit` bd
ON fcc.`busSid` f = bd.`billSid`
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
View File

@ -255,4 +255,11 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
return finCollectionConfirmationService.selectCollectionMoneys(contractId,busVinSidList);
}
@Override
public ResultBean<PagerVo<FinCollectionConfirmationJYDDKYDJVo>> jyddkydjListPage(PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<FinCollectionConfirmationJYDDKYDJVo> pv = finCollectionConfirmationService.jyddkydjListPage(pq);
return rb.success().setData(pv);
}
}

116
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -57,6 +57,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CustomerQuery;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
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;
@ -75,6 +76,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
@ -372,7 +374,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return billNo;
}
public ResultBean getMsg(FinCollectionConfirmationDto dto){
public ResultBean getMsg(FinCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
//订金不允许多收
List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
@ -380,12 +382,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
.filter((FinSelectedReceivablesDetailedDto b) -> "订金".equals(b.getReceivablesName()))
.collect(Collectors.toList());
dingList.removeAll(Collections.singleton(null));
if(!dingList.isEmpty()){
for (int i = 0; i <dingList.size(); i++) {
if (!dingList.isEmpty()) {
for (int i = 0; i < dingList.size(); i++) {
FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto = dingList.get(i);
BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getCurrentReceivableMoney());
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getSubscriptionMoney());
if(subscriptionMoney.compareTo(currentReceivableMoney)>0){
if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) {
return rb.setMsg("订金不允许多收，请检查");
}
@ -398,7 +400,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
ResultBean resultBean = getMsg(dto);
if(!resultBean.getSuccess()){
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
if (StringUtils.isBlank(sid)) {
@ -417,11 +419,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
}
List<String> stringList = finSelectedReceivablesDetailedDtos.stream().map(v->v.getReceivablesSid()).collect(Collectors.toList());
List<String> stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList());
stringList.removeAll(Collections.singleton(null));
if(!stringList.isEmpty()){
if (!stringList.isEmpty()) {
List<String> stringList1 = stringList.stream().distinct().collect(Collectors.toList());
if(stringList.size() != stringList1.size()){
if (stringList.size() != stringList1.size()) {
return rb.setMsg("认款选择的数据存在问题，请检查是否重复");
}
}
@ -1436,13 +1438,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (vo != null) {
AppOrderPriceInfoVo priceInfoVo = vo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
if(depositInfo != null){
if("02".equals(depositInfo.getDepositTypeKey())){//订金结转
if (depositInfo != null) {
if ("02".equals(depositInfo.getDepositTypeKey())) {//订金结转
BigDecimal decimalDeposit = BigDecimal.ZERO;
if(StringUtils.isNotBlank(depositInfo.getDepositTotal())){
if (StringUtils.isNotBlank(depositInfo.getDepositTotal())) {
decimalDeposit = new BigDecimal(depositInfo.getDepositTotal());
}
if(StringUtils.isNotBlank(depositInfo.getMakeUpDeposit())){
if (StringUtils.isNotBlank(depositInfo.getMakeUpDeposit())) {
decimalDeposit = decimalDeposit.subtract(new BigDecimal(depositInfo.getMakeUpDeposit()));
}
decimalDeposit = decimalDeposit.divide(new BigDecimal(priceInfoVo.getNumber()), BigDecimal.ROUND_CEILING);
@ -1494,7 +1496,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//根据busVinSid查询待出库中是否存在该数据
ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
if(busDeliveredResultBean.getData() == null){
if (busDeliveredResultBean.getData() == null) {
if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
@ -1633,8 +1635,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
bdCustomer.setTOrgIds(customerQuery.getOrgCode());
ResultBean resultBean = bdCustomerService.draftBdCustomer(bdCustomer);
log.info("推送客户{}", resultBean);
}else{
log.info("已存在客户{}",customerQuery.getCustomerNo());
} else {
log.info("已存在客户{}", customerQuery.getCustomerNo());
}
return customerQuery.getCustomerNo();
}
@ -2225,7 +2227,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (confirmation == null) {
return rb.setMsg("该申请不存在");
}
finSelectedReceivablesDetailedService.updateAuditStateBySid(1,sid);
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid);
ResultBean resultBean = cashierConfirm(sid, confirmation.getConfirmNameSid());
return resultBean;
}
@ -2266,7 +2268,87 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
ResultBean<String> rb = ResultBean.fireFail();
String moneyAll = baseMapper.selectCollectionMoneys(contractId,busVinSidList);
String moneyAll = baseMapper.selectCollectionMoneys(contractId, busVinSidList);
return rb.success().setData(moneyAll);
}
public PagerVo<FinCollectionConfirmationJYDDKYDJVo> jyddkydjListPage(PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq) {
FinCollectionConfirmationJYDDKYDJQuery query = pq.getParams();
QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getCreateBySid());
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("fcc.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("fcc.createBySid", query.getCreateBySid());
} else {
PagerVo<FinCollectionConfirmationJYDDKYDJVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<FinCollectionConfirmationJYDDKYDJVo> p = new PagerVo<>();
return p;
}
}
qw.gt("fcc.balance", 0);
if (StringUtils.isNotBlank(query.getStaffDeptName())){
qw.like("fcc.staffDeptName",query.getStaffDeptName());
}
if (StringUtils.isNotBlank(query.getStaffName())){
qw.like("fcc.staffName",query.getStaffName());
}
if (StringUtils.isNotBlank(query.getBillNo())){
qw.like("fcc.billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getPayerName())){
qw.like("fcc.payerName",query.getPayerName());
}
if (StringUtils.isNotBlank(query.getPhone())){
qw.like("bd.draweeMobile",query.getPhone());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (fcc.collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (fcc.collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String collectionSmallMoney = query.getCollectionSmallMoney();
String collectionBigMoney = query.getCollectionBigMoney();
qw.between("fcc.balance",collectionSmallMoney,collectionBigMoney);
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();
for (FinCollectionConfirmationJYDDKYDJVo record : records) {
String useOrgSid = record.getUseOrgSid();
String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
record.setUseOrgName(useOrgName);
}
PagerVo<FinCollectionConfirmationJYDDKYDJVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}
Write Preview
Loading…
Cancel
Save