diff --git a/.idea/compiler.xml b/.idea/compiler.xml index bdca58df..13d90be3 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + @@ -14,11 +15,11 @@ + - diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 00000000..81129725 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,11 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://192.168.31.140:3306/dq_financial_crms?serverTimezone=GMT%2B8 + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index f46cbaa0..7f97a975 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -2,19 +2,19 @@ - - + + - - + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..3474526e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 43126308..6ca02189 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,7 @@ diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 00000000..d6d96c14 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 00000000..e96534fb --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 14ce8bc5..d4af37d9 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 @@ -1,13 +1,12 @@ package com.daqing.financial.guarantee.controller; -import ch.qos.logback.core.rolling.helper.IntegerTokenConverter; -import com.daqing.financial.guarantee.model.request.GuaranteeLetterAddRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterListRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest; -import com.daqing.financial.guarantee.model.response.GuaranteeLetterResponse; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; +import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.excel.EasyExcelUtil; @@ -43,7 +42,8 @@ public class DgGuaranteeLetterAssignUserController { @ApiParam(name = "guaranteeLetterRequest", value = "担保函列表查询条件", required = true) @RequestBody GuaranteeLetterQueryRequest guaranteeLetterQueryRequest){ PageUtils data = guaranteeLetterAssignUserService.queryPage(guaranteeLetterQueryRequest); - return new ResponseResult().SUCCESS(data); + new ResponseResult(); + return ResponseResult.SUCCESS(data); } @@ -53,29 +53,29 @@ public class DgGuaranteeLetterAssignUserController { @ApiParam(name = "guaranteeLetterListRequest", value = "担保函列表数据", required = true) @RequestBody GuaranteeLetterListRequest guaranteeLetterListRequest, HttpServletResponse response){ //获取担保函列表数据 - List guaranteeLetterResponseList = guaranteeLetterListRequest.getGuaranteeLetterResponseList(); + List guaranteeLetterListResponseList = guaranteeLetterListRequest.getGuaranteeLetterListResponseList(); try { //导出excel文件 - EasyExcelUtil.download(response,GuaranteeLetterResponse.class,guaranteeLetterResponseList,"担保函列表","第一页"); + EasyExcelUtil.download(response, GuaranteeLetterListResponse.class, guaranteeLetterListResponseList,"担保函列表","第一页"); } catch (IOException e) { e.printStackTrace(); } } - @ApiOperation(value = "添加担保函记录") + @ApiOperation(value = "贷审会通过后添加担保函记录") @PostMapping("/addGuaranteeLetter") public ResponseResult addGuaranteeLetter( @ApiParam(name = "guaranteeLetterAddRequest", value = "担保函对象", required = true) - @RequestBody GuaranteeLetterAddRequest guaranteeLetterAddRequest) { - boolean result = guaranteeLetterAssignUserService.saveGuaranteeLetter(guaranteeLetterAddRequest); + @RequestBody DgGuaranteeLetterAssignUser guaranteeLetterAssignUser) { + boolean result = guaranteeLetterAssignUserService.saveGuaranteeLetter(guaranteeLetterAssignUser); return result ? ResponseResult.SUCCESS("添加成功！"):ResponseResult.FAIL(40005,"添加失败！"); } - @ApiOperation(value = "更新用户确认状态") + @ApiOperation(value = "更新角色或用户确认状态及审核意见") @PostMapping("/updateStatus") public ResponseResult updateStatus( - @ApiParam(name = "guaranteeLetterAddRequest", value = "担保函对象", required = true) + @ApiParam(name = "guaranteeLetterUpdateStatusRequest", value = "更新确认状态请求", required = true) @RequestBody GuaranteeLetterUpdateStatusRequest guaranteeLetterUpdateStatusRequest) { boolean result = guaranteeLetterAssignUserService.updateGuaranteeLetterStatus(guaranteeLetterUpdateStatusRequest); return result ? ResponseResult.SUCCESS("确认成功！"):ResponseResult.FAIL(40005,"确认失败！"); 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 4965d766..828d0a59 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 @@ -1,13 +1,28 @@ package com.daqing.financial.guarantee.controller; +import com.daqing.financial.guarantee.model.request.PaymentConfirmationListRequest; +import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest; +import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest; +import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService; +import com.daqing.framework.model.response.ResponseResult; +import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.utils.excel.EasyExcelUtil; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + /** *

* 回款确认 前端控制器 @@ -22,7 +37,40 @@ import org.springframework.web.bind.annotation.RestController; public class DgPaymentConfirmationConsiderController { @Autowired - private IDgPaymentConfirmationConsiderService iDgPaymentConfirmationConsiderService; + private IDgPaymentConfirmationConsiderService paymentConfirmationConsiderService; + + @ApiOperation(value = "回款确认记录列表") + @PostMapping("/paymentConfirmationList") + public ResponseResult paymentConfirmationList( + @ApiParam(name = "paymentConfirmationRequest", value = "回款确认列表查询条件", required = true) + @RequestBody PaymentConfirmationQueryRequest paymentConfirmationQueryRequest){ + PageUtils data = paymentConfirmationConsiderService.queryPage(paymentConfirmationQueryRequest); + return new ResponseResult().SUCCESS(data); + } + + + @ApiOperation(value = "导出回款确认列表数据") + @PostMapping("/paymentConfirmationListExport") + public void paymentConfirmationListExport( + @ApiParam(name = "paymentConfirmationListRequest", value = "回款确认列表数据", required = true) + @RequestBody PaymentConfirmationListRequest paymentConfirmationListRequest, HttpServletResponse response){ + //获取担保函列表数据 + List paymentConfirmationListResponseList = paymentConfirmationListRequest.getPaymentConfirmationListResponseList(); + try { + //导出excel文件 + EasyExcelUtil.download(response, PaymentConfirmationListResponse.class, paymentConfirmationListResponseList,"回款确认列表","第一页"); + } catch (IOException e) { + e.printStackTrace(); + } + } + @ApiOperation(value = "更新回款确认") + @PostMapping("/updatePaymentConfirmation") + public ResponseResult updatePaymentConfirmation( + @ApiParam(name = "paymentConfirmationUpdateRequest", value = "更新回款确认请求", required = true) + @RequestBody PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest) { + boolean result = paymentConfirmationConsiderService.updatePaymentConfirmation(paymentConfirmationUpdateRequest); + return result ? ResponseResult.SUCCESS("更新成功！"):ResponseResult.FAIL(40005,"更新失败！"); + } } 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 6a0550c7..c2f9045b 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 @@ -3,7 +3,7 @@ package com.daqing.financial.guarantee.mapper; 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.GuaranteeLetterResponse; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,6 +19,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface DgGuaranteeLetterAssignUserMapper extends BaseMapper { - IPage pageByCondition(Page page,@Param("userId") Integer userId,@Param("roleId") Integer roleId,@Param("status") Integer status,@Param("customerNumberOrName") String customerNumberOrName); + IPage pageByCondition(Page page, @Param("userId") Integer userId, @Param("roleId") Integer roleId, @Param("status") Integer status, @Param("customerNumberOrName") String customerNumberOrName); } 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 3c5a05b3..640c09dd 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 @@ -1,6 +1,9 @@ package com.daqing.financial.guarantee.mapper; 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.PaymentConfirmationListResponse; import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider; import org.apache.ibatis.annotations.Mapper; @@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DgPaymentConfirmationConsiderMapper extends BaseMapper { + IPage pageByCondition(Page page, Integer roleId, Integer status, String customerNumberOrName); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterAddRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterAddRequest.java deleted file mode 100644 index 5573876d..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterAddRequest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.daqing.financial.guarantee.model.request; - -import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author chen - * @DATE 2020/11/16 20:40 - * @Version 1.0 - * 添加担保函 - */ -@Data -public class GuaranteeLetterAddRequest { - - @ApiModelProperty(value = "A角") - private Integer aRole; - - @ApiModelProperty(value = "B角") - private Integer bRole; - - @ApiModelProperty(value = "担保函对象") - private DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser; - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterListRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterListRequest.java index 53ab4b81..91603153 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterListRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterListRequest.java @@ -1,6 +1,6 @@ package com.daqing.financial.guarantee.model.request; -import com.daqing.financial.guarantee.model.response.GuaranteeLetterResponse; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,6 +16,6 @@ import java.util.List; public class GuaranteeLetterListRequest { @ApiModelProperty(value = "担保函导出数据") - private List guaranteeLetterResponseList; + private List guaranteeLetterListResponseList; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterUpdateStatusRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterUpdateStatusRequest.java index 96dddee0..43bd34ee 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterUpdateStatusRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterUpdateStatusRequest.java @@ -7,7 +7,7 @@ import lombok.Data; * @Author chen * @DATE 2020/11/18 16:44 * @Version 1.0 - * 担保函更新确认状态 + * 担保函更新确认状态及审核意见 */ @Data public class GuaranteeLetterUpdateStatusRequest { @@ -15,10 +15,22 @@ public class GuaranteeLetterUpdateStatusRequest { @ApiModelProperty(value = "当前用户") private Integer currentUser; + @ApiModelProperty(value = "当前用户角色") + private Integer currentUserRole; + + @ApiModelProperty(value = "a角用户") + private Integer aUser; + + @ApiModelProperty(value = "b角用户") + private Integer bUser; + @ApiModelProperty(value = "业务id") private Integer businessId; @ApiModelProperty(value = "状态") private Integer status; + @ApiModelProperty(value = "审核意见") + private String auditOpinion; + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationListRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationListRequest.java new file mode 100644 index 00000000..c792bf57 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationListRequest.java @@ -0,0 +1,20 @@ +package com.daqing.financial.guarantee.model.request; + +import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author chen + * @DATE 2020/11/19 16:27 + * @Version 1.0 + */ +@Data +public class PaymentConfirmationListRequest { + + @ApiModelProperty(value = "回款确认导出数据") + private List paymentConfirmationListResponseList; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationQueryRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationQueryRequest.java new file mode 100644 index 00000000..922fb686 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationQueryRequest.java @@ -0,0 +1,33 @@ +package com.daqing.financial.guarantee.model.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author chen + * @DATE 2020/11/19 14:26 + * @Version 1.0 + * 回款确认列表查询条件 + */ +@Data +public class PaymentConfirmationQueryRequest { + + @ApiModelProperty(value = "当前页码,默认为第一页") + private Integer page = 1; + + @ApiModelProperty(value = "每页记录数,默认显示10条") + private Integer size = 10; + + @ApiModelProperty(value = "流程状态：1->审核中、2->拒绝、3->已审核") + private Integer status; + + @ApiModelProperty(value = "业务编号/客户名称") + private String CustomerNumberOrName; + + @NotNull + @ApiModelProperty(value = "角色ID") + private Integer roleId; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationUpdateRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationUpdateRequest.java new file mode 100644 index 00000000..3e9b736b --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationUpdateRequest.java @@ -0,0 +1,29 @@ +package com.daqing.financial.guarantee.model.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author chen + * @DATE 2020/11/19 16:37 + * @Version 1.0 + */ +@Data +public class PaymentConfirmationUpdateRequest { + + @ApiModelProperty(value = "当前用户") + private Integer currentUser; + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "状态") + private Integer status; + + @ApiModelProperty(value = "审核意见") + private String auditOpinion; + + @ApiModelProperty(value = "银行回单图片,多张使用逗号隔开") + private String imgFile; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java similarity index 66% rename from dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterResponse.java rename to dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java index e052bcb5..6f96b5d3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java @@ -1,7 +1,9 @@ package com.daqing.financial.guarantee.model.response; import com.alibaba.excel.annotation.ExcelProperty; -import com.daqing.framework.utils.excel.StatusConverter; +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; @@ -12,9 +14,10 @@ import java.util.Date; * @Author chen * @DATE 2020/11/12 17:36 * @Version 1.0 + * 担保函返回数据 */ @Data -public class GuaranteeLetterResponse { +public class GuaranteeLetterListResponse { @ApiModelProperty("唯一标识") private Integer id; @@ -22,6 +25,9 @@ public class GuaranteeLetterResponse { @ApiModelProperty("银行名称") private String bank; + @ApiModelProperty(value = "审核意见") + private String auditOpinion; + @ApiModelProperty("贷审会同意时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date updateTime; @@ -58,8 +64,17 @@ public class GuaranteeLetterResponse { @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("状态") - @ExcelProperty(value = "状态",index = 7,converter = StatusConverter.class) + @ApiModelProperty("审核状态") + @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class) private Integer status; + @ApiModelProperty("业务状态") + @ExcelProperty(value = "业务状态",index = 8,converter = BusinessStatusConverter.class) + private Integer businessStatus; + + @ApiModelProperty("操作状态") + @ExcelProperty(value = "操作状态",index = 9,converter = OperatingStatusConverter.class) + private Integer operatingStatus; + + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java new file mode 100644 index 00000000..a156079f --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java @@ -0,0 +1,79 @@ +package com.daqing.financial.guarantee.model.response; + +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 2020/11/19 14:49 + * @Version 1.0 + * 回款确认返回数据 + */ +@Data +public class PaymentConfirmationListResponse { + + @ApiModelProperty("唯一标识") + private Integer id; + + @ApiModelProperty(value = "审核意见") + private String auditOpinion; + + @ApiModelProperty("银行名称") + private String bank; + + @ApiModelProperty("贷审会同意时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date updateTime; + + @ApiModelProperty("附件（会议记录）") + private String file; + + @ApiModelProperty("业务编号") + @ExcelProperty(value = "业务编号",index = 0) + private String businessCode; + + @ApiModelProperty("客户名称") + @ExcelProperty(value = "客户名称",index = 1) + private String name; + + @ApiModelProperty("联系电话") + @ExcelProperty(value = "联系电话",index = 2) + private String phone; + + @ApiModelProperty("业务类别") + @ExcelProperty(value = "业务类别",index = 3) + private String businessType; + + @ApiModelProperty("金额") + @ExcelProperty(value = "金额",index = 4) + private Double applyAmount; + + @ApiModelProperty("期限") + @ExcelProperty(value = "期数",index = 5) + private String applyTime; + + @ApiModelProperty("申请日期") + @ExcelProperty(value = "申请日期",index = 6) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("审核状态") + @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class) + private Integer status; + + @ApiModelProperty("业务状态") + @ExcelProperty(value = "业务状态",index = 8,converter = BusinessStatusConverter.class) + private Integer businessStatus; + + @ApiModelProperty("操作状态") + @ExcelProperty(value = "操作状态",index = 9,converter = OperatingStatusConverter.class) + private Integer operatingStatus; + +} 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 2fbfdb1e..da08e12e 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 @@ -1,7 +1,6 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.daqing.financial.guarantee.model.request.GuaranteeLetterAddRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; @@ -19,7 +18,7 @@ public interface IDgGuaranteeLetterAssignUserService extends IService @@ -13,4 +16,7 @@ import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider; */ public interface IDgPaymentConfirmationConsiderService extends IService { + PageUtils queryPage(PaymentConfirmationQueryRequest paymentConfirmationQueryRequest); + + boolean updatePaymentConfirmation(PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java index e5445925..c8443df5 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java @@ -1,28 +1,28 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.DgGuaranteeLetterAssignUserMapper; -import com.daqing.financial.guarantee.model.request.GuaranteeLetterAddRequest; +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.GuaranteeLetterResponse; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; -import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; +import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; +import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider; +import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.PromptSuccess; -import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; +import com.sun.xml.internal.bind.v2.TODO; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - /** *

* 担保函记录 服务实现类 @@ -31,9 +31,16 @@ import java.util.List; * @author Qyq * @since 2020-11-12 */ +@Slf4j @Service public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl implements IDgGuaranteeLetterAssignUserService { + @Autowired + private DgPaymentConfirmationConsiderMapper paymentConfirmationConsiderMapper; + + @Autowired + private DgLoanCommitteeConsiderMapper dgLoanCommitteeConsiderMapper; + @Override public PageUtils queryPage(GuaranteeLetterQueryRequest guaranteeLetterQueryRequest) { //取出条件 @@ -45,81 +52,485 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl guaranteeLetterVO = baseMapper.pageByCondition(new Page(page,size),userId,roleId,status,customerNumberOrName); + IPage guaranteeLetterVO = baseMapper.pageByCondition(new Page(page,size),userId,roleId,status,customerNumberOrName); return new PageUtils(guaranteeLetterVO); } - @Transactional @Override - public boolean saveGuaranteeLetter(GuaranteeLetterAddRequest guaranteeLetterAddRequest) { - //获取A角用户 - Integer aRole = guaranteeLetterAddRequest.getARole(); - //获取B角用户 - Integer bRole = guaranteeLetterAddRequest.getBRole(); - //获取担保函信息 - DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = guaranteeLetterAddRequest.getDgGuaranteeLetterAssignUser(); - //添加A角用户 - guaranteeLetterAssignUser.setUserId(aRole); - baseMapper.insert(guaranteeLetterAssignUser); - //添加B角用户 - guaranteeLetterAssignUser.setUserId(bRole); + public boolean saveGuaranteeLetter(DgGuaranteeLetterAssignUser guaranteeLetterAssignUser) { + //添加法规部经理生成担保函 + guaranteeLetterAssignUser.setRoleId(PromptSuccess.FG_JL_ID); int insert = baseMapper.insert(guaranteeLetterAssignUser); - return insert>0; + return insert > 0; } + @Transactional @Override public boolean updateGuaranteeLetterStatus(GuaranteeLetterUpdateStatusRequest guaranteeLetterUpdateStatusRequest) { + // TODO 所有操作待添加业务流程数据 + //更新条件 Integer businessId = guaranteeLetterUpdateStatusRequest.getBusinessId(); - Integer currentUser = guaranteeLetterUpdateStatusRequest.getCurrentUser(); + //状态值为2表示通过或同意，为4表示驳回操作 Integer status = guaranteeLetterUpdateStatusRequest.getStatus(); - //根据业务id查询记录数 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("business_id",businessId); - Integer count = baseMapper.selectCount(wrapper); - //只有两条数据，经理还未有数据 - if (count==2){ - //查询当前用户 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("business_id",businessId).eq("user_id",currentUser); - DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper); - guaranteeLetterAssignUser.setStatus(status); - //根据当前用户更新状态 - int i = baseMapper.updateById(guaranteeLetterAssignUser); - //当状态为确认时，判断另一个用户是否确认 - if (status==3){ - //查询另一个用户 - QueryWrapper anotherQueryWrapper = new QueryWrapper<>(); - anotherQueryWrapper.eq("business_id",businessId).ne("user_id",currentUser); - DgGuaranteeLetterAssignUser anotherGuaranteeLetterAssignUser = baseMapper.selectOne(anotherQueryWrapper); - Integer anotherStatus = anotherGuaranteeLetterAssignUser.getStatus(); - //如果另一个用户也确认，为资产部经理添加数据 - if (anotherStatus==3){ - Integer companyId = anotherGuaranteeLetterAssignUser.getCompanyId(); - DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser(); - dgGuaranteeLetterAssignUser.setBusinessId(businessId); - dgGuaranteeLetterAssignUser.setCompanyId(companyId); - //添加资产部经理角色 - dgGuaranteeLetterAssignUser.setRoleId(PromptSuccess.ZC_JL_ID); - int insert = baseMapper.insert(dgGuaranteeLetterAssignUser); - return insert > 0; + String auditOpinion = guaranteeLetterUpdateStatusRequest.getAuditOpinion(); + Integer aUser = guaranteeLetterUpdateStatusRequest.getAUser(); + Integer bUser = guaranteeLetterUpdateStatusRequest.getBUser(); + Integer currentUser = guaranteeLetterUpdateStatusRequest.getCurrentUser(); + Integer currentUserRole = guaranteeLetterUpdateStatusRequest.getCurrentUserRole(); + + //*************************************************根据角色更新数据************************************************ + + //角色不为空 + if (currentUserRole!=null){ + //角色为法规部经理则生成担保函操作和驳回操作 + if (PromptSuccess.FG_JL_ID.equals(currentUserRole)){ + //更新之前,获取此数据的审批状态，如果审批状态为驳回，则更新ab角用户数据，如果审批状态为审批中，则添加ab角用户数据 + QueryWrapper queryWrapperTemp = new QueryWrapper<>(); + queryWrapperTemp.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUserTemp = baseMapper.selectOne(queryWrapperTemp); + Integer approveStatus = guaranteeLetterAssignUserTemp.getStatus(); + + //之前状态为审批中，同意确定生成担保函，添加数据给指派的AB角用户 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){ + //根据角色及业务id查询需要更新数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper); + //操作用户为当前用户 + guaranteeLetterAssignUser.setUserId(currentUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //获取公司id + Integer companyId = guaranteeLetterAssignUser.getCompanyId(); + //根据当前用户更新审核状态和操作状态及审核意见 TODO 添加业务流程 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + //更新成功，添加ab角数据 + if (i > 0){ + //添加a角 + DgGuaranteeLetterAssignUser guaranteeLetterUser = new DgGuaranteeLetterAssignUser(); + guaranteeLetterUser.setUserId(aUser); + guaranteeLetterUser.setBusinessId(businessId); + guaranteeLetterUser.setCompanyId(companyId); + baseMapper.insert(guaranteeLetterUser); + //添加b角 + guaranteeLetterUser.setUserId(bUser); + int insert = baseMapper.insert(guaranteeLetterUser); + //更新成功，返回操作结果 + log.info(insert > 0 ? "法规部经理成功生成担保函" : "法规部经理生成担保函失败"); + return insert > 0; + } + } + + //之前状态为驳回，同意确定生成担保函，更新数据给指派的AB角用户 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){ + //根据角色及业务id查询需要更新数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper); + //操作用户为当前用户 + guaranteeLetterAssignUser.setUserId(currentUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 TODO 添加业务流程 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + //更新成功，更新ab角数据 + if (i > 0){ + //更新a角 + //根据业务id查询A用户数据 + QueryWrapper guaranteeLetterAssignUserQueryWrapperA = new QueryWrapper<>(); + guaranteeLetterAssignUserQueryWrapperA.eq("business_id",businessId).eq("user_id",aUser); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserA = baseMapper.selectOne(guaranteeLetterAssignUserQueryWrapperA); + dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_IN_REVIEW); + dgGuaranteeLetterAssignUserA.setOperatingStatus(StatusCode.CZ_ON_HAND); + //清空上次的审批意见 + dgGuaranteeLetterAssignUserA.setAuditOpinion(""); + baseMapper.updateById(dgGuaranteeLetterAssignUserA); + + //更新b角 + //根据业务id查询B用户数据 + QueryWrapper guaranteeLetterAssignUserQueryWrapperB = new QueryWrapper<>(); + guaranteeLetterAssignUserQueryWrapperB.eq("business_id",businessId).eq("user_id",bUser); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserB = baseMapper.selectOne(guaranteeLetterAssignUserQueryWrapperB); + dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_IN_REVIEW); + dgGuaranteeLetterAssignUserB.setOperatingStatus(StatusCode.CZ_ON_HAND); + //清空上次的审批意见 + dgGuaranteeLetterAssignUserB.setAuditOpinion(""); + int update = baseMapper.updateById(dgGuaranteeLetterAssignUserB); + //更新成功，返回操作结果 + log.info(update > 0 ? "驳回后法规部经理成功生成担保函" : "驳回后法规部经理生成担保函失败"); + return update > 0; + } + } + + //驳回操作，更新数据及更新贷审会数据 + if (StatusCode.SP_REJECT.equals(status)){ + //根据角色及业务id查询需要更新数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper); + //操作用户为当前用户 + guaranteeLetterAssignUser.setUserId(currentUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + //TODO 更新成功，更新贷审会数据 + if (i > 0){ + //根据业务id查询贷审会数据 + QueryWrapper loanCommitteeConsiderQueryWrapper = new QueryWrapper<>(); + loanCommitteeConsiderQueryWrapper.eq("business_id",businessId); + DgLoanCommitteeConsider loanCommitteeConsider = dgLoanCommitteeConsiderMapper.selectOne(loanCommitteeConsiderQueryWrapper); + loanCommitteeConsider.setStatus(StatusCode.SP_REJECT); + loanCommitteeConsider.setOperatingStatus(StatusCode.CZ_ON_HAND); + int update = dgLoanCommitteeConsiderMapper.updateById(loanCommitteeConsider); + //更新成功，返回操作结果 + log.info(update > 0 ? "法规部经理成功驳回" : "法规部经理驳回失败"); + return update > 0; + } + } + } + + //角色为资产部经理则确认担保函操作和驳回操作 + if (PromptSuccess.ZC_JL_ID.equals(currentUserRole)){ + //更新之前,获取此数据的审批状态，如果审批状态为驳回，则更新回款确认数据，如果审批状态为审批中，则添加回款确认数据 + QueryWrapper queryWrapperTemp = new QueryWrapper<>(); + queryWrapperTemp.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUserTemp = baseMapper.selectOne(queryWrapperTemp); + Integer approveStatus = guaranteeLetterAssignUserTemp.getStatus(); + + //之前状态为审批中，资产部经理确认担保函，往回款确认添加数据 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){ + //根据角色及业务id查询需要更新数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper); + //操作用户为当前用户 + guaranteeLetterAssignUser.setUserId(currentUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + //获取公司id + Integer companyId = guaranteeLetterAssignUser.getCompanyId(); + //更新成功，添加回款确认数据 TODO 添加业务流程 + if (i > 0){ + //添加财务部经理的回款数据 + DgPaymentConfirmationConsider paymentConfirmationConsider = new DgPaymentConfirmationConsider(); + paymentConfirmationConsider.setRoleId(PromptSuccess.CWB_ID); + paymentConfirmationConsider.setBusinessId(businessId); + paymentConfirmationConsider.setCompanyId(companyId); + int insert = paymentConfirmationConsiderMapper.insert(paymentConfirmationConsider); + //更新成功，返回操作结果 + log.info(insert > 0 ? "资产部经理成功添加回款数据" : "资产部经理添加回款数据失败"); + return insert > 0; + } + } + + //之前状态为驳回中，资产部经理确认担保函，更新回款确认数据 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){ + //根据角色及业务id查询需要更新数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper); + //操作用户为当前用户 + guaranteeLetterAssignUser.setUserId(currentUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + //更新成功，更新回款确认数据 TODO 添加业务流程 + if (i > 0){ + //更新财务部经理的回款数据 + QueryWrapper paymentConfirmationConsiderQueryWrapper = new QueryWrapper<>(); + paymentConfirmationConsiderQueryWrapper.eq("business_id",businessId).eq("role_id",PromptSuccess.CWB_ID); + DgPaymentConfirmationConsider paymentConfirmationConsider = paymentConfirmationConsiderMapper.selectOne(paymentConfirmationConsiderQueryWrapper); + paymentConfirmationConsider.setStatus(StatusCode.SP_IN_REVIEW); + paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_ON_HAND); + //清空上次的审批意见 + paymentConfirmationConsider.setAuditOpinion(""); + int update = paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsider); + //更新成功，返回操作结果 + log.info(update > 0 ? "资产部经理成功添加回款数据" : "资产部经理添加回款数据失败"); + return update > 0; + } + } + + + //驳回操作，更新数据及更新AB用户数据 + if (StatusCode.SP_REJECT.equals(status)){ + //根据角色及业务id查询需要更新数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("business_id",businessId).eq("role_id",currentUserRole); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper); + //操作用户为当前用户 + guaranteeLetterAssignUser.setUserId(currentUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + //更新成功，更新AB用户数据 + if (i > 0){ + //根据业务id查询A用户数据 + QueryWrapper guaranteeLetterAssignUserQueryWrapperA = new QueryWrapper<>(); + guaranteeLetterAssignUserQueryWrapperA.eq("business_id",businessId).eq("user_id",aUser); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserA = baseMapper.selectOne(guaranteeLetterAssignUserQueryWrapperA); + //审批状态为已驳回，操作状态为待处理 + dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT); + dgGuaranteeLetterAssignUserA.setOperatingStatus(StatusCode.CZ_ON_HAND); + //更新a用户操作业务数据 + baseMapper.updateById(dgGuaranteeLetterAssignUserA); + + //根据业务id查询B用户数据 + QueryWrapper guaranteeLetterAssignUserQueryWrapperB = new QueryWrapper<>(); + guaranteeLetterAssignUserQueryWrapperB.eq("business_id",businessId).eq("user_id",bUser); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserB = baseMapper.selectOne(guaranteeLetterAssignUserQueryWrapperB); + //审批状态为已驳回，操作状态为待处理 + dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REJECT); + dgGuaranteeLetterAssignUserB.setOperatingStatus(StatusCode.CZ_ON_HAND); + //更新b用户操作业务数据 + int update = baseMapper.updateById(dgGuaranteeLetterAssignUserB); + //更新成功，返回操作结果 + log.info(update > 0 ? "资产部经理成功驳回" : "资产部经理驳回失败"); + return update > 0; + } } } - return i > 0; - //经理有数据，当前确认用户拥有经理角色，确认担保函 - }else { - //当前用户角色为经理 - QueryWrapper queryRoleWrapper = new QueryWrapper<>(); - queryRoleWrapper.eq("business_id",businessId).eq("role_id",PromptSuccess.ZC_JL_ID); - DgGuaranteeLetterAssignUser guaranteeLetterAssignRole = baseMapper.selectOne(queryRoleWrapper); - guaranteeLetterAssignRole.setUserId(currentUser); - guaranteeLetterAssignRole.setStatus(status); - //根据当前用户角色更新状态 - int i = baseMapper.updateById(guaranteeLetterAssignRole); - //TODO 经理确认成功后，向回款确认添加数据 - return i > 0; } + //*********************************************角色为空根据用户更新数据********************************************* + + //当前用户为a角用户 + if (currentUser.equals(aUser)){ + //更新之前,获取此用户数据的审批状态，如果审批状态为驳回，则更新资产部经理数据，如果审批状态为审批中，则添加资产部经理数据 + QueryWrapper queryWrapperTemp = new QueryWrapper<>(); + queryWrapperTemp.eq("business_id",businessId).eq("user_id",aUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUserTemp = baseMapper.selectOne(queryWrapperTemp); + Integer approveStatus = guaranteeLetterAssignUserTemp.getStatus(); + + //首次a角用户确认担保函，检查b角用户是否确认担保函 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){ + QueryWrapper queryWrapperUser = new QueryWrapper<>(); + queryWrapperUser.eq("business_id",businessId).eq("user_id",aUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //获取公司id + Integer companyId = guaranteeLetterAssignUser.getCompanyId(); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + log.info(i > 0 ? "首次a角用户确认担保函更新成功" : "首次a角用户确认担保函更新失败"); + //更新成功后，判断b角用户是否确认 + if (i > 0){ + QueryWrapper tempB = new QueryWrapper<>(); + //查询b用户的审核状态 + tempB.eq("business_id",businessId).eq("user_id",bUser).select("status"); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = baseMapper.selectOne(tempB); + Integer bStatus = dgGuaranteeLetterAssignUser.getStatus(); + //b用户审核通过，添加资产部经理数据 + if (StatusCode.SP_REVIEWED.equals(bStatus)){ + DgGuaranteeLetterAssignUser ZCJLGuaranteeLetterAssign = new DgGuaranteeLetterAssignUser(); + ZCJLGuaranteeLetterAssign.setBusinessId(businessId); + ZCJLGuaranteeLetterAssign.setCompanyId(companyId); + ZCJLGuaranteeLetterAssign.setRoleId(PromptSuccess.ZC_JL_ID); + int insert = baseMapper.insert(ZCJLGuaranteeLetterAssign); + //添加成功，返回操作结果 + log.info(insert > 0 ? "资产部经理添加成功" : "资产部经理添加失败"); + return insert > 0; + } + } + } + + //驳回后a角用户再次确认担保函，检查b角用户是否确认担保函 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){ + QueryWrapper queryWrapperUser = new QueryWrapper<>(); + queryWrapperUser.eq("business_id",businessId).eq("user_id",aUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + log.info(i > 0 ? "驳回后a角用户确认担保函更新成功" : "驳回后a角用户确认担保函更新失败"); + //更新成功后，判断b角用户是否确认 + if (i > 0){ + QueryWrapper tempB = new QueryWrapper<>(); + //查询b用户的审核状态 + tempB.eq("business_id",businessId).eq("user_id",bUser).select("status"); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = baseMapper.selectOne(tempB); + Integer bStatus = dgGuaranteeLetterAssignUser.getStatus(); + //b用户审核通过，更新资产部经理数据 + if (StatusCode.SP_REVIEWED.equals(bStatus)){ + QueryWrapper queryZCJLUser = new QueryWrapper<>(); + queryZCJLUser.eq("business_id",businessId).eq("role_id",PromptSuccess.ZC_JL_ID); + DgGuaranteeLetterAssignUser letterAssignUserZCJL = baseMapper.selectOne(queryZCJLUser); + //清空审批意见 + letterAssignUserZCJL.setAuditOpinion(""); + letterAssignUserZCJL.setStatus(StatusCode.SP_IN_REVIEW); + letterAssignUserZCJL.setStatus(StatusCode.CZ_ON_HAND); + int update = baseMapper.updateById(letterAssignUserZCJL); + //更新成功，返回操作结果 + log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败"); + return update > 0; + } + } + } + + //a角驳回操作，更新a角数据及b角数据及返回上一流程 + if (StatusCode.SP_REJECT.equals(status)){ + QueryWrapper queryWrapperUser = new QueryWrapper<>(); + queryWrapperUser.eq("business_id",businessId).eq("user_id",aUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + log.info(i > 0 ? "a角用户驳回担保函更新成功" : "a角用户驳回担保函更新失败"); + //更新成功后，更新b角数据及更新法规部经理数据 + if (i > 0){ + //更新b用户的审核状态为驳回 + QueryWrapper tempB = new QueryWrapper<>(); + tempB.eq("business_id",businessId).eq("user_id",bUser); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserB = baseMapper.selectOne(tempB); + dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REJECT); + baseMapper.updateById(dgGuaranteeLetterAssignUserB); + + //更新法规部经理的审核状态为驳回，操作状态为待处理 + QueryWrapper tempFG = new QueryWrapper<>(); + tempFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserFG = baseMapper.selectOne(tempFG); + dgGuaranteeLetterAssignUserFG.setStatus(StatusCode.SP_REJECT); + dgGuaranteeLetterAssignUserFG.setOperatingStatus(StatusCode.CZ_ON_HAND); + int update = baseMapper.updateById(dgGuaranteeLetterAssignUserFG); + //添加成功，返回操作结果 + log.info(update > 0 ? "a角驳回更新成功" : "a角驳回更新失败"); + return update > 0; + } + } + } + + //当前用户为b角用户 + if (currentUser.equals(bUser)){ + //更新之前,获取此用户数据的审批状态，如果审批状态为驳回，则更新资产部经理数据，如果审批状态为审批中，则添加资产部经理数据 + QueryWrapper queryWrapperTemp = new QueryWrapper<>(); + queryWrapperTemp.eq("business_id",businessId).eq("user_id",bUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUserTemp = baseMapper.selectOne(queryWrapperTemp); + Integer approveStatus = guaranteeLetterAssignUserTemp.getStatus(); + + //首次b角用户确认担保函，检查a角用户是否确认担保函 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){ + QueryWrapper queryWrapperUser = new QueryWrapper<>(); + queryWrapperUser.eq("business_id",businessId).eq("user_id",bUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //获取公司id + Integer companyId = guaranteeLetterAssignUser.getCompanyId(); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + log.info(i > 0 ? "首次b角用户确认担保函更新成功" : "首次b角用户确认担保函更新失败"); + //更新成功后，判断a角用户是否确认 + if (i > 0){ + QueryWrapper tempB = new QueryWrapper<>(); + //查询a用户的审核状态 + tempB.eq("business_id",businessId).eq("user_id",aUser).select("status"); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = baseMapper.selectOne(tempB); + Integer aStatus = dgGuaranteeLetterAssignUser.getStatus(); + //a用户审核通过，添加资产部经理数据 + if (StatusCode.SP_REVIEWED.equals(aStatus)){ + DgGuaranteeLetterAssignUser ZCJLGuaranteeLetterAssign = new DgGuaranteeLetterAssignUser(); + ZCJLGuaranteeLetterAssign.setBusinessId(businessId); + ZCJLGuaranteeLetterAssign.setCompanyId(companyId); + ZCJLGuaranteeLetterAssign.setRoleId(PromptSuccess.ZC_JL_ID); + int insert = baseMapper.insert(ZCJLGuaranteeLetterAssign); + //添加成功，返回操作结果 + log.info(insert > 0 ? "资产部经理添加成功" : "资产部经理添加失败"); + return insert > 0; + } + } + } + + //驳回后b角用户再次确认担保函，检查a角用户是否确认担保函 + if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){ + QueryWrapper queryWrapperUser = new QueryWrapper<>(); + queryWrapperUser.eq("business_id",businessId).eq("user_id",bUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + log.info(i > 0 ? "驳回后b角用户确认担保函更新成功" : "驳回后b角用户确认担保函更新失败"); + //更新成功后，判断a角用户是否确认 + if (i > 0){ + QueryWrapper tempB = new QueryWrapper<>(); + //查询a用户的审核状态 + tempB.eq("business_id",businessId).eq("user_id",aUser).select("status"); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = baseMapper.selectOne(tempB); + Integer aStatus = dgGuaranteeLetterAssignUser.getStatus(); + //a用户审核通过，更新资产部经理数据 + if (StatusCode.SP_REVIEWED.equals(aStatus)){ + QueryWrapper queryZCJLUser = new QueryWrapper<>(); + queryZCJLUser.eq("business_id",businessId).eq("role_id",PromptSuccess.ZC_JL_ID); + DgGuaranteeLetterAssignUser letterAssignUserZCJL = baseMapper.selectOne(queryZCJLUser); + //清空审批意见 + letterAssignUserZCJL.setAuditOpinion(""); + letterAssignUserZCJL.setStatus(StatusCode.SP_IN_REVIEW); + letterAssignUserZCJL.setStatus(StatusCode.CZ_ON_HAND); + int update = baseMapper.updateById(letterAssignUserZCJL); + //更新成功，返回操作结果 + log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败"); + return update > 0; + } + } + } + + //b角驳回操作，更新b角数据及a角数据及返回上一流程 + if (StatusCode.SP_REJECT.equals(status)){ + QueryWrapper queryWrapperUser = new QueryWrapper<>(); + queryWrapperUser.eq("business_id",businessId).eq("user_id",bUser); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser); + guaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT); + guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED); + guaranteeLetterAssignUser.setAuditOpinion(auditOpinion); + //根据当前用户更新审核状态和操作状态及审核意见 + int i = baseMapper.updateById(guaranteeLetterAssignUser); + log.info(i > 0 ? "b角用户驳回担保函更新成功" : "b角用户驳回担保函更新失败"); + //更新成功后，更新a角数据及更新法规部经理数据 + if (i > 0){ + //更新a用户的审核状态为驳回 + QueryWrapper tempA = new QueryWrapper<>(); + tempA.eq("business_id",businessId).eq("user_id",aUser); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserA = baseMapper.selectOne(tempA); + dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT); + baseMapper.updateById(dgGuaranteeLetterAssignUserA); + + //更新法规部经理的审核状态为驳回，操作状态为待处理 + QueryWrapper tempFG = new QueryWrapper<>(); + tempFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); + DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserFG = baseMapper.selectOne(tempFG); + dgGuaranteeLetterAssignUserFG.setStatus(StatusCode.SP_REJECT); + dgGuaranteeLetterAssignUserFG.setOperatingStatus(StatusCode.CZ_ON_HAND); + int update = baseMapper.updateById(dgGuaranteeLetterAssignUserFG); + //添加成功，返回操作结果 + log.info(update > 0 ? "b角驳回更新成功" : "b角驳回更新失败"); + return update > 0; + } + } + } + //一个判断都不走，直接返回false + log.info("《《《《《数据更新失败，请确保数据完整》》》》》"); + return false; } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java index 27df8ae6..8d109a3c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java @@ -1,9 +1,15 @@ package com.daqing.financial.guarantee.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.PaymentConfirmationListResponse; import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider; +import com.daqing.framework.utils.PageUtils; import org.springframework.stereotype.Service; /** @@ -17,4 +23,41 @@ import org.springframework.stereotype.Service; @Service public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl implements IDgPaymentConfirmationConsiderService { + @Override + public PageUtils queryPage(PaymentConfirmationQueryRequest paymentConfirmationQueryRequest) { + //取出条件 + Integer page = paymentConfirmationQueryRequest.getPage(); + Integer size = paymentConfirmationQueryRequest.getSize(); + Integer status = paymentConfirmationQueryRequest.getStatus(); + //a根据角色id查询 + Integer roleId = paymentConfirmationQueryRequest.getRoleId(); + String customerNumberOrName = paymentConfirmationQueryRequest.getCustomerNumberOrName(); + //分页条件查询 + IPage paymentConfirmationVO = baseMapper.pageByCondition(new Page(page,size),roleId,status,customerNumberOrName); + + return new PageUtils(paymentConfirmationVO); + } + + @Override + public boolean updatePaymentConfirmation(PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest) { + //取出条件 + Integer id = paymentConfirmationUpdateRequest.getId(); + Integer currentUser = paymentConfirmationUpdateRequest.getCurrentUser(); + String auditOpinion = paymentConfirmationUpdateRequest.getAuditOpinion(); + String imgFile = paymentConfirmationUpdateRequest.getImgFile(); + Integer status = paymentConfirmationUpdateRequest.getStatus(); + //更新对象 + DgPaymentConfirmationConsider paymentConfirmationConsider = new DgPaymentConfirmationConsider(); + paymentConfirmationConsider.setId(id); + paymentConfirmationConsider.setConsiderId(currentUser); + paymentConfirmationConsider.setAuditOpinion(auditOpinion); + paymentConfirmationConsider.setImgFile(imgFile); + paymentConfirmationConsider.setStatus(status); + paymentConfirmationConsider.setOperatingStatus(2); + //确认通过向放款通知添加记录 + if (status==2){ + } + int i = baseMapper.updateById(paymentConfirmationConsider); + return i>0; + } } diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml index e10a4363..aaa021a9 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml @@ -13,7 +13,7 @@ - + @@ -26,16 +26,20 @@ + + + - + select lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,aai.apply_amount,aai.apply_time,aai.create_time, + lau.status,aai.bank,lcc.update_time,lcc.file,lau.audit_opinion,lau.operating_status,bps.business_status from dg_guarantee_letter_assign_user lau left join dg_apply_amount_info aai on lau.business_id = aai.id left join crms_company_customer ccc on lau.company_id = ccc.id left join crms_customer cc on ccc.customer_id = cc.id left join dg_loan_committee_consider lcc on lau.business_id = lcc.business_id + left join dg_business_process_status bps on lau.business_id = bps.business_id AND lau.role_id = #{roleId} 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 6a326d92..deb4b753 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml @@ -7,11 +7,47 @@ - + + + + + + + + + + + + + + + + + + + + diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java index adfc4e89..85208db8 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java @@ -3,6 +3,7 @@ package com.daqing.framework.domain.guarantee; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -28,6 +29,8 @@ public class DgAuditProcess implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; + @ApiModelProperty(value = "业务id") + private Integer businessId; /** * 企业id */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeLetterAssignUser.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeLetterAssignUser.java index f4a409c3..9d764049 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeLetterAssignUser.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeLetterAssignUser.java @@ -35,17 +35,17 @@ public class DgGuaranteeLetterAssignUser implements Serializable { private Integer roleId; @ApiModelProperty(value = "审核意见") - private Integer auditOpinion; + private String auditOpinion; - @ApiModelProperty(value = "类型（1：A角确认 2：B角确认 3：经理确认）") - private Integer type; - - @ApiModelProperty(value = "审批人id") + @ApiModelProperty(value = "操作用户id") private Integer userId; - @ApiModelProperty(value = "状态：1->审核中；2->拒绝；3->已审核") + @ApiModelProperty(value = "审核状态：（1审核中 、2已审核、4驳回）") private Integer status; + @ApiModelProperty(value = "操作状态：（1待处理 、2已处理。默认添加为待处理）") + private Integer operatingStatus; + @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) private Date createTime; diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java index fe67d979..2846bc05 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java @@ -37,11 +37,12 @@ public class DgLoanCommitteeConsider implements Serializable { */ private Integer considerId; - /** - * 审核状态 - */ + @ApiModelProperty(value = "审核状态：（1审核中 、2已审核、4驳回）") private Integer status; + @ApiModelProperty(value = "操作状态：（1待处理 、2已处理。默认添加为待处理）") + private Integer operatingStatus; + /** * 贷审会议定事项 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgPaymentConfirmationConsider.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgPaymentConfirmationConsider.java index b4ebca14..483093b4 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgPaymentConfirmationConsider.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgPaymentConfirmationConsider.java @@ -21,35 +21,35 @@ public class DgPaymentConfirmationConsider implements Serializable { private static final long serialVersionUID = 1L; - /** - * 主键id - */ + @ApiModelProperty(value = "主键id -》(自动生成)") @TableId(value = "id", type = IdType.AUTO) private Integer id; - /** - * 企业id - */ + @ApiModelProperty(value = "业务id") + private Integer businessId; + + @ApiModelProperty(value = "企业id") private Integer companyId; - /** - * 回款确认者id - */ + @ApiModelProperty(value = "操作用户id") + private Integer userId; + + @ApiModelProperty(value = "角色id") + private Integer roleId; + + @ApiModelProperty(value = "回款确认者id") private Integer considerId; - /** - * 审核意见 - */ - private String remark; + @ApiModelProperty(value = "审核意见") + private String auditOpinion; - /** - * 审核状态 - */ + @ApiModelProperty(value = "审核状态：（1审核中 、2已审核、4驳回）") private Integer status; - /** - * 银行回单图片 - */ + @ApiModelProperty(value = "操作状态：（1待处理 、2已处理。默认添加为待处理）") + private Integer operatingStatus; + + @ApiModelProperty(value = "银行回单图片") private String imgFile; @ApiModelProperty(value = "创建时间") diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/ApprovalStatusConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/ApprovalStatusConverter.java new file mode 100644 index 00000000..48a546cc --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/ApprovalStatusConverter.java @@ -0,0 +1,80 @@ +package com.daqing.framework.utils.excel; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.CellData; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +/** + * @Author chen + * @DATE 2020/10/19 15:44 + * @Version 1.0 + * 审核状态转换器 + */ +public class ApprovalStatusConverter implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Integer.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + /** + * 这里读的时候会调用 + * + * @param cellData + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + return 0; + } + + /** + * 这里是写的时候会调用 + * + * @param value + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + + switch (value){ + case 0: + return new CellData("待指派"); + case 1: + return new CellData("审核中"); + case 2: + return new CellData("已审核"); + case 3: + return new CellData("已拒绝"); + case 4: + return new CellData("驳回"); + case 5: + return new CellData("已撤销"); + case 6: + return new CellData("草稿"); + default: + return new CellData(String.valueOf(value)); + } + + } + +} diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/StatusConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/BusinessStatusConverter.java similarity index 85% rename from dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/StatusConverter.java rename to dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/BusinessStatusConverter.java index c8df93d9..f3d09648 100644 --- a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/StatusConverter.java +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/BusinessStatusConverter.java @@ -8,11 +8,11 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; /** * @Author chen - * @DATE 2020/10/19 15:44 + * @DATE 2020/11/22 14:53 * @Version 1.0 - * 状态转换器 + * 业务状态转换器 */ -public class StatusConverter implements Converter { +public class BusinessStatusConverter implements Converter { @Override public Class supportJavaTypeKey() { @@ -58,11 +58,11 @@ public class StatusConverter implements Converter { switch (value){ case 1: - return new CellData("审核中"); + return new CellData("进行中"); case 2: - return new CellData("拒绝"); + return new CellData("已完成"); case 3: - return new CellData("已审核"); + return new CellData("已否决"); default: return new CellData(String.valueOf(value)); } diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/OperatingStatusConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/OperatingStatusConverter.java new file mode 100644 index 00000000..08d03e69 --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/OperatingStatusConverter.java @@ -0,0 +1,72 @@ +package com.daqing.framework.utils.excel; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.CellData; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +/** + * @Author chen + * @DATE 2020/11/19 16:13 + * @Version 1.0 + * 操作状态转换器 + */ +public class OperatingStatusConverter implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Integer.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + /** + * 这里读的时候会调用 + * + * @param cellData + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + return 0; + } + + /** + * 这里是写的时候会调用 + * + * @param value + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + + switch (value){ + case 0: + return new CellData("已发起"); + case 1: + return new CellData("待处理"); + case 2: + return new CellData("已处理"); + default: + return new CellData(String.valueOf(value)); + } + + } + +}