From 12edfea4e619d4e41c5db355ac77a313ad63833f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sun, 24 Apr 2022 15:56:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=82=20=E7=9B=96=E7=AB=A0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commonappendix/CommonAttachTypeEnum.java | 3 +- .../api/bussealapply/BusSealApply.java | 70 +++++++ .../bussealapply/BusSealApplyAppendix.java | 66 +++++++ .../bussealapply/BusSealApplyDetailsVo.java | 71 +++++++ .../api/bussealapply/BusSealApplyDto.java | 75 +++++++ .../api/bussealapply/BusSealApplyFeign.java | 78 ++++++++ .../BusSealApplyFeignFallback.java | 72 +++++++ .../api/bussealapply/BusSealApplyQuery.java | 59 ++++++ .../api/bussealapply/BusSealApplyVo.java | 71 +++++++ .../biz/bussealapply/BusSealApplyMapper.java | 65 ++++++ .../biz/bussealapply/BusSealApplyMapper.xml | 13 ++ .../biz/bussealapply/BusSealApplyRest.java | 100 ++++++++++ .../biz/bussealapply/BusSealApplyService.java | 187 ++++++++++++++++++ .../FinCollectionConfirmation.java | 4 + .../FinCollectionConfirmationDto.java | 8 +- ...ilsOfReceivablesAndUncollectedItemsVo.java | 68 +++++++ ...inUncollectedReceivablesDetailedFeign.java | 4 +- ...ectedReceivablesDetailedFeignFallback.java | 2 +- ...inUncollectedReceivablesDetailedQuery.java | 4 +- .../FinCollectionConfirmationService.java | 13 ++ ...nUncollectedReceivablesDetailedMapper.java | 3 +- ...inUncollectedReceivablesDetailedMapper.xml | 8 +- ...FinUncollectedReceivablesDetailedRest.java | 9 +- ...UncollectedReceivablesDetailedService.java | 7 +- 24 files changed, 1036 insertions(+), 24 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApply.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyAppendix.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDetailsVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeign.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeignFallback.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyVo.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.xml create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyRest.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java index 188c07750c..633264669c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java @@ -44,7 +44,8 @@ public enum CommonAttachTypeEnum { ARREARS("0007", "欠款提车附件"), SCENESIGN("0008", "现场签署附件"), PAYMENT_VOUCHER("0009", "打款凭证附件"), - REMITTAN_CECONFIRMATION("0010", "汇款确认书附件"); + REMITTAN_CECONFIRMATION("0010", "汇款确认书附件"), + SEAL_APPLY("0011", "盖章附件"); /** * 附件类型 */ diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApply.java new file mode 100644 index 0000000000..896d3f8c19 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApply.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + +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: bus_seal_apply(盖章申请管理)
+ * File: BusSealApply.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApply
+ * Description: 盖章申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "盖章申请表", description = "盖章申请表") +@TableName("bus_seal_apply") +public class BusSealApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请人姓名") + private String applyName; // 申请人姓名 + @ApiModelProperty("盖章日期") + private String sealDate; // 盖章日期 + @ApiModelProperty("盖章类型key") + private String sealTypeKey; // 盖章类型key + @ApiModelProperty("盖章类型value") + private String sealTypeValue; // 盖章类型value + @ApiModelProperty("盖章个数") + private String sealNum; // 盖章个数 + @ApiModelProperty("文件名称或盖章事由") + private String fileNameOrSealReason; // 文件名称或盖章事由 + @ApiModelProperty("文件路径") + private String sealFileUrl; // 文件路径 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyAppendix.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyAppendix.java new file mode 100644 index 0000000000..01881fed32 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyAppendix.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo
+ * Description: 盖章申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class BusSealApplyAppendix implements Vo { + + @ApiModelProperty("上传人sid") + private String createBySid; + @ApiModelProperty("上传人姓名") + private String name; + @ApiModelProperty("文件名") + private String fileName; + @ApiModelProperty("文件类型") + private String fileType; + @ApiModelProperty("关联业务对象sid") + private String linkSid; + @ApiModelProperty("附件类型") + private String attachType; + @ApiModelProperty("文件大小") + private String fileSize; + @ApiModelProperty("文件的路径") + private String filePath; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDetailsVo.java new file mode 100644 index 0000000000..1452417618 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDetailsVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo
+ * Description: 盖章申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "盖章申请表 视图数据详情", description = "盖章申请表 视图数据详情") +public class BusSealApplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请人姓名") + private String applyName; // 申请人姓名 + @ApiModelProperty("盖章日期") + private String sealDate; // 盖章日期 + @ApiModelProperty("盖章类型key") + private String sealTypeKey; // 盖章类型key + @ApiModelProperty("盖章类型value") + private String sealTypeValue; // 盖章类型value + @ApiModelProperty("盖章个数") + private String sealNum; // 盖章个数 + @ApiModelProperty("文件名称或盖章事由") + private String fileNameOrSealReason; // 文件名称或盖章事由 + @ApiModelProperty("文件路径") + private String sealFileUrl; // 文件路径 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDto.java new file mode 100644 index 0000000000..5c61d14c30 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDto.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyDto.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyDto
+ * Description: 盖章申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "盖章申请表 数据传输对象", description = "盖章申请表 数据传输对象") +public class BusSealApplyDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("申请人姓名") + private String applyName; // 申请人姓名 + @ApiModelProperty("盖章日期") + private String sealDate; // 盖章日期 + @ApiModelProperty("盖章类型key") + private String sealTypeKey; // 盖章类型key + @ApiModelProperty("盖章类型value") + private String sealTypeValue; // 盖章类型value + @ApiModelProperty("盖章个数") + private String sealNum; // 盖章个数 + @ApiModelProperty("文件名称或盖章事由") + private String fileNameOrSealReason; // 文件名称或盖章事由 + @ApiModelProperty("文件路径") + private String sealFileUrl; // 文件路径 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + + @ApiModelProperty("盖章附件") + private List busSealApplyAppendices; // 盖章附件 +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeign.java new file mode 100644 index 0000000000..4d8c0215ed --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + +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: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyFeign.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyFeign
+ * Description: 盖章申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "盖章申请表") +@FeignClient( + contextId = "bus-seal-apply-BusSealApply", + name = "bus-seal-apply", + path = "v1/bussealapply", + fallback = BusSealApplyFeignFallback.class) +public interface BusSealApplyFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody BusSealApplyDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeignFallback.java new file mode 100644 index 0000000000..414c289f13 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + +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: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyFeignFallback
+ * Description: 盖章申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BusSealApplyFeignFallback implements BusSealApplyFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口bus_seal_apply/bussealapply/listPage无法访问"); + } + + @Override + public ResultBean save(BusSealApplyDto dto){ + return ResultBean.fireFail().setMsg("接口bus_seal_apply/bussealapply/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口bus_seal_apply/bussealapply/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口bus_seal_apply/bussealapply/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyQuery.java new file mode 100644 index 0000000000..19cfbe1a99 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyQuery.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyQuery.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyQuery
+ * Description: 盖章申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "盖章申请表 查询条件", description = "盖章申请表 查询条件") +public class BusSealApplyQuery implements Query { + + @ApiModelProperty("盖章开始日期") + private String sealStartDate; // 盖章开始日期 + @ApiModelProperty("盖章结束日期") + private String sealEndDate; // 盖章结束日期 + @ApiModelProperty("文件名称或盖章事由") + private String fileNameOrSealReason; // 文件名称或盖章事由 + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyVo.java new file mode 100644 index 0000000000..aa16c10823 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussealapply; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo
+ * Description: 盖章申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "盖章申请表 视图数据对象", description = "盖章申请表 视图数据对象") +public class BusSealApplyVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请人姓名") + private String applyName; // 申请人姓名 + @ApiModelProperty("盖章日期") + private String sealDate; // 盖章日期 + @ApiModelProperty("盖章类型key") + private String sealTypeKey; // 盖章类型key + @ApiModelProperty("盖章类型value") + private String sealTypeValue; // 盖章类型value + @ApiModelProperty("盖章个数") + private String sealNum; // 盖章个数 + @ApiModelProperty("文件名称或盖章事由") + private String fileNameOrSealReason; // 文件名称或盖章事由 + @ApiModelProperty("文件路径") + private String sealFileUrl; // 文件路径 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.java new file mode 100644 index 0000000000..acc5a11691 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bussealapply; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.buscenter.api.bussealapply.BusSealApply; +import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo; + +import java.util.List; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyMapper.java
+ * Class: com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyMapper
+ * Description: 盖章申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BusSealApplyMapper extends BaseMapper { + + //@Update("update bus_seal_apply set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_seal_apply") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.xml new file mode 100644 index 0000000000..37f399aa9f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyRest.java new file mode 100644 index 0000000000..5c6e43529b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bussealapply; + +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.buscenter.api.bussealapply.BusSealApply; +import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyQuery; +import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo; +import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyDetailsVo; +import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyDto; +import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyFeign; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyRest
+ * Description: 盖章申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "盖章申请表") +@RestController("com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyRest") +@RequestMapping("v1/bussealapply") +public class BusSealApplyRest implements BusSealApplyFeign { + + @Autowired + private BusSealApplyService busSealApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busSealApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BusSealApplyDto dto){ + ResultBean rb = ResultBean.fireFail(); + busSealApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + busSealApplyService.delAllBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BusSealApplyDetailsVo vo = busSealApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java new file mode 100644 index 0000000000..45f706b26d --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java @@ -0,0 +1,187 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bussealapply; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.commonappendix.*; +import com.yxt.anrui.buscenter.api.bussealapply.*; +import com.yxt.common.base.config.component.FileUploadComponent; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: bus_seal_apply(盖章申请管理)
+ * File: BusSealApplyService.java
+ * Class: com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyService
+ * Description: 盖章申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-24 13:45:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BusSealApplyService extends MybatisBaseService { + + @Autowired + private CommonAppendixFeign commonAppendixFeign; + @Autowired + private FileUploadComponent fileUploadComponent; + + private QueryWrapper createQueryWrapper(BusSealApplyQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getFileNameOrSealReason())){ + qw.like("fileNameOrSealReason",query.getFileNameOrSealReason()); + } + + String sealStartDate = query.getSealStartDate(); + String sealEndDate = query.getSealEndDate(); + qw.apply(StringUtils.isNotEmpty(sealStartDate), "date_format (sealDate,'%Y-%m-%d') >= date_format('" + sealStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(sealEndDate), "date_format (sealDate,'%Y-%m-%d') <= date_format('" + sealEndDate + "','%Y-%m-%d')" + ); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusSealApplyQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BusSealApplyDto dto){ + String dtoSid = dto.getSid(); + String sealFilePath = ""; + String sealFileUrl = ""; + List busSealApplyAppendices = dto.getBusSealApplyAppendices(); + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + if (StringUtils.isBlank(dtoSid)) {//新增 + BusSealApply busSealApply = new BusSealApply(); + String sid = busSealApply.getSid(); + BeanUtil.copyProperties(dto,busSealApply); + busSealApply.setSid(sid); + for (BusSealApplyAppendix busSealApplyAppendix : busSealApplyAppendices) { + BeanUtil.copyProperties(busSealApplyAppendix,commonAppendixDto); + sealFilePath = busSealApplyAppendix.getFilePath(); + if (sealFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + sealFilePath = sealFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setFilePath(sealFilePath); + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.SEAL_APPLY.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + sealFileUrl += sealFilePath + ","; + } + } + busSealApply.setSealFileUrl(sealFileUrl.substring(0, sealFileUrl.lastIndexOf(","))); + save(busSealApply); + } + BusSealApply busSealApply = fetchBySid(dtoSid); + if (busSealApply == null){ + return; + } + commonAppendixFeign.deleteFiles(dtoSid); + for (BusSealApplyAppendix busSealApplyAppendix : busSealApplyAppendices) { + BeanUtil.copyProperties(busSealApplyAppendix,commonAppendixDto); + sealFilePath = busSealApplyAppendix.getFilePath(); + if (sealFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + sealFilePath = sealFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setFilePath(sealFilePath); + commonAppendixDto.setLinkSid(dtoSid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.SEAL_APPLY.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + sealFileUrl += sealFilePath + ","; + } + } + dto.setSealFileUrl(sealFileUrl.substring(0, sealFileUrl.lastIndexOf(","))); + updateBySid(dto,dtoSid); + } + + public void insertByDto(BusSealApplyDto dto){ + BusSealApply entity = new BusSealApply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BusSealApplyDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BusSealApply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BusSealApplyDetailsVo fetchDetailsVoBySid(String sid){ + BusSealApply entity = fetchBySid(sid); + BusSealApplyDetailsVo vo = new BusSealApplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + String sealFileUrl = entity.getSealFileUrl(); + String[] split = sealFileUrl.split(","); + String path = ""; + String sealCompleteFileUrl = ""; + for (String s : split) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + path = urlPrefix + s; + sealCompleteFileUrl += path + ","; + } + vo.setSealFileUrl(sealCompleteFileUrl.substring(0,sealCompleteFileUrl.lastIndexOf(","))); + return vo; + } + + public void delAllBySids(String[] sids) { + for (String sid : sids) { + deleteBySid(sid); + ResultBean> listResultBean = commonAppendixFeign.selByLinkSid(sid); + List data = listResultBean.getData(); + String path = ""; + for (CommonAppendixVo datum : data) { + String filePath = datum.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + path = urlPrefix + filePath; + commonAppendixFeign.deleteFilesOss(path); + } + commonAppendixFeign.deleteFiles(sid); + } + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index 52c6c76ab5..3eb089b624 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -56,8 +56,12 @@ public class FinCollectionConfirmation extends BaseEntity { private String createByName; // 创建人接口 @ApiModelProperty("收款日期") private String collectionDate; // 收款日期 + @ApiModelProperty("收款银行key") + private String collectionBankKey; // 收款银行key @ApiModelProperty("收款银行") private String collectionBank; // 收款银行 + @ApiModelProperty("收款银行账号key") + private String collectionBankNumKey; // 收款银行账号key @ApiModelProperty("收款银行账号") private String collectionBankNum; // 收款银行账号 @ApiModelProperty("收款方式key") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java index 0394aff622..7ab814296c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java @@ -60,9 +60,13 @@ public class FinCollectionConfirmationDto implements Dto { private String createByName; // 创建人接口 @ApiModelProperty("收款日期") private String collectionDate; // 收款日期 - @ApiModelProperty("收款银行") + @ApiModelProperty("收款银行key") + private String collectionBankKey; // 收款银行key + @ApiModelProperty("收款银行") private String collectionBank; // 收款银行 - @ApiModelProperty("收款银行账号") + @ApiModelProperty("收款银行账号key") + private String collectionBankNumKey; // 收款银行账号key + @ApiModelProperty("收款银行账号") private String collectionBankNum; // 收款银行账号 @ApiModelProperty("收款方式key") private String collectionTypeKey; // 收款方式key diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java new file mode 100644 index 0000000000..a5e8d43d5a --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; + + +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +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-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedVo.java
+ * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo
+ * Description: 应收未收款项明细表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "应收未收款项明细", description = "应收未收款项明细") +@Data +public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo { + + @ApiModelProperty("应收未收款项sid") + private String sid; // 应收未收款项sid + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("车架号") + private String VIN; // 车架号 + @ApiModelProperty("联系电话") + private String customerPhone; // 联系电话 + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + @ApiModelProperty("当前应收金额") + private String currentReceivableMoney; // 当前应收金额 +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index c5b76c7b70..138efc6a2b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -25,8 +25,6 @@ *********************************************************/ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; -import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery; -import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -63,7 +61,7 @@ public interface FinUncollectedReceivablesDetailedFeign { @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query); + public ResultBean> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query); @ApiOperation("新增或修改保存") @PostMapping("/saveOrUpdate") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 18bd183e3f..9d6e8a5f05 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -49,7 +49,7 @@ import java.util.List; public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncollectedReceivablesDetailedFeign { @Override - public ResultBean> listAll(FinUncollectedReceivablesDetailedQuery query){ + public ResultBean> listAll(FinUncollectedReceivablesDetailedQuery query){ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/listAll无法访问"); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java index 9546f0f39b..4f30ca8d92 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java @@ -52,6 +52,8 @@ public class FinUncollectedReceivablesDetailedQuery implements Query { private String contractNo; // 合同编号 @ApiModelProperty("客户名称") private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String customerPhone; // 联系电话 @ApiModelProperty("款项类型key") private String paymentTypeKey; // 款项类型key @ApiModelProperty("应收项目名称") @@ -62,8 +64,6 @@ public class FinUncollectedReceivablesDetailedQuery implements Query { private String createEndTime; // 生成结束时间 @ApiModelProperty("认款状态") private String subscriptionState; // 认款状态 - @ApiModelProperty("联系电话") - private String customerPhone; // 联系电话 @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("业务员sid") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 350b9a247f..c274874fbb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -41,6 +41,8 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -85,6 +87,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -157,6 +161,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); + List data = sysStaffOrgListByStaffSid.getData(); + String orgSidPath = ""; + for (SysStaffOrgVo datum : data) { + orgSidPath = datum.getOrgSidPath(); + orgSidPath = orgSidPath.substring(0, orgSidPath.indexOf("/")); + } + finCollectionConfirmation.setUseOrgSid(orgSidPath); for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); payFilePath = commonAppendixDto.getFilePath(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index e62f9d3e8b..f22176c2ca 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.DetailsOfReceivablesAndUncollectedItemsVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; import org.apache.ibatis.annotations.Mapper; @@ -60,7 +61,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from fin_uncollected_receivables_detailed") List selectListVo(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 951ee49676..20bf98bbed 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -15,9 +15,6 @@ fin_uncollected_receivables_detailed furd ${ew.sqlSegment} - + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index cf85ae6082..9c37b5b155 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -26,10 +26,7 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -64,9 +61,9 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece @Override @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){ + public ResultBean> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){ ResultBean rb = ResultBean.fireFail(); - List list = finUncollectedReceivablesDetailedService.listAllVo(query); + List list = finUncollectedReceivablesDetailedService.listAllVo(query); return rb.success().setData(list); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 8cee61651d..6dc663c57e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -34,10 +34,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -104,7 +101,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService return qw; } - public List listAllVo(FinUncollectedReceivablesDetailedQuery query) { + public List listAllVo(FinUncollectedReceivablesDetailedQuery query) { QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectListAllVo(qw); }