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

款项确认app接口

master
hanlinghao 3 years ago
parent
95106ccd3b
commit
81a10e2c8c
15 changed files with 750 additions and 162 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. 68
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java
  2. 69
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java
  3. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java
  4. 21
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java
  5. 37
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java
  6. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
  7. 25
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
  8. 69
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java
  9. 22
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
  10. 48
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
  11. 70
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
  12. 132
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
  13. 13
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
  14. 22
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml
  15. 20
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java

68
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java
View File

@ -0,0 +1,68 @@
package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.AppBusSelectedReceivablesDetailedDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class AppBusCollectionConfirmationDto implements Dto {
@ApiModelProperty("款项确认sid")
private String sid;
@ApiModelProperty("收款银行")
private String collectionBank;
@ApiModelProperty("收款银行key")
private String collectionBankKey;
@ApiModelProperty("汇款确认")
private List<String> payConfirmFiles;
@ApiModelProperty("付款金额")
private BigDecimal paymentMoney;
@ApiModelProperty("收款日期")
private String collectionDate;
@ApiModelProperty("付款方名称")
private String paymentName;
@ApiModelProperty("收款账号")
private String collectionNum;
@ApiModelProperty("收款账号key")
private String collectionNumKey;
@ApiModelProperty("收款记录sid")
private String collectionBillSid;
@ApiModelProperty("下载模板")
private String downLoadUrl;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("收款方式")
private String collectionType;
@ApiModelProperty("收款方式key")
private String collectionTypeKey;
@ApiModelProperty("打款凭证")
private List<String> payFiles;
@ApiModelProperty("款项明细")
private List<AppBusSelectedReceivablesDetailedDto> paymentDetail;
@ApiModelProperty("余额")
private String balance;
@ApiModelProperty("用户sid")
private String userSid;
}

69
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java
View File

@ -0,0 +1,69 @@
package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.AppBusSelectedReceivablesDetailedDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppBusCollectionConfirmationInitVo implements Vo {
@ApiModelProperty("款项确认sid")
private String sid;
@ApiModelProperty("收款银行")
private String collectionBank;
@ApiModelProperty("收款银行key")
private String collectionBankKey;
@ApiModelProperty("汇款确认")
private List<String> payConfirmFiles;
@ApiModelProperty("付款金额")
private String paymentMoney;
@ApiModelProperty("收款日期")
private String collectionDate;
@ApiModelProperty("付款方名称")
private String paymentName;
@ApiModelProperty("收款账号")
private String collectionNum;
@ApiModelProperty("收款账号key")
private String collectionNumKey;
@ApiModelProperty("收款记录sid")
private String collectionBillSid;
@ApiModelProperty("下载模板")
private String downLoadUrl;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("收款方式")
private String collectionType;
@ApiModelProperty("收款方式key")
private String collectionTypeKey;
@ApiModelProperty("打款凭证")
private List<String> payFiles;
@ApiModelProperty("款项明细")
private List<AppBusSelectedReceivablesDetailedDto> paymentDetail;
@ApiModelProperty("余额")
private String balance;
@ApiModelProperty("用户sid")
private String userSid;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java
View File

@ -25,6 +25,8 @@ public class AppBusCollectionConfirmationPageVo implements Vo {
private String collectionMoney;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("余额")
private Integer balance;
@ApiModelProperty("是否显示办理")
private boolean showHandle;
@ApiModelProperty("是否显示下载")

21
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java
View File

@ -0,0 +1,21 @@
package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppBusSelectedReceivablesPaymentDetailsQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("明细sid")
private List<String> sidList;
}

37
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java
View File

@ -0,0 +1,37 @@
package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppBusSelectedReceivablesPaymentDetailsVo implements Vo {
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("应收金额")
private String receivable;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("付款金额")
private String confirmMoney;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("认款时间")
private String confirmDate;
}

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
View File

@ -77,4 +77,24 @@ public interface BusCollectionConfirmationFeign {
@ApiOperation("手机端—获取款项确认列表")
@PostMapping("/getCollectionConfirmList")
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery);
@ApiOperation("手机端—新增款项确认申请单")
@PostMapping("/addCollectionConfirm")
public ResultBean addCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto);
@ApiOperation("手机端—初始化收款确认申请")
@GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
@ApiOperation("手机端—提交款项确认申请")
@PostMapping("/submitCollectionConfirm")
public ResultBean submitCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto);
@ApiOperation("手机端—删除收款确认单")
@DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}")
public ResultBean deleteCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid);
@ApiOperation("手机端—查询可使用款项明细列表")
@PostMapping("/getPaymentDetailsList")
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery);
}

25
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
View File

@ -74,4 +74,29 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
return null;
}
@Override
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) {
return null;
}
@Override
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return null;
}
@Override
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) {
return null;
}
@Override
public ResultBean deleteCollectionConfirm(String collectionBillSid) {
return null;
}
@Override
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return null;
}
}

69
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java
View File

@ -0,0 +1,69 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(销售相关) <br/>
* File: BusCustomerBillDetailedDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedDto <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 AppBusSelectedReceivablesDetailedDto implements Dto {
@ApiModelProperty("应收金额")
private String receivable;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("认款金额")
private String confirmMoney;
@ApiModelProperty("合同号")
private String contractId;
@ApiModelProperty("应收项目")
private String projectName;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("客户名")
private String name;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("认款日期")
private String confirmDate;
}

22
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
View File

@ -30,13 +30,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationQuery;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmation;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo;
import java.util.List;
@ -66,5 +64,21 @@ public interface BusCollectionConfirmationMapper extends BaseMapper<BusCollectio
@Select("select * from bus_collection_confirmation")
List<BusCollectionConfirmationVo> selectListVo();
/**
* 手机端—获取款项确认列表
*
* @param page
* @param qw
* @return
*/
IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(IPage<AppBusCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusCollectionConfirmationPageVo> qw);
/**
* 手机端—初始化收款确认申请
*
* @param collectionBillSid
* @param useOrgSid
* @return
*/
AppBusCollectionConfirmationInitVo initCollectionConfirm(@Param("collectionBillSid") String collectionBillSid, @Param("useOrgSid") String useOrgSid);
}

48
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
View File

@ -1,18 +1,52 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
SELECT * FROM bus_collection_confirmation <where> ${ew.sqlSegment} </where>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
SELECT * FROM bus_collection_confirmation
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
SELECT * FROM bus_collection_confirmation <where> ${ew.sqlSegment} </where>
<select id="selectListAllVo"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
SELECT * FROM bus_collection_confirmation
<where>${ew.sqlSegment}</where>
</select>
<!--手机端—获取款项确认列表-->
<select id="getCollectionConfirmList"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo">
select sid AS collectionBillSid,
collectionBankNum AS collectionNum,
subscriptionState AS collectionBillState,
collectionBank,
collectionTypeValue AS collectionType,
collectionDate,
payerName AS paymentName,
collectionMoney,
remarks,
balance
from bus_collection_confirmation
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initCollectionConfirm"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationInitVo">
SELECT sid AS collectionBillSid,
collectionBankNum AS collectionNum,
subscriptionState AS collectionBillState,
collectionBank,
collectionTypeValue AS collectionType,
collectionDate,
payerName AS paymentName,
collectionMoney,
remarks,
balance
FROM bus_collection_confirmation
WHERE sid = #{collectionBillSid}
AND useOrgSid = #{useOrgSid}
</select>
</mapper>

70
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
View File

@ -26,8 +26,10 @@
package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -78,7 +80,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
public ResultBean delBySids(@RequestBody String[] sids) {
return busCollectionConfirmationService.delAllBySids(sids);
}
@ -97,8 +99,68 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
*/
@Override
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> rb = ResultBean.fireFail();
IPage<AppBusCollectionConfirmationPageVo> page = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery);
return null;
PagerVo<AppBusCollectionConfirmationPageVo> page = new PagerVo<>();
IPage<AppBusCollectionConfirmationPageVo> iPage = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery);
PagerVo<AppBusCollectionConfirmationPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>>().success().setData(pagerVo);
}
/**
* 手机端—新增款项确认申请单
*
* @param dto
* @return
*/
@Override
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) {
return busCollectionConfirmationService.addCollectionConfirm(dto);
}
/**
* 手机端—初始化收款确认申请
*
* @param collectionBillSid
* @param userSid
* @return
*/
@Override
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return busCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid);
}
/**
* 手机端—提交款项确认申请
*
* @param dto
* @return
*/
@Override
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) {
return busCollectionConfirmationService.submitCollectionConfirm(dto);
}
/**
* 手机端—删除收款确认单
*
* @param collectionBillSid
* @return
*/
@Override
public ResultBean deleteCollectionConfirm(String collectionBillSid) {
return busCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid);
}
/**
* 手机端—查询可使用款项明细列表
*
* @param pagerQuery
* @return
*/
@Override
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
PagerVo<AppBusSelectedReceivablesPaymentDetailsVo> page = new PagerVo<>();
IPage<AppBusSelectedReceivablesPaymentDetailsVo> iPage = busCollectionConfirmationService.getPaymentDetailsList(pagerQuery);
PagerVo<AppBusSelectedReceivablesPaymentDetailsVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>>().success().setData(pagerVo);
}
}

132
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleQuery;
@ -39,6 +40,8 @@ import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedRec
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
import com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -49,6 +52,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@ -74,6 +78,10 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -189,12 +197,25 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
* 手机端—获取款项确认列表
*
* @param pagerQuery
* @return
* @
*/
public IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
IPage<AppBusCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppBusCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
return baseMapper.getCollectionConfirmList(page,qw);
IPage<AppBusCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
for (AppBusCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
Integer balance = record.getBalance();
String collectionBillState = record.getCollectionBillState();
if (balance <= 0 || collectionBillState.equals("1") || collectionBillState.equals("3")) {
record.setShowHandle(false);
}
record.setShowDownload(false);
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid());
if (busSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") {
record.setShowDelete(false);
}
}
return collectionConfirmList;
}
/**
@ -212,4 +233,111 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
}
return qw;
}
/**
* 手机端—新增款项确认申请单
*
* @param dto
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
String sid = busCollectionConfirmation.getSid();
busCollectionConfirmation.setSid(sid);
busCollectionConfirmation.setCollectionDate(dto.getCollectionDate());
busCollectionConfirmation.setCollectionBank(dto.getCollectionBank());
busCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum());
busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
busCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey());
busCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType());
busCollectionConfirmation.setPayerName(dto.getPaymentName());
busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
busCollectionConfirmation.setRemarks(dto.getRemarks());
insert(busCollectionConfirmation);
List<String> payFiles = dto.getPayFiles();
for (String payFile : payFiles) {
String payFilePath = payFile.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setFilePath(payFilePath);
commonAppendixDto.setCreateBySid(staffSid);
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
return rb.success();
}
/**
* 手机端—初始化收款确认申请
*
* @param collectionBillSid
* @param userSid
* @return
*/
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
ResultBean<AppBusCollectionConfirmationInitVo> rb = ResultBean.fireFail();
if (StringUtils.isNotBlank(userSid)) {
return rb.fail().setMsg("用户sid不能为空");
}
String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppBusCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
return rb.success().setData(vo);
}
/**
* 手机端—提交款项确认申请
*
* @param dto
* @return
*/
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) {
return null;
}
/**
* 手机端—删除收款确认单
*
* @param collectionBillSid
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean deleteCollectionConfirm(String collectionBillSid) {
ResultBean rb = ResultBean.fireFail();
deleteBySid(collectionBillSid);
busSelectedReceivablesDetailedService.deleteByCollSid(collectionBillSid);
return rb.success().setMsg("删除成功");
}
/**
* 手机端—查询可使用款项明细列表
*
* @param pagerQuery
* @return
*/
public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
IPage<AppBusSelectedReceivablesPaymentDetailsVo> collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw);
return collectionConfirmList;
}
/**
* 构造条件
*
* @param pagerQuery 查询条件
* @return
*/
private QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> appPaymentDetailsBuildQueryWrapper(AppBusSelectedReceivablesPaymentDetailsQuery pagerQuery) {
QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
qw.like("bv.vinNo", pagerQuery.getName());
}
}
return qw;
}
}

13
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
View File

@ -26,9 +26,12 @@
package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -69,4 +72,14 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper<BusSele
@Select("select * from bus_selected_receivables_detailed where collSid = #{sid}")
List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid);
/**
* 手机端—查询可使用款项明细列表
*
* @param page
* @param qw
* @return
*/
IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw);
}

22
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml
View File

@ -1,13 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo">
SELECT * FROM bus_selected_receivables_detailed <where> ${ew.sqlSegment} </where>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo">
SELECT * FROM bus_selected_receivables_detailed
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo">
SELECT * FROM bus_selected_receivables_detailed <where> ${ew.sqlSegment} </where>
<select id="selectListAllVo"
resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo">
SELECT * FROM bus_selected_receivables_detailed
<where>${ew.sqlSegment}</where>
</select>
<!--手机端—查询可使用款项明细列表-->
<select id="getPaymentDetailsList"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo">
</select>
</mapper>

20
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
View File

@ -28,6 +28,9 @@ package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -67,10 +70,12 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
PagerVo<BusSelectedReceivablesDetailed> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BusSelectedReceivablesDetailed> listAll(BusSelectedReceivablesDetailedQuery query) {
QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<BusSelectedReceivablesDetailed> createQueryWrapper(BusSelectedReceivablesDetailedQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -149,13 +154,13 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto){
public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) {
BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public BusSelectedReceivablesDetailedVo fetchByIdVo(String id){
public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) {
BusSelectedReceivablesDetailed entity = this.fetchById(id);
BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo();
BeanUtil.copyProperties(entity, vo);
@ -169,4 +174,15 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
public List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid) {
return baseMapper.fetchByCillSid(sid);
}
/**
* 手机端—查询可使用款项明细列表
*
* @param page
* @param qw
* @return
*/
public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw) {
return baseMapper.getPaymentDetailsList(page, qw);
}
}
Write Preview
Loading…
Cancel
Save