From 361f5528126a20e9d4b601b71fa2c29c51268b64 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Wed, 21 Apr 2021 17:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E4=B8=89=E6=AD=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DgGuaranteeLetterAssignUserController.java | 12 +++++ .../controller/DgLoanNoticeController.java | 13 +++++ ...PaymentConfirmationConsiderController.java | 13 +++++ .../DgGuaranteeLetterAssignUserMapper.java | 3 ++ .../guarantee/mapper/DgLoanNoticeMapper.java | 3 ++ .../DgPaymentConfirmationConsiderMapper.java | 3 ++ .../response/GuaranteeLetterDetailRes.java | 47 +++++++++++++++++++ .../model/response/LoanNoticeDetailRes.java | 40 ++++++++++++++++ .../PaymentConfirmationDetailRes.java | 46 ++++++++++++++++++ .../IDgGuaranteeLetterAssignUserService.java | 3 ++ .../service/IDgLoanNoticeService.java | 3 ++ ...IDgPaymentConfirmationConsiderService.java | 3 ++ ...gGuaranteeLetterAssignUserServiceImpl.java | 6 +++ .../service/impl/DgLoanNoticeServiceImpl.java | 6 +++ ...aymentConfirmationConsiderServiceImpl.java | 6 +++ .../DgGuaranteeLetterAssignUserMapper.xml | 22 +++++++++ .../mapper/guarantee/DgLoanNoticeMapper.xml | 9 ++++ .../DgPaymentConfirmationConsiderMapper.xml | 10 ++++ 18 files changed, 248 insertions(+) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterDetailRes.java create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeDetailRes.java create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationDetailRes.java diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java index e06290de..648c2164 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java @@ -3,8 +3,10 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterDetailRes; import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; +import com.daqing.financial.guarantee.util.R; import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import com.daqing.framework.enums.OperationType; @@ -65,6 +67,16 @@ public class DgGuaranteeLetterAssignUserController { } } + @Log(detail = "查询担保函详情",level = 4,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.SELECT) + @ApiOperation(value = "查询担保函详情") + @GetMapping("/guaranteeLetterDetail") + public R guaranteeLetterDetail( + @ApiParam(name = "id", value = "主键id", required = true) + @RequestParam("id") Integer id){ + GuaranteeLetterDetailRes res = guaranteeLetterAssignUserService.guaranteeLetterDetail(id); + return R.ok().data("data",res); + } + @Log(detail = "添加担保函记录",level = 4,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.INSERT) @ApiOperation(value = "贷审会通过后添加担保函记录") @PostMapping("/addGuaranteeLetter") diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java index f0ac8008..2e8b5064 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java @@ -2,8 +2,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.*; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterDetailRes; +import com.daqing.financial.guarantee.model.response.LoanNoticeDetailRes; import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse; import com.daqing.financial.guarantee.service.IDgLoanNoticeService; +import com.daqing.financial.guarantee.util.R; import com.daqing.framework.annotation.Log; import com.daqing.framework.enums.OperationType; import com.daqing.framework.enums.OperationUnit; @@ -62,6 +65,16 @@ public class DgLoanNoticeController { } } + @Log(detail = "查询放款通知详情",level = 4,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.SELECT) + @ApiOperation(value = "查询放款通知详情") + @GetMapping("/loanNoticeDetail") + public R loanNoticeDetail( + @ApiParam(name = "id", value = "主键id", required = true) + @RequestParam("id") Integer id){ + LoanNoticeDetailRes res = loanNoticeService.loanNoticeDetail(id); + return R.ok().data("data",res); + } + @Log(detail = "更新放款通知状态",level = 4,operationUnit = OperationUnit.LOANNOTICE,operationType = OperationType.UPDATE) @ApiOperation(value = "更新放款通知状态") @PostMapping("/updateLoanNotice") diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java index 3647f729..53df6bac 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java @@ -3,8 +3,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest; import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterDetailRes; +import com.daqing.financial.guarantee.model.response.PaymentConfirmationDetailRes; import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService; +import com.daqing.financial.guarantee.util.R; import com.daqing.framework.annotation.Log; import com.daqing.framework.enums.OperationType; import com.daqing.framework.enums.OperationUnit; @@ -59,6 +62,16 @@ public class DgPaymentConfirmationConsiderController { } } + @Log(detail = "查询财务确认详情",level = 4,operationUnit = OperationUnit.PAYMENTCONFIRMATION,operationType = OperationType.SELECT) + @ApiOperation(value = "查询财务确认详情") + @GetMapping("/paymentConfirmationDetail") + public R paymentConfirmationDetail( + @ApiParam(name = "id", value = "主键id", required = true) + @RequestParam("id") Integer id){ + PaymentConfirmationDetailRes res = paymentConfirmationConsiderService.paymentConfirmationDetail(id); + return R.ok().data("data",res); + } + @Log(detail = "更新财务确认",level = 4,operationUnit = OperationUnit.PAYMENTCONFIRMATION,operationType = OperationType.UPDATE) @ApiOperation(value = "更新回款确认") @PostMapping("/updatePaymentConfirmation") diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java index 7ea14344..b28ee45d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterDetailRes; import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import org.apache.ibatis.annotations.Mapper; @@ -29,4 +30,6 @@ public interface DgGuaranteeLetterAssignUserMapper extends BaseMapper selectGuaranteeLetterList(String userId, List roleIdlist); + + GuaranteeLetterDetailRes selectGuaranteeLetterDetail(Integer id); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java index 27c63182..75ff5f08 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; +import com.daqing.financial.guarantee.model.response.LoanNoticeDetailRes; import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse; import com.daqing.framework.domain.guarantee.DgLoanNotice; import org.apache.ibatis.annotations.Mapper; @@ -28,4 +29,6 @@ public interface DgLoanNoticeMapper extends BaseMapper { LoanNoticeListResponse selectLoanNotice(String businessId, String roleId); List selectLoanNoticeList(String userId, List roleIdlist); + + LoanNoticeDetailRes selectLoanNoticeDetail(Integer id); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java index 2ac03b4f..cd0902e5 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; +import com.daqing.financial.guarantee.model.response.PaymentConfirmationDetailRes; import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +27,6 @@ public interface DgPaymentConfirmationConsiderMapper extends BaseMapper selectBatchData(List idList); List selectPaymentConfirmationList(String userId, List roleIdlist); + + PaymentConfirmationDetailRes selectPaymentConfirmationDetail(Integer id); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterDetailRes.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterDetailRes.java new file mode 100644 index 00000000..8258d275 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterDetailRes.java @@ -0,0 +1,47 @@ +package com.daqing.financial.guarantee.model.response; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.daqing.framework.utils.excel.ApprovalStatusConverter; +import com.daqing.framework.utils.excel.BusinessStatusConverter; +import com.daqing.framework.utils.excel.OperatingStatusConverter; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author chen + * @DATE 2021/4/21 16:26 + * @Version 1.0 + */ +@Data +public class GuaranteeLetterDetailRes { + + @ApiModelProperty("唯一标识") + private Integer id; + + @ApiModelProperty("银行名称") + private String bank; + + @ApiModelProperty(value = "审核意见") + private String auditOpinion; + + @ApiModelProperty("贷审会同意时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date passingTime; + + @ApiModelProperty("附件（会议记录）") + private String file; + + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("申请额度") + private Double loanMoney; + + @ApiModelProperty("申请期限(月)") + private String loanTern; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeDetailRes.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeDetailRes.java new file mode 100644 index 00000000..7e08bb87 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeDetailRes.java @@ -0,0 +1,40 @@ +package com.daqing.financial.guarantee.model.response; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author chen + * @DATE 2021/4/21 17:25 + * @Version 1.0 + */ +@Data +public class LoanNoticeDetailRes { + + @ApiModelProperty("唯一标识") + private Integer id; + + @ApiModelProperty("贷审会同意时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date passingTime; + + @ApiModelProperty(value = "审核意见") + private String auditOpinion; + + @ApiModelProperty("银行名称") + private String bank; + + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("申请额度") + private Double loanMoney; + + @ApiModelProperty("申请期限(月)") + private String loanTern; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationDetailRes.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationDetailRes.java new file mode 100644 index 00000000..667e01c3 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationDetailRes.java @@ -0,0 +1,46 @@ +package com.daqing.financial.guarantee.model.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author chen + * @DATE 2021/4/21 16:58 + * @Version 1.0 + */ +@Data +public class PaymentConfirmationDetailRes { + + @ApiModelProperty("唯一标识") + private Integer id; + + @ApiModelProperty(value = "审核意见") + private String auditOpinion; + + @ApiModelProperty("银行名称") + private String bank; + + @ApiModelProperty("贷审会同意时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date passingTime; + + @ApiModelProperty("附件（会议记录）") + private String file; + + @ApiModelProperty("回单图片") + private String imgFile; + + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("申请额度") + private Double loanMoney; + + @ApiModelProperty("申请期限(月)") + private String loanTern; + + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java index 9b7b1c54..821393c6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java @@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterDetailRes; import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import com.daqing.framework.utils.PageUtils; @@ -30,4 +31,6 @@ public interface IDgGuaranteeLetterAssignUserService extends IService { void batchExport(HttpServletResponse response, String ids) throws IOException; LoanNoticeListResponse selectLoanNotice(String businessId, String roleId); + + LoanNoticeDetailRes loanNoticeDetail(Integer id); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java index c3025792..9c21503e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java @@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest; import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest; +import com.daqing.financial.guarantee.model.response.PaymentConfirmationDetailRes; import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider; import com.daqing.framework.utils.PageUtils; @@ -25,4 +26,6 @@ public interface IDgPaymentConfirmationConsiderService extends IService + + + + + + + + + + + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml index ec91459c..55b189b9 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml @@ -107,5 +107,14 @@ AND au.operating_status=1 + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml index b67a4026..76abedd4 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml @@ -100,4 +100,14 @@ + +