Browse Source

更改

master
ligaode 6 months ago
parent
commit
8a3bd9a71a
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java
  3. 73
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java
  4. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  5. 74
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  6. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  7. 70
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java
  8. 71
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
  9. 71
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
  10. 82
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
  11. 68
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
  12. 70
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
  13. 28
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java
  14. 19
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java
  15. 16
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java
  16. 39
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyQuery.java
  17. 42
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java
  18. 13
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java
  19. 19
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java
  20. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java
  21. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java
  22. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java
  23. 70
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java
  24. 86
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java
  25. 86
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java
  26. 78
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java
  27. 72
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java
  28. 82
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java
  29. 84
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java
  30. 30
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java
  31. 31
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java
  32. 31
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java
  33. 69
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java
  34. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml
  35. 107
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
  36. 114
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
  37. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java
  38. 74
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
  39. 132
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  40. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml
  41. 28
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java
  42. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java
  43. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml
  44. 31
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java
  45. 69
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
  46. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml
  47. 100
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java
  48. 114
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
  49. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml
  50. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java
  51. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java
  52. 11
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java
  53. 23
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyDelegateQuery.java
  54. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java
  55. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
  56. 76
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyDetailsVo.java
  57. 74
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java
  58. 69
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplydetailDetailsVo.java
  59. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppDelegateQuery.java
  60. 37
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowDto.java
  61. 28
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowQuery.java
  62. 47
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowTaskQuery.java
  63. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java
  64. 90
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyRest.java
  65. 199
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java

@ -32,4 +32,7 @@ public class BaseManufacturerListVo implements Vo {
@ApiModelProperty("账户名称") @ApiModelProperty("账户名称")
private String accountName; private String accountName;
@ApiModelProperty("厂商名称")
private String manufacturerName;
} }

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java

@ -16,6 +16,10 @@ import java.util.List;
public class PayBaseVehicleQuery implements Query { public class PayBaseVehicleQuery implements Query {
private static final long serialVersionUID = 8939482367294270164L; private static final long serialVersionUID = 8939482367294270164L;
@ApiModelProperty("是否已销售,1是0否")
private String isSales;
@ApiModelProperty("款项是否已交清,1是0否")
private String isSettle;
@ApiModelProperty(value = "品牌") @ApiModelProperty(value = "品牌")
private String brandSid; private String brandSid;
@ApiModelProperty(value = "功能") @ApiModelProperty(value = "功能")

73
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java

@ -6,6 +6,8 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* @Author dimengzhe * @Author dimengzhe
* @Date 2022/10/8 11:16 * @Date 2022/10/8 11:16
@ -15,45 +17,50 @@ import lombok.Data;
public class PayBaseVehicleVo implements Vo { public class PayBaseVehicleVo implements Vo {
private static final long serialVersionUID = 8935506131970564858L; private static final long serialVersionUID = 8935506131970564858L;
private String sid; private String sid;
@ApiModelProperty(value = "品牌")
private String brandName;
@ApiModelProperty(value = "车型") @ApiModelProperty(value = "车型")
private String vehicleAlias; private String vehicleAlias;
@ApiModelProperty(value = "车型sid")
private String modelSid;
@ApiModelProperty(value = "车架号") @ApiModelProperty(value = "车架号")
private String vinNo; private String vinNo;
@ApiModelProperty(value = "颜色") @ApiModelProperty("版本")
private String color; private String marketSegmentsValue;
@ApiModelProperty("颜色")
private String carColor;
@ApiModelProperty("排放")
private String emissionStandardValue;
@ApiModelProperty("变速箱")
private String tranCaseTypeValue;
@ApiModelProperty("后桥")
private String rearAxleValue;
@ApiModelProperty("厂家库龄")
private String libraryAge;
@ApiModelProperty("公司库龄")
private String orgLibraryAge;
@ApiModelProperty("上装名称")
private String topName;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("厂家结算价")
private BigDecimal money;
@ApiModelProperty("合同号")
private String contractNo;
@ApiModelProperty("销售订单编号")
private String saleBillNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("销售订单类型")
private String saleTypeValue;
@ApiModelProperty("买断状态")
private String settlementStatusValue;
@ApiModelProperty(value = "品牌")
private String brandName;
@ApiModelProperty(value = "存放地点") @ApiModelProperty(value = "存放地点")
private String location; private String location;
@ApiModelProperty(value = "存放地点sid") @ApiModelProperty(value = "车型sid")
private String locationSid; private String modelSid;
@ApiModelProperty(value = "销售指导价")
@JsonSerialize(using = ToStringSerializer.class)
private String guidedPrice;
@ApiModelProperty(value = "常用配置")
private String configName;
@ApiModelProperty(value = "常用配置sid") @ApiModelProperty(value = "常用配置sid")
private String configSid; private String configSid;
@ApiModelProperty(value = "入库日期") @ApiModelProperty(value = "上装sid")
private String priceDate; private String topSid;
@ApiModelProperty(value = "入库价:厂家结算价")
@JsonSerialize(using = ToStringSerializer.class)
private String priced;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("库龄")
private int dayNum;
@ApiModelProperty("版本")
private String vehicleVersionValue;
@ApiModelProperty("燃料")
private String fuelTypeValue;
@ApiModelProperty("变速箱")
private String gearboxTypeValue;
@ApiModelProperty("排放标准")
private String emissionStandardValue;
} }

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@ -190,6 +190,7 @@
bmb.depositBank, bmb.depositBank,
bmb.bankAccount, bmb.bankAccount,
bmb.accountName, bmb.accountName,
bm.manufacturerName,
bmb.sid actualPaySid bmb.sid actualPaySid
from base_manufacturer_bank bmb from base_manufacturer_bank bmb
left join base_manufacturer bm on bm.sid = bmb.manufacturerSid left join base_manufacturer bm on bm.sid = bmb.manufacturerSid

74
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -1427,36 +1427,58 @@
</select> </select>
<select id="selectPayVehicleList" resultType="com.yxt.anrui.base.api.basevehicle.PayBaseVehicleVo"> <select id="selectPayVehicleList" resultType="com.yxt.anrui.base.api.basevehicle.PayBaseVehicleVo">
SELECT bv.sid, SELECT
<!--品牌名称--> bv.sid,
bvm.brandName,
<!--车型名称-->
bvm.vehicleAlias, bvm.vehicleAlias,
<!--车型sid--> bvm.brandName,
bvm.sid as modelSid, bvm.sid AS modelSid,
<!--车架号-->
bv.vinNo, bv.vinNo,
<!--颜色--> bmc.carColor,
bmc.carColor color,
<!--存放地点-->
bv.locationName location, bv.locationName location,
<!--存放地点sid--> bmc.sid AS configSid,
bv.location locationSid,
<!--销售指导价 取值厂家结算价 -->
bv.costPrice as guidedPrice,
bmc.configName,
bmc.sid as configSid,
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
bv.costPrice as priced,
bv.insideCode, bv.insideCode,
(select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum, bvm.vehicleVersionValue as marketSegmentsValue,
bvm.vehicleVersionValue, bvm.emissionStandardValue,
bvm.fuelTypeValue, bvm.tranCaseTypeValue,
bvm.gearboxTypeValue, bmc.rearAxleValue,
bvm.emissionStandardValue CASE
FROM base_vehicle bv WHEN bv.manPurOrderTypeValue = '外采'
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` THEN 0
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` WHEN bv.solidDate IS NOT NULL
THEN DATEDIFF(bv.solidDate, bv.priceDate)
WHEN bv.solidDate IS NULL
THEN DATEDIFF(NOW(), bv.priceDate)
END AS libraryAge,
CASE
WHEN bv.salesDate IS NOT NULL
THEN DATEDIFF(bv.salesDate, bv.departureDate)
WHEN bv.salesDate IS NULL
THEN DATEDIFF(NOW(), bv.departureDate)
END AS orgLibraryAge,
bvsm.installNameValue AS topName,
bvs.sid AS topSid,
bv.costPrice AS money,
bso.contractNo,
bso.billNo AS saleBillNo,
bso.customerName,
bso.payType AS saleTypeValue,
bv.settlementStatusValue
FROM
base_vehicle bv
LEFT JOIN base_vehicle_model bvm
ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc
ON bv.modelConfigSid = bmc.`sid`
LEFT JOIN base_vehinstall bvs
ON bvs.vinNo = bv.vinNo
LEFT JOIN base_vehinstallmodel bvsm
ON bvs.mainSid = bvsm.sid
LEFT JOIN base_vehicle_state vs
ON bv.sid = vs.vinSid
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bsv
ON bsv.linkSid = bv.sid
LEFT JOIN anrui_buscenter.bus_sales_order bso
ON bsv.salesOrderSid = bso.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -3534,10 +3534,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>(); QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
//本分公司、非删除、库存状态为非在途非调入。 //本分公司、非删除、库存状态为非在途非调入。
if (query != null) { if (query != null) {
if (StringUtils.isNotBlank(query.getUserSid())) { qw.eq("bv.createOrgSid", query.getOrgSid());
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); if ("1".equals(query.getIsSales())){
qw.eq("bv.createOrgSid", orgSid); qw.isNotNull("bv.salesDate");
}else if ("0".equals(query.getIsSales())){
qw.isNull("bv.salesDate");
}
if ("1".equals(query.getIsSettle())){
qw.eq("vs.finState",1);
}else if ("0".equals(query.getIsSettle())){
qw.eq("vs.finState",0);
} }
//品牌 //品牌
if (StringUtils.isNotBlank(query.getBrandSid())) { if (StringUtils.isNotBlank(query.getBrandSid())) {
@ -3590,6 +3596,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.eq("bv.isDelete", 0); qw.eq("bv.isDelete", 0);
qw.eq("bv.isProblemVeh", 0); qw.eq("bv.isProblemVeh", 0);
qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
qw.groupBy("vs.vinSid");
qw.orderByDesc("vs.createTime");
IPage<PayBaseVehicleVo> pagging = baseMapper.selectPayVehicleList(page, qw); IPage<PayBaseVehicleVo> pagging = baseMapper.selectPayVehicleList(page, qw);
PagerVo<PayBaseVehicleVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<PayBaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;

70
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java

@ -0,0 +1,70 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(付款信息管理) <br/>
* File: FinPayment.java <br/>
* Class: com.yxt.anrui.fin.api.finpayment.FinPayment <br/>
* Description: 付款信息管理. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款信息管理", description = "付款信息管理")
@TableName("fin_payment")
public class FinPayment extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单位编码")
private String companyCode; // 单位编码
@ApiModelProperty("单位名称")
private String companyName; // 单位名称
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("业务类型key")
private String businessTypeKey; // 业务类型key
@ApiModelProperty("业务类型value")
private String businessTypeValue; // 业务类型value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName;
}

71
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java

@ -0,0 +1,71 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
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: FinPaymentVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpayment.FinPaymentVo <br/>
* Description: 付款信息管理 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款信息管理 视图数据详情", description = "付款信息管理 视图数据详情")
public class FinPaymentDetailsVo implements Vo {
private String sid; // sid
private String remarks;
@ApiModelProperty("单位编码")
private String companyCode; // 单位编码
@ApiModelProperty("单位名称")
private String companyName; // 单位名称
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("业务类型key")
private String businessTypeKey; // 业务类型key
@ApiModelProperty("业务类型value")
private String businessTypeValue; // 业务类型value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName;
}

71
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java

@ -0,0 +1,71 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(付款信息管理) <br/>
* File: FinPaymentDto.java <br/>
* Class: com.yxt.anrui.fin.api.finpayment.FinPaymentDto <br/>
* Description: 付款信息管理 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款信息管理 数据传输对象", description = "付款信息管理 数据传输对象")
public class FinPaymentDto implements Dto {
private String sid; // sid
private String remarks;
@ApiModelProperty("单位编码")
private String companyCode; // 单位编码
@ApiModelProperty("单位名称")
private String companyName; // 单位名称
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("业务类型key")
private String businessTypeKey; // 业务类型key
@ApiModelProperty("业务类型value")
private String businessTypeValue; // 业务类型value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName;
}

82
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-fin(付款信息管理) <br/>
* File: FinPaymentFeign.java <br/>
* Class: com.yxt.anrui.fin.api.finpayment.FinPaymentFeign <br/>
* Description: 付款信息管理. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "付款信息管理")
@FeignClient(
contextId = "anrui-fin-FinPayment",
name = "anrui-fin",
path = "v1/finpayment")
public interface FinPaymentFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<FinPaymentVo>> listPage(@RequestBody PagerQuery<FinPaymentQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody FinPaymentDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<FinPaymentDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("按分公司查询")
@GetMapping("/selectByUseOrgSid")
@ResponseBody
public ResultBean<List<FinPaymentDetailsVo>> selectByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
}

68
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java

@ -0,0 +1,68 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(付款信息管理) <br/>
* File: FinPaymentQuery.java <br/>
* Class: com.yxt.anrui.fin.api.finpayment.FinPaymentQuery <br/>
* Description: 付款信息管理 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款信息管理 查询条件", description = "付款信息管理 查询条件")
public class FinPaymentQuery implements Query {
@ApiModelProperty("单位编码")
private String companyCode; // 单位编码
@ApiModelProperty("单位名称")
private String companyName; // 单位名称
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("业务类型key")
private String businessTypeKey; // 业务类型key
@ApiModelProperty("业务类型value")
private String businessTypeValue; // 业务类型value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName;
}

70
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java

@ -0,0 +1,70 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
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: FinPaymentVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpayment.FinPaymentVo <br/>
* Description: 付款信息管理 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款信息管理 视图数据对象", description = "付款信息管理 视图数据对象")
public class FinPaymentVo implements Vo {
private String sid; // sid
@ApiModelProperty("单位编码")
private String companyCode; // 单位编码
@ApiModelProperty("单位名称")
private String companyName; // 单位名称
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("业务类型key")
private String businessTypeKey; // 业务类型key
@ApiModelProperty("业务类型value")
private String businessTypeValue; // 业务类型value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName;
}

28
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java

@ -26,12 +26,14 @@
package com.yxt.anrui.fin.api.finpaymentapply; package com.yxt.anrui.fin.api.finpaymentapply;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* Project: anrui-fin(财务) <br/> * Project: anrui-fin(财务) <br/>
@ -67,35 +69,27 @@ public class FinPaymentapply extends BaseEntity {
private String costRangeValue; private String costRangeValue;
@ApiModelProperty("是否事业部领导审批,1是0否") @ApiModelProperty("是否事业部领导审批,1是0否")
private String isLeaderSp; private String isLeaderSp;
@ApiModelProperty("是否已销售,1是0否")
private String isSales;
@ApiModelProperty("款项是否已交清,1是0否")
private String isSettle;
@ApiModelProperty("款项类别,数据字典") @ApiModelProperty("款项类别,数据字典")
private String costTypeKey; private String costTypeKey;
@ApiModelProperty("款项类别") @ApiModelProperty("款项类别")
private String costTypeValue; private String costTypeValue;
@ApiModelProperty("款项名称,数据字典")
private String costTitleKey;
@ApiModelProperty("款项名称")
private String costTitleValue;
@ApiModelProperty("金额,小数点2位") @ApiModelProperty("金额,小数点2位")
private Integer cost; private Integer cost;
@ApiModelProperty("付款单位sid") @ApiModelProperty("付款单位sid")
private String payCompanySid; private String payCompanySid;
@ApiModelProperty("付款单位名称") @ApiModelProperty("付款单位名称")
private String payCompany; private String payCompany;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty(value = "收款单位sid")
private String receiveCompanySid;
@ApiModelProperty("收款银行")
private String receiveBank;
@ApiModelProperty("收款银行账号")
private String receiveBankAccount;
@ApiModelProperty("关联业务sid") @ApiModelProperty("关联业务sid")
private String busSid; private String busSid;
@ApiModelProperty("创建组织") @ApiModelProperty("分公司sid")
private String createOrgSid;
@ApiModelProperty("使用组织")
private String useOrgSid; private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty(value = "流程状态") @ApiModelProperty(value = "流程状态")
private String nodeState; private String nodeState;
@ -122,4 +116,8 @@ public class FinPaymentapply extends BaseEntity {
private String orgSidPath; private String orgSidPath;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
} }

19
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@ -67,24 +67,12 @@ public class FinPaymentapplyDetailsVo implements Vo {
private String costTypeKey; private String costTypeKey;
@ApiModelProperty("款项类别") @ApiModelProperty("款项类别")
private String costTypeValue; private String costTypeValue;
@ApiModelProperty("款项名称,数据字典")
private String costTitleKey;
@ApiModelProperty("款项名称")
private String costTitleValue;
@ApiModelProperty("金额,小数点2位") @ApiModelProperty("金额,小数点2位")
private Integer cost; private Integer cost;
@ApiModelProperty("付款单位sid") @ApiModelProperty("付款单位sid")
private String payCompanySid; private String payCompanySid;
@ApiModelProperty("付款单位名称") @ApiModelProperty("付款单位名称")
private String payCompany; private String payCompany;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty(value = "收款单位sid")
private String receiveCompanySid;
@ApiModelProperty("收款银行")
private String receiveBank;
@ApiModelProperty("收款银行账号")
private String receiveBankAccount;
@ApiModelProperty(value = "任务id") @ApiModelProperty(value = "任务id")
private String taskId; private String taskId;
@ApiModelProperty(value = "实例id") @ApiModelProperty(value = "实例id")
@ -112,4 +100,11 @@ public class FinPaymentapplyDetailsVo implements Vo {
private String costRangeValue; private String costRangeValue;
@ApiModelProperty("是否事业部领导审批,1是0否") @ApiModelProperty("是否事业部领导审批,1是0否")
private String isLeaderSp; private String isLeaderSp;
@ApiModelProperty("是否已销售,1是0否")
private String isSales;
@ApiModelProperty("款项是否已交清,1是0否")
private String isSettle;
@ApiModelProperty("分公司sid")
private String useOrgSid;
} }

16
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@ -63,24 +63,12 @@ public class FinPaymentapplyDto implements Dto {
private String costTypeKey; private String costTypeKey;
@ApiModelProperty("款项类别") @ApiModelProperty("款项类别")
private String costTypeValue; private String costTypeValue;
@ApiModelProperty("款项名称,数据字典")
private String costTitleKey;
@ApiModelProperty("款项名称")
private String costTitleValue;
@ApiModelProperty("金额") @ApiModelProperty("金额")
private Integer cost; private Integer cost;
@ApiModelProperty("付款单位sid") @ApiModelProperty("付款单位sid")
private String payCompanySid; private String payCompanySid;
@ApiModelProperty("付款单位名称") @ApiModelProperty("付款单位名称")
private String payCompany; private String payCompany;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty(value = "收款单位sid")
private String receiveCompanySid;
@ApiModelProperty("收款银行")
private String receiveBank;
@ApiModelProperty("收款银行账号")
private String receiveBankAccount;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remarks; private String remarks;
@ -115,4 +103,8 @@ public class FinPaymentapplyDto implements Dto {
private String costRangeValue; private String costRangeValue;
@ApiModelProperty("是否事业部领导审批,1是0否") @ApiModelProperty("是否事业部领导审批,1是0否")
private String isLeaderSp; private String isLeaderSp;
@ApiModelProperty("是否已销售,1是0否")
private String isSales;
@ApiModelProperty("款项是否已交清,1是0否")
private String isSettle;
} }

39
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyQuery.java

@ -49,22 +49,37 @@ import lombok.Data;
@ApiModel(value = "fin_paymentapply 查询条件", description = "fin_paymentapply 查询条件") @ApiModel(value = "fin_paymentapply 查询条件", description = "fin_paymentapply 查询条件")
public class FinPaymentapplyQuery implements Query { public class FinPaymentapplyQuery implements Query {
private static final long serialVersionUID = 5439345928016283101L; private static final long serialVersionUID = 5439345928016283101L;
@ApiModelProperty(value = "付款状态:1未付款,2已付款")
private String state; @ApiModelProperty("分公司")
@ApiModelProperty("款项类别,数据字典") private String useOrgName;
private String costTypeKey; @ApiModelProperty("申请部门名称")
@ApiModelProperty("款项名称,数据字典") private String deptName;
private String costTitleKey; @ApiModelProperty("申请人姓名")
@ApiModelProperty("收款单位名称") private String name;
private String receiveCompanySid; @ApiModelProperty("申请编号")
@ApiModelProperty(value = "用户sid") private String billNo;
private String userSid;
@ApiModelProperty(value = "申请开始时间") @ApiModelProperty(value = "申请开始时间")
private String applyStartDate; private String applyStartDate;
@ApiModelProperty(value = "申请结束时间") @ApiModelProperty(value = "申请结束时间")
private String applyEndDate; private String applyEndDate;
@ApiModelProperty("办结开始日期")
private String finishStartTime;
@ApiModelProperty("办结结束日期")
private String finishEndTime;
@ApiModelProperty(value = "品牌sid")
private String carBrandSid;
@ApiModelProperty("款项范围,数据字典")
private String costRangeKey;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("是否涉及车辆,1是,0否")
private String isVeh;
@ApiModelProperty("付款单位名称")
private String payCompany;
@ApiModelProperty(value = "付款状态:1未付款,2已付款")
private String state;
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath; private String orgPath;
private String userSid;
private String menuUrl;
} }

42
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java

@ -26,12 +26,16 @@
package com.yxt.anrui.fin.api.finpaymentapply; package com.yxt.anrui.fin.api.finpaymentapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* Project: anrui-fin(财务) <br/> * Project: anrui-fin(财务) <br/>
* File: FinPaymentapplyVo.java <br/> * File: FinPaymentapplyVo.java <br/>
@ -53,28 +57,36 @@ public class FinPaymentapplyVo implements Vo {
private String sid; private String sid;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private String nodeState; private String nodeState;
@ApiModelProperty("业务编号") @ApiModelProperty("申请编号")
private String busSid; private String billNo;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人姓名")
private String name;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date finishTime;
@ApiModelProperty(value = "品牌名称")
private String carBrandName;
@ApiModelProperty("款项范围")
private String costRangeValue;
@ApiModelProperty("款项类别") @ApiModelProperty("款项类别")
private String costTypeValue; private String costTypeValue;
@ApiModelProperty("款项名称") @ApiModelProperty("是否涉及车辆,1是,0否")
private String costTitleValue; private String isVeh;
@ApiModelProperty("收款单位名称") @ApiModelProperty("款单位名称")
private String receiveCompany; private String payCompany;
@ApiModelProperty("收款银行账号") @ApiModelProperty(value = "备注")
private String receiveBankAccount; private String remarks;
@ApiModelProperty("金额") @ApiModelProperty("金额")
private Integer cost; private BigDecimal paymentTotal;
@ApiModelProperty(value = "付款状态") @ApiModelProperty(value = "付款状态")
private String state; private String state;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty("流程定义id") @ApiModelProperty("流程定义id")
private String procDefId; private String procDefId;
@ApiModelProperty("流程实例id") @ApiModelProperty("流程实例id")
private String procInstId; private String procInstId;
@ApiModelProperty("开户行")
private String receiveBank;
} }

13
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java

@ -1,10 +1,12 @@
package com.yxt.anrui.fin.api.finpaymentapplydetails; package com.yxt.anrui.fin.api.finpaymentapplydetails;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* @Author dimengzhe * @Author dimengzhe
@ -31,4 +33,15 @@ public class FinPaymentapplyDetailDto implements Dto {
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remarks; private String remarks;
@ApiModelProperty("款项名称,数据字典")
private String costTitleKey;
@ApiModelProperty("款项名称")
private String costTitleValue;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty("是否需要实际付款,1是0否")
private Integer isPay;
@ApiModelProperty
private List<FinPaymentapplyDetailsBelowDto> finPaymentapplyDetailsBelowList;
} }

19
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java

@ -1,9 +1,14 @@
package com.yxt.anrui.fin.api.finpaymentapplydetails; package com.yxt.anrui.fin.api.finpaymentapplydetails;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/** /**
* @Author dimengzhe * @Author dimengzhe
* @Date 2022/10/6 22:13 * @Date 2022/10/6 22:13
@ -29,5 +34,19 @@ public class FinPaymentapplyDetailVo implements Vo {
@ApiModelProperty("付款金额") @ApiModelProperty("付款金额")
private String payAccount; private String payAccount;
@ApiModelProperty("备注")
private String remarks; private String remarks;
@ApiModelProperty("款项名称,数据字典")
private String costTitleKey;
@ApiModelProperty("款项名称")
private String costTitleValue;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty("是否需要实际付款,1是0否")
private Integer isPay;
@ApiModelProperty("付款信息金额合计")
private BigDecimal payAccountTotal;
@ApiModelProperty
private List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowList;
} }

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java

@ -1,10 +1,12 @@
package com.yxt.anrui.fin.api.finpaymentapplydetails; package com.yxt.anrui.fin.api.finpaymentapplydetails;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* @Author dimengzhe * @Author dimengzhe
@ -30,4 +32,12 @@ public class FinPaymentapplyDetails extends BaseEntity {
@ApiModelProperty("付款金额") @ApiModelProperty("付款金额")
private BigDecimal payAccount; private BigDecimal payAccount;
@ApiModelProperty("款项名称,数据字典")
private String costTitleKey;
@ApiModelProperty("款项名称")
private String costTitleValue;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty("是否需要实际付款,1是0否")
private Integer isPay;
} }

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java

@ -26,6 +26,7 @@
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow; package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* Project: anrui-fin(付款明细) <br/> * Project: anrui-fin(付款明细) <br/>
@ -53,6 +55,8 @@ public class FinPaymentapplyDetailsBelowDetailsVo implements Vo {
private String sid; // sid private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("款项名称,数据字典") @ApiModelProperty("款项名称,数据字典")
private String costTitleKey; // 款项名称,数据字典 private String costTitleKey; // 款项名称,数据字典
@ApiModelProperty("款项名称") @ApiModelProperty("款项名称")
@ -76,4 +80,7 @@ public class FinPaymentapplyDetailsBelowDetailsVo implements Vo {
@ApiModelProperty("后期是否有平仓付款") @ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款 private String isPay; // 后期是否有平仓付款
@ApiModelProperty
private List<FinPaymentapplyDetailsBelowEveDetailsVo> finPaymentapplyDetailsBelowEveList;
} }

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java

@ -26,6 +26,8 @@
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow; package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -33,6 +35,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* Project: anrui-fin(付款明细) <br/> * Project: anrui-fin(付款明细) <br/>
@ -53,6 +56,8 @@ public class FinPaymentapplyDetailsBelowDto implements Dto {
private String sid; // sid private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("款项名称,数据字典") @ApiModelProperty("款项名称,数据字典")
private String costTitleKey; // 款项名称,数据字典 private String costTitleKey; // 款项名称,数据字典
@ApiModelProperty("款项名称") @ApiModelProperty("款项名称")
@ -76,4 +81,6 @@ public class FinPaymentapplyDetailsBelowDto implements Dto {
@ApiModelProperty("后期是否有平仓付款") @ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款 private String isPay; // 后期是否有平仓付款
@ApiModelProperty
private List<FinPaymentapplyDetailsBelowEveDto> finPaymentapplyDetailsBelowEveList;
} }

70
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java

@ -0,0 +1,70 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "付款申请明细-明细-平仓", description = "付款申请明细-明细-平仓")
@TableName("fin_paymentapply_details_below_eve")
public class FinPaymentapplyDetailsBelowEve extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
}

86
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java

@ -0,0 +1,86 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo <br/>
* Description: 付款申请明细-明细-平仓 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款申请明细-明细-平仓 视图数据详情", description = "付款申请明细-明细-平仓 视图数据详情")
public class FinPaymentapplyDetailsBelowEveDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
}

86
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java

@ -0,0 +1,86 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveDto.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto <br/>
* Description: 付款申请明细-明细-平仓 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款申请明细-明细-平仓 数据传输对象", description = "付款申请明细-明细-平仓 数据传输对象")
public class FinPaymentapplyDetailsBelowEveDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
}

78
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveFeign.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign <br/>
* Description: 付款申请明细-明细-平仓. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "付款申请明细-明细-平仓")
@FeignClient(
contextId = "anrui-fin-FinPaymentapplyDetailsBelowEve",
name = "anrui-fin",
path = "v1/finpaymentapplydetailsbeloweve",
fallback = FinPaymentapplyDetailsBelowEveFeignFallback.class)
public interface FinPaymentapplyDetailsBelowEveFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> listPage(@RequestBody PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody FinPaymentapplyDetailsBelowEveDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<FinPaymentapplyDetailsBelowEveDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

72
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeignFallback <br/>
* Description: 付款申请明细-明细-平仓. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class FinPaymentapplyDetailsBelowEveFeignFallback implements FinPaymentapplyDetailsBelowEveFeign {
@Override
public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> listPage(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/listPage无法访问");
}
@Override
public ResultBean save(FinPaymentapplyDetailsBelowEveDto dto){
return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/delBySids无法访问");
}
@Override
public ResultBean<FinPaymentapplyDetailsBelowEveDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/fetchDetailsBySid无法访问");
}
}

82
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveQuery.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery <br/>
* Description: 付款申请明细-明细-平仓 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件")
public class FinPaymentapplyDetailsBelowEveQuery implements Query {
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
}

84
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java

@ -0,0 +1,84 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo <br/>
* Description: 付款申请明细-明细-平仓 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款申请明细-明细-平仓 视图数据对象", description = "付款申请明细-明细-平仓 视图数据对象")
public class FinPaymentapplyDetailsBelowEveVo implements Vo {
private String sid; // sid
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
}

30
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java

@ -31,34 +31,34 @@ public class FinPaymentapplyVehicle extends BaseEntity {
private BigDecimal money; private BigDecimal money;
@ApiModelProperty("版本") @ApiModelProperty("版本")
private BigDecimal marketSegmentsValue; private String marketSegmentsValue;
@ApiModelProperty("颜色") @ApiModelProperty("颜色")
private BigDecimal carColor; private String carColor;
@ApiModelProperty("排放") @ApiModelProperty("排放")
private BigDecimal emissionStandardValue; private String emissionStandardValue;
@ApiModelProperty("变速箱") @ApiModelProperty("变速箱")
private BigDecimal tranCaseTypeValue; private String tranCaseTypeValue;
@ApiModelProperty("后桥") @ApiModelProperty("后桥")
private BigDecimal rearAxleValue; private String rearAxleValue;
@ApiModelProperty("厂家库龄") @ApiModelProperty("厂家库龄")
private BigDecimal libraryAge; private String libraryAge;
@ApiModelProperty("公司库龄") @ApiModelProperty("公司库龄")
private BigDecimal orgLibraryAge; private String orgLibraryAge;
@ApiModelProperty("上装名称") @ApiModelProperty("上装名称")
private BigDecimal topName; private String topName;
@ApiModelProperty("内部编码") @ApiModelProperty("内部编码")
private BigDecimal insideCode; private String insideCode;
@ApiModelProperty("合同号") @ApiModelProperty("合同号")
private BigDecimal contractNo; private String contractNo;
@ApiModelProperty("销售订单编号") @ApiModelProperty("销售订单编号")
private BigDecimal saleBillNo; private String saleBillNo;
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")
private BigDecimal customerName; private String customerName;
@ApiModelProperty("销售订单类型") @ApiModelProperty("销售订单类型")
private BigDecimal saleTypeValue; private String saleTypeValue;
@ApiModelProperty("买断状态") @ApiModelProperty("买断状态")
private BigDecimal settlementStatusValue; private String settlementStatusValue;
@ApiModelProperty("是否申请买断") @ApiModelProperty("是否申请买断")
private BigDecimal isSettle; private String isSettle;
} }

31
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java

@ -27,4 +27,35 @@ public class FinPaymentapplyVehicleDto implements Dto {
private String configSid; private String configSid;
@ApiModelProperty("厂家结算价") @ApiModelProperty("厂家结算价")
private String money; private String money;
@ApiModelProperty("版本")
private String marketSegmentsValue;
@ApiModelProperty("颜色")
private String carColor;
@ApiModelProperty("排放")
private String emissionStandardValue;
@ApiModelProperty("变速箱")
private String tranCaseTypeValue;
@ApiModelProperty("后桥")
private String rearAxleValue;
@ApiModelProperty("厂家库龄")
private String libraryAge;
@ApiModelProperty("公司库龄")
private String orgLibraryAge;
@ApiModelProperty("上装名称")
private String topName;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("合同号")
private String contractNo;
@ApiModelProperty("销售订单编号")
private String saleBillNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("销售订单类型")
private String saleTypeValue;
@ApiModelProperty("买断状态")
private String settlementStatusValue;
@ApiModelProperty("是否申请买断")
private String isSettle;
} }

31
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java

@ -27,4 +27,35 @@ public class FinPaymentapplyVehicleVo implements Vo {
private String configSid; private String configSid;
@ApiModelProperty("厂家结算价") @ApiModelProperty("厂家结算价")
private String money; private String money;
@ApiModelProperty("版本")
private String marketSegmentsValue;
@ApiModelProperty("颜色")
private String carColor;
@ApiModelProperty("排放")
private String emissionStandardValue;
@ApiModelProperty("变速箱")
private String tranCaseTypeValue;
@ApiModelProperty("后桥")
private String rearAxleValue;
@ApiModelProperty("厂家库龄")
private String libraryAge;
@ApiModelProperty("公司库龄")
private String orgLibraryAge;
@ApiModelProperty("上装名称")
private String topName;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("合同号")
private String contractNo;
@ApiModelProperty("销售订单编号")
private String saleBillNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("销售订单类型")
private String saleTypeValue;
@ApiModelProperty("买断状态")
private String settlementStatusValue;
@ApiModelProperty("是否申请买断")
private String isSettle;
} }

69
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java

@ -0,0 +1,69 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpayment;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.fin.api.finpayment.FinPaymentDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.fin.api.finpayment.FinPayment;
import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
import java.util.List;
/**
* Project: anrui-fin(付款信息管理) <br/>
* File: FinPaymentMapper.java <br/>
* Class: com.yxt.anrui.fin.biz.finpayment.FinPaymentMapper <br/>
* Description: 付款信息管理. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface FinPaymentMapper extends BaseMapper<FinPayment> {
//@Update("update fin_payment set name=#{msg} where id=#{id}")
//IPage<FinPaymentVo> voPage(IPage<FinPayment> page, @Param(Constants.WRAPPER) QueryWrapper<FinPayment> qw);
IPage<FinPaymentVo> selectPageVo(IPage<FinPayment> page, @Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
List<FinPaymentVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
@Select("select * from fin_payment")
List<FinPaymentVo> selectListVo();
@Select("select * from fin_payment where useOrgSid = #{useOrgSid}")
List<FinPaymentDetailsVo> selectByUseOrgSid(String useOrgSid);
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml

@ -0,0 +1,13 @@
<?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.fin.biz.finpayment.FinPaymentMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
</select>
</mapper>

107
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java

@ -0,0 +1,107 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpayment;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.fin.api.finpayment.FinPayment;
import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
import com.yxt.anrui.fin.api.finpayment.FinPaymentDto;
import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
/**
* Project: anrui-fin(付款信息管理) <br/>
* File: FinPaymentFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.finpayment.FinPaymentRest <br/>
* Description: 付款信息管理. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "付款信息管理")
@RestController("com.yxt.anrui.fin.biz.finpayment.FinPaymentRest")
@RequestMapping("v1/finpayment")
public class FinPaymentRest implements FinPaymentFeign {
@Autowired
private FinPaymentService finPaymentService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<FinPaymentVo>> listPage(@RequestBody PagerQuery<FinPaymentQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<FinPaymentVo> pv = finPaymentService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody FinPaymentDto dto){
ResultBean rb = ResultBean.fireFail();
finPaymentService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
finPaymentService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<FinPaymentDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
FinPaymentDetailsVo vo = finPaymentService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<FinPaymentDetailsVo>> selectByUseOrgSid(String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
List<FinPaymentDetailsVo> voList = finPaymentService.selectByUseOrgSid(useOrgSid);
return rb.success().setData(voList);
}
}

114
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java

@ -0,0 +1,114 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpayment;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
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;
import com.yxt.anrui.fin.api.finpayment.FinPayment;
import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
import com.yxt.anrui.fin.api.finpayment.FinPaymentDto;
import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-fin(付款信息管理) <br/>
* File: FinPaymentService.java <br/>
* Class: com.yxt.anrui.fin.biz.finpayment.FinPaymentService <br/>
* Description: 付款信息管理 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 14:27:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinPayment> {
private QueryWrapper<FinPayment> createQueryWrapper(FinPaymentQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinPayment> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<FinPaymentVo> listPageVo(PagerQuery<FinPaymentQuery> pq) {
FinPaymentQuery query = pq.getParams();
QueryWrapper<FinPayment> qw = createQueryWrapper(query);
IPage<FinPayment> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPaymentVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(FinPaymentDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(FinPaymentDto dto) {
FinPayment entity = new FinPayment();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(FinPaymentDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
FinPayment entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPaymentDetailsVo fetchDetailsVoBySid(String sid) {
FinPayment entity = fetchBySid(sid);
FinPaymentDetailsVo vo = new FinPaymentDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<FinPaymentDetailsVo> selectByUseOrgSid(String useOrgSid) {
return baseMapper.selectByUseOrgSid(useOrgSid);
}
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java

@ -56,9 +56,6 @@ import java.util.Map;
@Mapper @Mapper
public interface FinPaymentapplyMapper extends BaseMapper<FinPaymentapply> { public interface FinPaymentapplyMapper extends BaseMapper<FinPaymentapply> {
//@Update("update fin_paymentapply set name=#{msg} where id=#{id}")
//IPage<FinPaymentapplyVo> voPage(IPage<FinPaymentapply> page, @Param(Constants.WRAPPER) QueryWrapper<FinPaymentapply> qw);
IPage<FinPaymentapplyVo> selectPageVo(IPage<FinPaymentapply> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapply> qw); IPage<FinPaymentapplyVo> selectPageVo(IPage<FinPaymentapply> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapply> qw);
List<FinPaymentapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPaymentapply> qw); List<FinPaymentapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPaymentapply> qw);

74
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml

@ -4,22 +4,44 @@
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo"> <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo">
SELECT fp.sid, SELECT
if(length(fp.nodeState) > 0, fp.nodeState, '待提交') as nodeState, fp.sid,
fp.busSid, IF(
fp.costTypeValue, LENGTH(fp.nodeState) > 0,
fp.costTitleValue, fp.nodeState,
fp.receiveCompany, '待提交'
fp.receiveBankAccount, ) AS nodeState,
fp.cost, fp.billNo,
case fp.state fp.useOrgName,
when 1 then '未付款' fp.deptName,
when 2 then '已付款' end as state, fp.name,
fp.remarks, fp.createTime,
fp.procInstId, fp.finishTime,
fp.procDefId, fp.carBrandName,
fp.receiveBank fp.costRangeValue,
FROM fin_paymentapply fp fp.costTypeValue,
CASE
fp.isVeh
WHEN 1
THEN '是'
WHEN 2
THEN '否'
END AS isVeh,
fp.payCompany,
fp.remarks,
fp.cost,
CASE
fp.state
WHEN 1
THEN '未付款'
WHEN 2
THEN '已付款'
END AS state,
fp.paymentTotal,
fp.procInstId,
fp.procDefId
FROM
fin_paymentapply fp
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -59,27 +81,29 @@
<select id="fetchDetailsVoBySid" resultType="com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDetailsVo"> <select id="fetchDetailsVoBySid" resultType="com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDetailsVo">
select fp.sid, select fp.sid,
fp.deptSid,
fp.deptName,
fp.costRangeKey,
fp.costRangeValue,
fp.isLeaderSp,
fp.createBySid, fp.createBySid,
fp.busSid, fp.busSid,
fp.costTypeKey, fp.costTypeKey,
fp.costTypeValue, fp.costTypeValue,
fp.costTitleKey,
fp.costTitleValue,
fp.cost, fp.cost,
fp.payCompanySid, fp.payCompanySid,
fp.payCompany, fp.payCompany,
fp.receiveBank,
fp.receiveCompany,
fp.receiveBankAccount,
fp.taskId, fp.taskId,
fp.procInstId, fp.procInstId,
fp.receiveCompanySid,
fp.remarks, fp.remarks,
fp.name, fp.name,
DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime,
fp.isVeh, fp.isVeh,
fp.carBrandSid, fp.carBrandSid,
fp.carBrandName fp.carBrandName,
fp.isSales,
fp.isSettle,
fp.useOrgSid
from fin_paymentapply fp from fin_paymentapply fp
where fp.sid = #{sid} where fp.sid = #{sid}
</select> </select>
@ -106,15 +130,13 @@
</update> </update>
<select id="getPaymentApply" resultType="com.yxt.anrui.fin.api.finpaymentapply.AppFinPaymentApplyVo"> <select id="getPaymentApply" resultType="com.yxt.anrui.fin.api.finpaymentapply.AppFinPaymentApplyVo">
select fp.costTitleValue, select DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime,
DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime,
fp.createBySid, fp.createBySid,
fp.name, fp.name,
fp.costTypeValue, fp.costTypeValue,
fp.busSid, fp.busSid,
fp.cost, fp.cost,
fp.payCompany, fp.payCompany,
fp.receiveCompany,
fp.remarks, fp.remarks,
fp.isVeh, fp.isVeh,
case fp.isVeh when 1 then '是' when 0 then '否' end as isVehValue, case fp.isVeh when 1 then '是' when 0 then '否' end as isVehValue,

132
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@ -45,11 +45,16 @@ import com.yxt.anrui.fin.api.finpaymentapply.flow.SubmitFinPayDto;
import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService; import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService; import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService; import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@ -65,6 +70,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto;
@ -126,6 +132,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
@Autowired @Autowired
private FinPaymentapplyVehicleService finPaymentapplyVehicleService; private FinPaymentapplyVehicleService finPaymentapplyVehicleService;
@Autowired @Autowired
private FinPaymentapplyDetailsBelowService finPaymentapplyDetailsBelowService;
@Autowired
private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
@Autowired
private MessageFeign messageFeign; private MessageFeign messageFeign;
@Autowired @Autowired
private ScmCollectionRebateFeign scmCollectionRebateFeign; private ScmCollectionRebateFeign scmCollectionRebateFeign;
@ -135,38 +145,81 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) { public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
FinPaymentapplyQuery query = pq.getParams(); FinPaymentapplyQuery query = pq.getParams();
QueryWrapper<FinPaymentapply> qw = new QueryWrapper<>(); QueryWrapper<FinPaymentapply> qw = new QueryWrapper<>();
FinPaymentapplyQuery pageQuery = pq.getParams(); //========================================数据授权开始
if (pageQuery != null) { if (StringUtils.isNotBlank(query.getMenuUrl())) {
//付款状态 PrivilegeQuery privilegeQuery = new PrivilegeQuery();
if (StringUtils.isNotBlank(pageQuery.getState())) { privilegeQuery.setOrgPath(query.getOrgPath());
qw.eq("fp.state", pageQuery.getState()); privilegeQuery.setMenuUrl(query.getMenuUrl());
} privilegeQuery.setUserSid(query.getUserSid());
//款项类别 ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) { if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
qw.eq("fp.costTypekey", pageQuery.getCostTypeKey()); //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
} String orgSidPath = query.getOrgPath();
//款项名称 orgSidPath = orgSidPath + "/";
if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) { int i1 = orgSidPath.indexOf("/");
qw.eq("fp.costTitleKey", pageQuery.getCostTitleKey()); int i2 = orgSidPath.indexOf("/", i1 + 1);
} int i3 = orgSidPath.indexOf("/", i2 + 1);
//收款单位 int i4 = orgSidPath.indexOf("/", i3 + 1);
if (StringUtils.isNotBlank(pageQuery.getReceiveCompanySid())) { String orgLevelKey = defaultIdReltBean.getData();
qw.like("fp.receiveCompanySid", pageQuery.getReceiveCompanySid()); if ("1".equals(orgLevelKey)) {
} orgSidPath = orgSidPath.substring(0, i1);
//申请日期 qw.like("fp.orgSidPath", orgSidPath);
qw.apply(StringUtils.isNotBlank(pageQuery.getApplyStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getApplyStartDate() + "','%Y-%m-%d')"). } else if ("2".equals(orgLevelKey)) {
apply(StringUtils.isNotBlank(pageQuery.getApplyEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getApplyEndDate() + "','%Y-%m-%d')" orgSidPath = orgSidPath.substring(0, i2);
); qw.like("fp.orgSidPath", orgSidPath);
//申请人sid } else if ("3".equals(orgLevelKey)) {
if (StringUtils.isNotBlank(pageQuery.getUserSid())) { orgSidPath = orgSidPath.substring(0, i3);
qw.eq("fp.createBySid", pageQuery.getUserSid()); qw.like("fp.orgSidPath", orgSidPath);
} } else if ("4".equals(orgLevelKey)) {
if (StringUtils.isNotBlank(pageQuery.getOrgPath())) { orgSidPath = orgSidPath.substring(0, i4);
String orgSid = sysStaffOrgFeign.getOrgSidByPath(pageQuery.getOrgPath()).getData(); qw.like("fp.orgSidPath", orgSidPath);
qw.eq("fp.createOrgSid", orgSid); } else if ("5".equals(orgLevelKey)) {
qw.eq("fp.createBySid", query.getUserSid());
} else {
PagerVo<FinPaymentapplyVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<FinPaymentapplyVo> p = new PagerVo<>();
return p;
} }
} }
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("fp.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("fp.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getName())) {
qw.like("fp.name", query.getName());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("fp.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getCarBrandSid())) {
qw.eq("fp.carBrandSid", query.getCarBrandSid());
}
if (StringUtils.isNotBlank(query.getCostRangeKey())) {
qw.eq("fp.costRangeKey", query.getCostRangeKey());
}
if (StringUtils.isNotBlank(query.getIsVeh())) {
qw.eq("fp.isVeh", query.getIsVeh());
}
if (StringUtils.isNotBlank(query.getPayCompany())) {
qw.like("fp.payCompany", query.getPayCompany());
}
//付款状态
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("fp.state", query.getState());
}
//申请日期
qw.apply(StringUtils.isNotBlank(query.getApplyStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + query.getApplyStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getApplyEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + query.getApplyEndDate() + "','%Y-%m-%d')"
);
//办结日期
qw.apply(StringUtils.isNotBlank(query.getFinishStartTime()), "date_format (fp.finishTime,'%Y-%m-%d') >= date_format('" + query.getFinishStartTime() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getFinishEndTime()), "date_format (fp.finishTime,'%Y-%m-%d') <= date_format('" + query.getFinishEndTime() + "','%Y-%m-%d')"
);
qw.orderByDesc("fp.id"); qw.orderByDesc("fp.id");
IPage<FinPaymentapply> page = PagerUtil.queryToPage(pq); IPage<FinPaymentapply> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentapplyVo> pagging = baseMapper.selectPageVo(page, qw); IPage<FinPaymentapplyVo> pagging = baseMapper.selectPageVo(page, qw);
@ -201,13 +254,14 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
} }
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData(); createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
FinPaymentapply finPaymentapply = new FinPaymentapply(); FinPaymentapply finPaymentapply = new FinPaymentapply();
BeanUtil.copyProperties(dto, finPaymentapply, "sid"); BeanUtil.copyProperties(dto, finPaymentapply, "sid");
String billNo = getApplyCode(createOrgSid); String billNo = getApplyCode(createOrgSid);
finPaymentapply.setBillNo(billNo); finPaymentapply.setBillNo(billNo);
finPaymentapply.setOrgSidPath(orgSidPath); finPaymentapply.setOrgSidPath(orgSidPath);
finPaymentapply.setCreateOrgSid(createOrgSid);
finPaymentapply.setUseOrgSid(createOrgSid); finPaymentapply.setUseOrgSid(createOrgSid);
finPaymentapply.setUseOrgName(organizationVo.getName());
List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList(); List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
if (detailsList != null && detailsList.size() > 0) { if (detailsList != null && detailsList.size() > 0) {
String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
@ -248,7 +302,6 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
} else { } else {
finPaymentapplyVehicleService.deleteVehicle(dtoSid); finPaymentapplyVehicleService.deleteVehicle(dtoSid);
} }
baseMapper.updateById(finPaymentapply); baseMapper.updateById(finPaymentapply);
} }
return rb.success().setData(dtoSid); return rb.success().setData(dtoSid);
@ -275,6 +328,15 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
public FinPaymentapplyDetailsVo fetchDetailsVoBySid(String sid) { public FinPaymentapplyDetailsVo fetchDetailsVoBySid(String sid) {
FinPaymentapplyDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid); FinPaymentapplyDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid);
List<FinPaymentapplyDetailVo> detailsList = finPaymentapplyDetailsService.getDetails(sid); List<FinPaymentapplyDetailVo> detailsList = finPaymentapplyDetailsService.getDetails(sid);
for (FinPaymentapplyDetailVo finPaymentapplyDetailVo : detailsList) {
List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid());
finPaymentapplyDetailVo.setPayAccountTotal(finPaymentapplyDetailsBelowDetailsVos.stream().map(FinPaymentapplyDetailsBelowDetailsVo::getPayAccount).reduce(BigDecimal.ZERO, BigDecimal::add));
finPaymentapplyDetailVo.setFinPaymentapplyDetailsBelowList(finPaymentapplyDetailsBelowDetailsVos);
for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) {
List<FinPaymentapplyDetailsBelowEveDetailsVo> finPaymentapplyDetailsBelowEveDetailsVos = finPaymentapplyDetailsBelowEveService.selByMainSid(finPaymentapplyDetailsBelowDetailsVo.getSid());
finPaymentapplyDetailsBelowDetailsVo.setFinPaymentapplyDetailsBelowEveList(finPaymentapplyDetailsBelowEveDetailsVos);
}
}
List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(sid); List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(sid);
vo.setDetailsList(detailsList); vo.setDetailsList(detailsList);
vo.setVehicleList(vehicleList); vo.setVehicleList(vehicleList);
@ -492,17 +554,11 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData()); finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
//使用组织 //使用组织
finPaymentrecordDto.setUseOrgSid(stringResultBean.getData()); finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
//款项名称
finPaymentrecordDto.setCostTitleKey(finPaymentapply.getCostTitleKey());
finPaymentrecordDto.setCostTitleValue(finPaymentapply.getCostTitleValue());
//款项类别 //款项类别
finPaymentrecordDto.setCostTypeKey(finPaymentapply.getCostTypeKey()); finPaymentrecordDto.setCostTypeKey(finPaymentapply.getCostTypeKey());
finPaymentrecordDto.setCostTypeValue(finPaymentapply.getCostTypeValue()); finPaymentrecordDto.setCostTypeValue(finPaymentapply.getCostTypeValue());
//备注 //备注
finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue()); finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
//收款单位名称
finPaymentrecordDto.setReceiveCompany(finPaymentapply.getReceiveCompany());
List<FinPaymentapplyDetailVo> detailVoList = vo.getDetailsList(); List<FinPaymentapplyDetailVo> detailVoList = vo.getDetailsList();
detailVoList.removeAll(Collections.singleton(null)); detailVoList.removeAll(Collections.singleton(null));
if (!detailVoList.isEmpty()) { if (!detailVoList.isEmpty()) {

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml

@ -19,15 +19,22 @@
</delete> </delete>
<select id="getDetails" resultType="com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo"> <select id="getDetails" resultType="com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo">
select fd.sid, SELECT fd.sid,
fd.actualPay, fd.actualPay,
fd.costTitleKey,
fd.costTitleValue,
fd.paymentType, fd.paymentType,
fd.bank, fd.bank,
fd.receivingAccount, fd.receivingAccount,
fd.payAccount, fd.payAccount,
fd.remarks, fd.remarks,
fd.paymentTypeKey fd.paymentTypeKey,
from fin_paymentapply_details fd fd.receiveCompany,
where fd.applySid = #{sid} SUM(fdb.payAccount) AS payAccountTotal
FROM fin_paymentapply_details fd
LEFT JOIN fin_paymentapply_details_below fdb
ON fd.sid = fdb.detailSid
WHERE fd.applySid = #{sid}
GROUP BY fd.sid
</select> </select>
</mapper> </mapper>

28
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java

@ -5,7 +5,12 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -18,6 +23,12 @@ import java.util.List;
*/ */
@Service @Service
public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPaymentapplyDetailsMapper, FinPaymentapplyDetails> { public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPaymentapplyDetailsMapper, FinPaymentapplyDetails> {
@Autowired
private FinPaymentapplyDetailsBelowService finPaymentapplyDetailsBelowService;
@Autowired
private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
public List<AppFinPaymentapplyDetailVo> getDetailsList(String sid) { public List<AppFinPaymentapplyDetailVo> getDetailsList(String sid) {
return baseMapper.getDetailsList(sid); return baseMapper.getDetailsList(sid);
} }
@ -32,7 +43,24 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPayment
finPaymentapplyDetails.setApplySid(sid); finPaymentapplyDetails.setApplySid(sid);
bigDecimal = bigDecimal.add(new BigDecimal(dto.getPayAccount())); bigDecimal = bigDecimal.add(new BigDecimal(dto.getPayAccount()));
finPaymentapplyDetails.setPayAccount(new BigDecimal(dto.getPayAccount())); finPaymentapplyDetails.setPayAccount(new BigDecimal(dto.getPayAccount()));
if (dto.getPaymentTypeKey().equals("102")){
finPaymentapplyDetails.setIsPay(0);
}else {
finPaymentapplyDetails.setIsPay(1);
}
baseMapper.insert(finPaymentapplyDetails); baseMapper.insert(finPaymentapplyDetails);
List<FinPaymentapplyDetailsBelowDto> finPaymentapplyDetailsBelowList = dto.getFinPaymentapplyDetailsBelowList();
for (FinPaymentapplyDetailsBelowDto finPaymentapplyDetailsBelowDto : finPaymentapplyDetailsBelowList) {
finPaymentapplyDetailsBelowDto.setDetailSid(finPaymentapplyDetails.getSid());
String belowSid = finPaymentapplyDetailsBelowService.insertByDto(finPaymentapplyDetailsBelowDto);
List<FinPaymentapplyDetailsBelowEveDto> finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList();
for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) {
finPaymentapplyDetailsBelowEveDto.setDetailSid(belowSid);
finPaymentapplyDetailsBelowEveDto.setCostTypeKey("004");
finPaymentapplyDetailsBelowEveDto.setCostTypeValue("融资付款");
finPaymentapplyDetailsBelowEveService.insertByDto(finPaymentapplyDetailsBelowEveDto);
}
}
} }
return bigDecimal.toString(); return bigDecimal.toString();

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@ -52,13 +53,6 @@ import java.util.List;
@Mapper @Mapper
public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper<FinPaymentapplyDetailsBelow> { public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper<FinPaymentapplyDetailsBelow> {
//@Update("update fin_paymentapply_details_below set name=#{msg} where id=#{id}") @Select("select * from fin_paymentapply_details_below where detailSid = #{mainSid}")
//IPage<FinPaymentapplyDetailsBelowVo> voPage(IPage<FinPaymentapplyDetailsBelow> page, @Param(Constants.WRAPPER) QueryWrapper<FinPaymentapplyDetailsBelow> qw); List<FinPaymentapplyDetailsBelowDetailsVo> selByMainSid(String mainSid);
IPage<FinPaymentapplyDetailsBelowVo> selectPageVo(IPage<FinPaymentapplyDetailsBelow> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelow> qw);
List<FinPaymentapplyDetailsBelowVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelow> qw);
@Select("select * from fin_paymentapply_details_below")
List<FinPaymentapplyDetailsBelowVo> selectListVo();
} }

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml

@ -3,11 +3,4 @@
<mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowMapper"> <mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowVo">
SELECT * FROM fin_paymentapply_details_below <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowVo">
SELECT * FROM fin_paymentapply_details_below <where> ${ew.sqlSegment} </where>
</select>
</mapper> </mapper>

31
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java

@ -39,6 +39,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsB
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* Project: anrui-fin(付款明细) <br/> * Project: anrui-fin(付款明细) <br/>
* File: FinPaymentapplyDetailsBelowService.java <br/> * File: FinPaymentapplyDetailsBelowService.java <br/>
@ -55,35 +57,14 @@ import org.springframework.stereotype.Service;
@Service @Service
public class FinPaymentapplyDetailsBelowService extends MybatisBaseService<FinPaymentapplyDetailsBelowMapper, FinPaymentapplyDetailsBelow> { public class FinPaymentapplyDetailsBelowService extends MybatisBaseService<FinPaymentapplyDetailsBelowMapper, FinPaymentapplyDetailsBelow> {
public void saveOrUpdateDto(FinPaymentapplyDetailsBelowDto dto) { public String insertByDto(FinPaymentapplyDetailsBelowDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(FinPaymentapplyDetailsBelowDto dto) {
FinPaymentapplyDetailsBelow entity = new FinPaymentapplyDetailsBelow(); FinPaymentapplyDetailsBelow entity = new FinPaymentapplyDetailsBelow();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity); baseMapper.insert(entity);
return entity.getSid();
} }
public void updateByDto(FinPaymentapplyDetailsBelowDto dto) { public List<FinPaymentapplyDetailsBelowDetailsVo> selByMainSid(String mainSid) {
String dtoSid = dto.getSid(); return baseMapper.selByMainSid(mainSid);
if (StringUtils.isBlank(dtoSid)) {
return;
}
FinPaymentapplyDetailsBelow entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPaymentapplyDetailsBelowDetailsVo fetchDetailsVoBySid(String sid) {
FinPaymentapplyDetailsBelow entity = fetchBySid(sid);
FinPaymentapplyDetailsBelowDetailsVo vo = new FinPaymentapplyDetailsBelowDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
} }
} }

69
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java

@ -0,0 +1,69 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
import java.util.List;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveMapper.java <br/>
* Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveMapper <br/>
* Description: 付款申请明细-明细-平仓. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaymentapplyDetailsBelowEve> {
//@Update("update fin_paymentapply_details_below_eve set name=#{msg} where id=#{id}")
//IPage<FinPaymentapplyDetailsBelowEveVo> voPage(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) QueryWrapper<FinPaymentapplyDetailsBelowEve> qw);
IPage<FinPaymentapplyDetailsBelowEveVo> selectPageVo(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
List<FinPaymentapplyDetailsBelowEveVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
@Select("select * from fin_paymentapply_details_below_eve")
List<FinPaymentapplyDetailsBelowEveVo> selectListVo();
@Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid);
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml

@ -0,0 +1,13 @@
<?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.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
SELECT * FROM fin_paymentapply_details_below_eve <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
SELECT * FROM fin_paymentapply_details_below_eve <where> ${ew.sqlSegment} </where>
</select>
</mapper>

100
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java

@ -0,0 +1,100 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveRest <br/>
* Description: 付款申请明细-明细-平仓. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "付款申请明细-明细-平仓")
@RestController
@RequestMapping("v1/finpaymentapplydetailsbeloweve")
public class FinPaymentapplyDetailsBelowEveRest implements FinPaymentapplyDetailsBelowEveFeign {
@Autowired
private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> listPage(@RequestBody PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<FinPaymentapplyDetailsBelowEveVo> pv = finPaymentapplyDetailsBelowEveService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody FinPaymentapplyDetailsBelowEveDto dto){
ResultBean rb = ResultBean.fireFail();
finPaymentapplyDetailsBelowEveService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
finPaymentapplyDetailsBelowEveService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<FinPaymentapplyDetailsBelowEveDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
FinPaymentapplyDetailsBelowEveDetailsVo vo = finPaymentapplyDetailsBelowEveService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

114
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

@ -0,0 +1,114 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
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;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-fin(平仓) <br/>
* File: FinPaymentapplyDetailsBelowEveService.java <br/>
* Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService <br/>
* Description: 付款申请明细-明细-平仓 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-13 10:03:07 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<FinPaymentapplyDetailsBelowEveMapper, FinPaymentapplyDetailsBelowEve> {
private QueryWrapper<FinPaymentapplyDetailsBelowEve> createQueryWrapper(FinPaymentapplyDetailsBelowEveQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<FinPaymentapplyDetailsBelowEveVo> listPageVo(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = createQueryWrapper(query);
IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto){
FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid){
FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid);
FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
}

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml

@ -16,12 +16,7 @@
</delete> </delete>
<select id="getVehicleList" resultType="com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo"> <select id="getVehicleList" resultType="com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo">
select fv.modelName, select fv.*
fv.vinNo,
fv.money,
fv.modelSid,
fv.vehiSid,
fv.configSid
from fin_paymentapply_vehicle fv from fin_paymentapply_vehicle fv
where applySid = #{sid} where applySid = #{sid}
</select> </select>

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
@ -35,6 +36,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -56,6 +58,9 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
private String sid; // sid private String sid; // sid
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remarks; // 备注 private String remarks; // 备注
@ApiModelProperty("部门sid") @ApiModelProperty("部门sid")

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java

@ -27,9 +27,11 @@ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyDelegateQuery;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
@ -118,5 +120,13 @@ public interface ScmCollectionrebateCheckapplyFeign {
@GetMapping(value = "/getPreviousNodesForReject") @GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody ScmCollectionRebateCheckApplyDelegateQuery delegateQuery);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody ScmCollectionRebateCheckApplyDelegateQuery delegateQuery);
} }

11
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java

@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
@ -114,4 +115,14 @@ public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollection
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) { public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null; return null;
} }
@Override
public ResultBean delegate(ScmCollectionRebateCheckApplyDelegateQuery delegateQuery) {
return null;
}
@Override
public ResultBean assignTask(ScmCollectionRebateCheckApplyDelegateQuery delegateQuery) {
return null;
}
} }

23
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyDelegateQuery.java

@ -0,0 +1,23 @@
package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/11
**/
@Data
public class ScmCollectionRebateCheckApplyDelegateQuery {
private String userSid;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java

@ -31,6 +31,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.*; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.*;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
@ -89,9 +90,9 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
for (String sid : sids) { for (String sid : sids) {
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = scmCollectionrebateCheckapplyService.fetchBySid(sid); ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = scmCollectionrebateCheckapplyService.fetchBySid(sid);
if (!scmCollectionrebateCheckapply.getNodeState().equals("待提交")){ if (!scmCollectionrebateCheckapply.getNodeState().equals("待提交")) {
return rb.setMsg("所选数据中包含已提交专项返利信息,无法删除"); return rb.setMsg("所选数据中包含已提交专项返利信息,无法删除");
} }
} }
scmCollectionrebateCheckapplyService.delBySids(sids); scmCollectionrebateCheckapplyService.delBySids(sids);
return rb.success(); return rb.success();
@ -146,4 +147,14 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) { public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return scmCollectionrebateCheckapplyService.getPreviousNodesForReject(query); return scmCollectionrebateCheckapplyService.getPreviousNodesForReject(query);
} }
@Override
public ResultBean delegate(ScmCollectionRebateCheckApplyDelegateQuery query) {
return scmCollectionrebateCheckapplyService.delegate(query);
}
@Override
public ResultBean assignTask(ScmCollectionRebateCheckApplyDelegateQuery query) {
return scmCollectionrebateCheckapplyService.assignTask(query);
}
} }

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flow2.FlowFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -42,6 +43,7 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
@ -462,4 +464,20 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); // List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList); return rb.success().setData(voList);
} }
public ResultBean delegate(ScmCollectionRebateCheckApplyDelegateQuery query) {
ResultBean rb = ResultBean.fireFail();
FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
BeanUtil.copyProperties(query, delegateQuery);
flowFeign.delegate(delegateQuery);
return rb.success();
}
public ResultBean assignTask(ScmCollectionRebateCheckApplyDelegateQuery query) {
ResultBean rb = ResultBean.fireFail();
FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
BeanUtil.copyProperties(query, delegateQuery);
flowFeign.assignTask(delegateQuery);
return rb.success();
}
} }

76
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyDetailsVo.java

@ -0,0 +1,76 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplyVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo <br/>
* Description: 回款返利核对申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-27 15:14:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "回款返利核对申请表 视图数据详情", description = "回款返利核对申请表 视图数据详情")
public class AppCollectionrebateCheckapplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("核对申请标题")
private String checkApply;
@ApiModelProperty("部门")
private String deptName;
@ApiModelProperty("创建人姓名")
private String createByName;
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("流程实例的sid")
private String procInsId;
@ApiModelProperty("taskId")
private String taskId;
@ApiModelProperty("按返利类型统计")
private List<AppCollectionrebateCheckapplydetailDetailsVo> scmWhenCollectionrebateCheckapplydetailDetails;
@ApiModelProperty("按预提年月统计")
private List<AppCollectionrebateCheckapplydetailDetailsVo> scmLastCollectionrebateCheckapplydetailDetails;
}

74
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java

@ -0,0 +1,74 @@
package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppFlowDto;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppFlowQuery;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppFlowTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateDetailsVo;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Author
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppCollectionrebateCheckapply",
name = "anrui-terminal",
path = "v1/collectionrebatecheckapply")
public interface AppCollectionrebateCheckapplyFeign {
@ApiOperation("详情")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AppCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("明细")
@GetMapping("/collectionRebateCheckDetails/{sid}")
public ResultBean<List<AppCollectionRebateDetailsVo>> collectionRebateCheckDetails(@PathVariable("sid") String sid);
/**********************************************流程********************************************/
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
}

69
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplydetailDetailsVo.java

@ -0,0 +1,69 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplydetailVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo <br/>
* Description: 回款返利核对申请表_返利列表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-27 15:14:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "回款返利核对申请表_返利列表 视图数据详情", description = "回款返利核对申请表_返利列表 视图数据详情")
public class AppCollectionrebateCheckapplydetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("台数")
private String num; // 台数
@ApiModelProperty("预提金额")
private String estimateRebate;
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppDelegateQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/28 10:16
*/
@Data
public class AppDelegateQuery {
@ApiModelProperty
private String userSid;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

37
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowDto.java

@ -0,0 +1,37 @@
package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:09
* @Description
*/
@Data
public class AppFlowDto implements Dto {
private static final long serialVersionUID = 3626473483180150495L;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:procInsId")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
}

28
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowQuery.java

@ -0,0 +1,28 @@
package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:15
* @Description
*/
@Data
public class AppFlowQuery implements Query {
private static final long serialVersionUID = 5514095179438249641L;
@ApiModelProperty(value = "节点key")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "0 上一环节 1下一环节")
@NotNull(message = "参数错误:next")
private Integer next;
@ApiModelProperty("组织机构全路径")
private String orgPath;
}

47
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowTaskQuery.java

@ -0,0 +1,47 @@
package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:11
* @Description
*/
@Data
public class AppFlowTaskQuery implements Query {
private static final long serialVersionUID = -7082170710942810289L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
@JsonProperty("procInsId")
private String instanceId;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java

@ -20,7 +20,6 @@ import java.util.List;
* @Date * @Date
* @Description * @Description
*/ */
@Api(tags = "售后盘盈入库")
@FeignClient( @FeignClient(
contextId = "terminal-AppCollectionRebateWithApply", contextId = "terminal-AppCollectionRebateWithApply",
name = "anrui-terminal", name = "anrui-terminal",

90
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyRest.java

@ -0,0 +1,90 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.supplychain.collectionrebatecheckapply;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplyDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplyFeign;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.*;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("v1/collectionrebatecheckapply")
public class AppCollectionrebateCheckapplyRest implements AppCollectionrebateCheckapplyFeign {
@Autowired
private AppCollectionrebateCheckapplyService appCollectionRebateWithApplyService;
@Override
public ResultBean<AppCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid) {
return appCollectionRebateWithApplyService.fetchDetailsBySid(sid);
}
@Override
public ResultBean<List<AppCollectionRebateDetailsVo>> collectionRebateCheckDetails(String sid) {
return appCollectionRebateWithApplyService.collectionRebateCheckDetails(sid);
}
@Override
public ResultBean agreeCreditInfo(AppFlowDto dto) {
return appCollectionRebateWithApplyService.agreeCreditInfo(dto);
}
@Override
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
return appCollectionRebateWithApplyService.rejectCreditInfo(query);
}
@Override
public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
return appCollectionRebateWithApplyService.recallCreditInfo(query);
}
@Override
public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
return appCollectionRebateWithApplyService.stopCreditInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
return appCollectionRebateWithApplyService.getFlowOperateTitle(query);
}
@Override
public ResultBean delegate(AppDelegateQuery delegateQuery) {
return appCollectionRebateWithApplyService.delegate(delegateQuery);
}
@Override
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
return appCollectionRebateWithApplyService.assignTask(delegateQuery);
}
}

199
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyService.java

@ -0,0 +1,199 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.supplychain.collectionrebatecheckapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplyDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.*;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Service
public class AppCollectionrebateCheckapplyService {
@Resource
private ScmCollectionrebateCheckapplyFeign scmCollectionrebateCheckapplyFeign;
@Autowired
private ScmCollectionrebateCheckapplydetailFeign scmCollectionrebateCheckapplydetailFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
public ResultBean<AppCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapplyDetailsVo data = scmCollectionrebateCheckapplyFeign.fetchDetailsBySid(sid).getData();
AppCollectionrebateCheckapplyDetailsVo appCollectionrebateCheckapplyDetailsVo = new AppCollectionrebateCheckapplyDetailsVo();
appCollectionrebateCheckapplyDetailsVo.setProcInsId(data.getProcInstId());
BeanUtil.copyProperties(data, appCollectionrebateCheckapplyDetailsVo);
List<AppCollectionrebateCheckapplydetailDetailsVo> when = appCollectionrebateCheckapplyDetailsVo.getScmWhenCollectionrebateCheckapplydetailDetails();
List<AppCollectionrebateCheckapplydetailDetailsVo> last = appCollectionrebateCheckapplyDetailsVo.getScmLastCollectionrebateCheckapplydetailDetails();
for (AppCollectionrebateCheckapplydetailDetailsVo collectionrebateCheckapplydetailDetailsVo : when) {
collectionrebateCheckapplydetailDetailsVo.setSid(collectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid());
}
for (AppCollectionrebateCheckapplydetailDetailsVo collectionrebateCheckapplydetailDetailsVo : last) {
collectionrebateCheckapplydetailDetailsVo.setSid(collectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid());
}
return rb.success().setData(appCollectionrebateCheckapplyDetailsVo);
}
public ResultBean<List<AppCollectionRebateDetailsVo>> collectionRebateCheckDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
List<AppCollectionRebateDetailsVo> appCollectionRebateDetailsVos = new ArrayList<>();
List<ScmCollectionRebateDetailsVo> data = scmCollectionrebateCheckapplydetailFeign.collectionRebateCheckDetails(sid).getData();
for (ScmCollectionRebateDetailsVo datum : data) {
AppCollectionRebateDetailsVo appCollectionRebateDetailsVo = new AppCollectionRebateDetailsVo();
BeanUtil.copyProperties(datum,appCollectionRebateDetailsVo);
appCollectionRebateDetailsVos.add(appCollectionRebateDetailsVo);
}
return rb.success().setData(appCollectionRebateDetailsVos);
}
public ResultBean agreeCreditInfo(AppFlowDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
ScmCollectionRebateCheckApplyCompleteDto scmCollectionRebateCheckApplyCompleteDto = new ScmCollectionRebateCheckApplyCompleteDto();
BeanUtil.copyProperties(dto, scmCollectionRebateCheckApplyCompleteDto);
scmCollectionRebateCheckApplyCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = scmCollectionrebateCheckapplyFeign.complete(scmCollectionRebateCheckApplyCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean resultBean = scmCollectionrebateCheckapplyFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean resultBean = scmCollectionrebateCheckapplyFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean resultBean = scmCollectionrebateCheckapplyFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
GetNodeQuery getNodeQuery = new GetNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject = scmCollectionrebateCheckapplyFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<GetNodeVo>> getNextNodesForSubmit = scmCollectionrebateCheckapplyFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
public ResultBean delegate(AppDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateCheckApplyDelegateQuery delegateQuery1 = new
ScmCollectionRebateCheckApplyDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
scmCollectionrebateCheckapplyFeign.delegate(delegateQuery1);
return rb.success();
}
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateCheckApplyDelegateQuery delegateQuery1 = new
ScmCollectionRebateCheckApplyDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
scmCollectionrebateCheckapplyFeign.assignTask(delegateQuery1);
return rb.success();
}
}
Loading…
Cancel
Save