后三步添加详情接口

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")

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")

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")

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<DgGuarante
     GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId);
 
     List<DgNoticeListResponse> selectGuaranteeLetterList(String userId, List<String> roleIdlist);
+
+    GuaranteeLetterDetailRes selectGuaranteeLetterDetail(Integer id);
 }

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<DgLoanNotice> {
     LoanNoticeListResponse selectLoanNotice(String businessId, String roleId);
 
     List<DgNoticeListResponse> selectLoanNoticeList(String userId, List<String> roleIdlist);
+
+    LoanNoticeDetailRes selectLoanNoticeDetail(Integer id);
 }

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<DgPaymen
     List<PaymentConfirmationListResponse> selectBatchData(List<String> idList);
 
     List<DgNoticeListResponse> selectPaymentConfirmationList(String userId, List<String> roleIdlist);
+
+    PaymentConfirmationDetailRes selectPaymentConfirmationDetail(Integer id);
 }

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;
+
+}

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;
+}

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;
+
+
+}

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<DgGuarante
     void batchExport(HttpServletResponse response, String ids) throws IOException;
 
     GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId);
+
+    GuaranteeLetterDetailRes guaranteeLetterDetail(Integer id);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanNoticeService.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.LoanNoticeQueryRequest;
 import com.daqing.financial.guarantee.model.request.LoanNoticeUpdateRequest;
+import com.daqing.financial.guarantee.model.response.LoanNoticeDetailRes;
 import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.framework.domain.guarantee.DgLoanNotice;
 import com.daqing.framework.utils.PageUtils;
@@ -28,4 +29,6 @@ public interface IDgLoanNoticeService extends IService<DgLoanNotice> {
     void batchExport(HttpServletResponse response, String ids) throws IOException;
 
     LoanNoticeListResponse selectLoanNotice(String businessId, String roleId);
+
+    LoanNoticeDetailRes loanNoticeDetail(Integer id);
 }

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<DgPaymen
     boolean updatePaymentConfirmation(PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest);
 
     void batchExport(HttpServletResponse response,String ids) throws IOException;
+
+    PaymentConfirmationDetailRes paymentConfirmationDetail(Integer id);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 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.IDgCopyForService;
 import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
@@ -79,6 +80,11 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
         return RedisUtil.get("dq:token:"+token);
     }
 
+    @Override
+    public GuaranteeLetterDetailRes guaranteeLetterDetail(Integer id) {
+        return baseMapper.selectGuaranteeLetterDetail(id);
+    }
+
     @Override
     public void batchExport(HttpServletResponse response,String ids) throws IOException {
         String[] id = ids.split(",");

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java

@@ -11,6 +11,7 @@ import com.daqing.financial.guarantee.mapper.*;
 import com.daqing.financial.guarantee.model.request.LoanNoticeQueryRequest;
 import com.daqing.financial.guarantee.model.request.LoanNoticeUpdateRequest;
 import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
+import com.daqing.financial.guarantee.model.response.LoanNoticeDetailRes;
 import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.financial.guarantee.service.IDgCopyForService;
 import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
@@ -243,4 +244,9 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
     public LoanNoticeListResponse selectLoanNotice(String businessId, String roleId) {
         return baseMapper.selectLoanNotice(businessId,roleId);
     }
+
+    @Override
+    public LoanNoticeDetailRes loanNoticeDetail(Integer id) {
+        return baseMapper.selectLoanNoticeDetail(id);
+    }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -11,6 +11,7 @@ import com.daqing.financial.guarantee.mapper.DgLoanNoticeMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 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.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgCopyForService;
 import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
@@ -104,6 +105,11 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
         EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"回款确认列表","第一页");
     }
 
+    @Override
+    public PaymentConfirmationDetailRes paymentConfirmationDetail(Integer id) {
+        return baseMapper.selectPaymentConfirmationDetail(id);
+    }
+
     /**
      * 财务部经理操作
      */

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml

@@ -34,6 +34,18 @@
         <result column="role_id" property="roleId"/>
     </resultMap>
 
+    <resultMap id="GuaranteeLetterDetailResMap"
+               type="com.daqing.financial.guarantee.model.response.GuaranteeLetterDetailRes">
+        <id column="id" property="id"/>
+        <result column="bank" property="bank"/>
+        <result column="passing_time" property="passingTime"/>
+        <result column="file" property="file"/>
+        <result column="name" property="name"/>
+        <result column="loan_tern" property="loanTern"/>
+        <result column="loan_money" property="loanMoney"/>
+        <result column="audit_opinion" property="auditOpinion"/>
+    </resultMap>
+
     <select id="pageByCondition" resultMap="GuaranteeLetterListResponseMap">
         select
         lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,lau.status,
@@ -115,4 +127,14 @@
         </where>
     </select>
 
+    <select id="selectGuaranteeLetterDetail" resultMap="GuaranteeLetterDetailResMap">
+        select
+        lau.id,cc.name,lcc.loan_money,lcc.loan_tern,aai.bank,lcc.passing_time,lcc.file,lau.audit_opinion
+        from dg_guarantee_letter_assign_user lau
+        left join dg_apply_amount_info aai on lau.business_id = aai.id
+        left join dg_business_company cc on cc.business_id = aai.id
+        left join dg_loan_committee_consider lcc on lau.business_id = lcc.business_id
+        where lau.id = #{id}
+    </select>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml

@@ -107,5 +107,14 @@
             AND au.operating_status=1
         </where>
     </select>
+    <select id="selectLoanNoticeDetail"
+            resultType="com.daqing.financial.guarantee.model.response.LoanNoticeDetailRes">
+        select ln.id,cc.name,lcc.loan_tern,lcc.loan_money,aai.bank,ln.audit_opinion,lcc.passing_time
+        from dg_loan_notice ln
+        left join dg_apply_amount_info aai on ln.business_id = aai.id
+        left join dg_business_company cc on cc.business_id = aai.id
+        left join dg_loan_committee_consider lcc on ln.business_id = lcc.business_id
+        where ln.id = #{id}
+    </select>
 
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml

@@ -100,4 +100,14 @@
         </where>
     </select>
 
+    <select id="selectPaymentConfirmationDetail"
+            resultType="com.daqing.financial.guarantee.model.response.PaymentConfirmationDetailRes">
+        select pcc.id,cc.name,lcc.loan_money,lcc.loan_tern,aai.bank,lcc.passing_time,lcc.file,pcc.audit_opinion,pcc.img_file
+        from dg_payment_confirmation_consider pcc
+        left join dg_apply_amount_info aai on pcc.business_id = aai.id
+        left join dg_business_company cc on cc.business_id = aai.id
+        left join dg_loan_committee_consider lcc on pcc.business_id = lcc.business_id
+        where pcc.id = #{id}
+    </select>
+
 </mapper>