Browse Source

账款详情,首页部分

xda 3 years ago
parent
commit
0bb3959978
62 changed files with 1464 additions and 1051 deletions
  1. 48 0
      src/main/java/com/winhc/repal/cloud/DataMiddlewareService.java
  2. 46 0
      src/main/java/com/winhc/repal/cloud/InCaseService.java
  3. 44 0
      src/main/java/com/winhc/repal/cloud/dto/AddDiagnoseRecordDTO.java
  4. 56 0
      src/main/java/com/winhc/repal/cloud/dto/DiagnosisDebtorDTO.java
  5. 24 0
      src/main/java/com/winhc/repal/cloud/dto/GetCompanyRiskNumDTO.java
  6. 31 0
      src/main/java/com/winhc/repal/cloud/dto/GetFinanceDynamicNumDTO.java
  7. 25 0
      src/main/java/com/winhc/repal/cloud/vo/CompanyRiskNumVO.java
  8. 57 0
      src/main/java/com/winhc/repal/cloud/vo/DiagnosisRecord.java
  9. 53 0
      src/main/java/com/winhc/repal/cloud/vo/DiagnosisRecordVO.java
  10. 26 0
      src/main/java/com/winhc/repal/cloud/vo/FinanceDynamicNumVO.java
  11. 45 35
      src/main/java/com/winhc/repal/controller/AccountBookController.java
  12. 15 0
      src/main/java/com/winhc/repal/entity/RepalBill.java
  13. 77 0
      src/main/java/com/winhc/repal/entity/RepalBillDiagnosis.java
  14. 5 0
      src/main/java/com/winhc/repal/entity/RepalBillOperLog.java
  15. 7 0
      src/main/java/com/winhc/repal/entity/RepalBook.java
  16. 7 0
      src/main/java/com/winhc/repal/entity/RepalChangeRecord.java
  17. 7 0
      src/main/java/com/winhc/repal/entity/RepalCustomer.java
  18. 7 0
      src/main/java/com/winhc/repal/entity/RepalGroup.java
  19. 7 0
      src/main/java/com/winhc/repal/entity/RepalGroupMember.java
  20. 7 0
      src/main/java/com/winhc/repal/entity/RepalGroupRole.java
  21. 5 0
      src/main/java/com/winhc/repal/entity/RepalLink.java
  22. 7 0
      src/main/java/com/winhc/repal/entity/RepalRolePermission.java
  23. 0 10
      src/main/java/com/winhc/repal/enums/AuthorityEnum.java
  24. 32 0
      src/main/java/com/winhc/repal/enums/DeletedStatusEnum.java
  25. 33 0
      src/main/java/com/winhc/repal/enums/DiagnosisStatusEnum.java
  26. 36 0
      src/main/java/com/winhc/repal/enums/DiagnosisTrendEnum.java
  27. 0 550
      src/main/java/com/winhc/repal/enums/Dict.java
  28. 0 131
      src/main/java/com/winhc/repal/enums/DynamicEnum.java
  29. 0 72
      src/main/java/com/winhc/repal/enums/FinanceDimensionEnum.java
  30. 0 45
      src/main/java/com/winhc/repal/enums/FinanceDynamicTypeEnum.java
  31. 14 0
      src/main/java/com/winhc/repal/enums/MsgKindEnum.java
  32. 27 0
      src/main/java/com/winhc/repal/enums/MsgNameEnum.java
  33. 29 0
      src/main/java/com/winhc/repal/enums/OverdueEnum.java
  34. 0 140
      src/main/java/com/winhc/repal/enums/RadarInfoTypeEnum.java
  35. 24 0
      src/main/java/com/winhc/repal/enums/ReadStatusEnum.java
  36. 34 0
      src/main/java/com/winhc/repal/enums/RefreshStatusEnum.java
  37. 14 0
      src/main/java/com/winhc/repal/enums/RemindEnum.java
  38. 25 0
      src/main/java/com/winhc/repal/enums/RemindSettingEnum.java
  39. 43 0
      src/main/java/com/winhc/repal/enums/RepalBillStageEnum.java
  40. 42 0
      src/main/java/com/winhc/repal/enums/RepalBillStatusEnum.java
  41. 33 0
      src/main/java/com/winhc/repal/enums/RepalBillTypeEnum.java
  42. 0 50
      src/main/java/com/winhc/repal/enums/ValueAddedServiceEnum.java
  43. 11 7
      src/main/java/com/winhc/repal/model/vo/RepalBillDetailVO.java
  44. 56 0
      src/main/java/com/winhc/repal/model/vo/RepalBookHomeVO.java
  45. 19 0
      src/main/java/com/winhc/repal/model/vo/ResultItemVO.java
  46. 13 0
      src/main/java/com/winhc/repal/repository/RepalBillDiagnosisMapper.java
  47. 14 0
      src/main/java/com/winhc/repal/service/RepalBillDiagnosisService.java
  48. 8 0
      src/main/java/com/winhc/repal/service/RepalBookService.java
  49. 16 0
      src/main/java/com/winhc/repal/service/RepalGroupMemberService.java
  50. 16 0
      src/main/java/com/winhc/repal/service/RepalGroupRoleService.java
  51. 9 0
      src/main/java/com/winhc/repal/service/RepalResponsiblePersonService.java
  52. 16 0
      src/main/java/com/winhc/repal/service/RepalRolePermissionService.java
  53. 17 0
      src/main/java/com/winhc/repal/service/impl/RepalBillDiagnosisServiceImpl.java
  54. 112 5
      src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java
  55. 5 0
      src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java
  56. 18 0
      src/main/java/com/winhc/repal/service/impl/RepalGroupMemberServiceImpl.java
  57. 18 0
      src/main/java/com/winhc/repal/service/impl/RepalGroupRoleServiceImpl.java
  58. 11 3
      src/main/java/com/winhc/repal/service/impl/RepalResponsiblePersonServiceImpl.java
  59. 18 0
      src/main/java/com/winhc/repal/service/impl/RepalRolePermissionServiceImpl.java
  60. 87 0
      src/main/java/com/winhc/repal/util/DiagnosisUtil.java
  61. 5 0
      src/main/resources/mapper/RepalBillDiagnosisMapper.xml
  62. 3 3
      src/test/java/CodeGenerator.java

+ 48 - 0
src/main/java/com/winhc/repal/cloud/DataMiddlewareService.java

@@ -0,0 +1,48 @@
+package com.winhc.repal.cloud;
+
+import com.winhc.common.base.ApiDataResult;
+import com.winhc.repal.cloud.dto.GetCompanyRiskNumDTO;
+import com.winhc.repal.cloud.dto.GetFinanceDynamicNumDTO;
+import com.winhc.repal.cloud.vo.CompanyRiskNumVO;
+import com.winhc.repal.cloud.vo.FinanceDynamicNumVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+
+/**
+ * @Description: DataMiddlewareService
+ * @Author: xda
+ * @Date: 2022/4/14 14:21
+ */
+
+@FeignClient("winhc-data-middleware")
+//@FeignClient(value = "winhc-data-middleware", url = "http://47.101.212.122:10001/")
+public interface DataMiddlewareService {
+
+
+
+
+    /**
+     * 财产线索数量
+     * @param dto dto
+     * @return com.winhc.common.base.ApiDataResult<java.util.List < FinanceDynamicNumVO>>
+     * @author xda
+     * @date 2022/4/14 14:22
+     */
+    @PostMapping("/dynamic/finance/v8/num")
+    ApiDataResult<List<FinanceDynamicNumVO>> getFinanceDynamicNumV8List(@RequestBody GetFinanceDynamicNumDTO dto);
+
+
+    /**
+     * 获取公司风险数量
+     * @param dto dto
+     * @return com.winhc.common.base.ApiDataResult<java.util.List < com.winhc.repal.cloud.vo.CompanyRiskNumVO>>
+     * @author xda
+     * @date 2022/4/14 14:41
+     */
+    @PostMapping("/risk/companyList")
+    ApiDataResult<List<CompanyRiskNumVO>> getCompanyRiskNumList(@RequestBody GetCompanyRiskNumDTO dto);
+}

+ 46 - 0
src/main/java/com/winhc/repal/cloud/InCaseService.java

@@ -0,0 +1,46 @@
+package com.winhc.repal.cloud;
+
+import com.winhc.common.base.ApiDataResult;
+import com.winhc.repal.cloud.dto.AddDiagnoseRecordDTO;
+import com.winhc.repal.cloud.vo.DiagnosisRecord;
+import com.winhc.repal.cloud.vo.DiagnosisRecordVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author Aaron
+ * @date 2020/12/14 10:19
+ * @description
+ */
+@FeignClient("inCaseService")
+//@FeignClient(value = "inCaseService",url = "106.14.81.247:58554")
+public interface InCaseService {
+
+    /**
+     * 进行履债评估
+     * @param dto dto
+     * @return com.winhc.common.base.ApiDataResult<com.winhc.repal.cloud.vo.DiagnosisRecord>
+     * @author xda
+     * @date 2022/4/14 14:58
+     */
+    @PostMapping("diagnose/performance/assessment")
+    ApiDataResult<DiagnosisRecord> performanceAssessment(@Validated @RequestBody AddDiagnoseRecordDTO dto);
+
+
+
+    /**
+     * 查询评估record
+     * @param diagnosisId diagnosisId
+     * @return com.winhc.common.base.ApiDataResult<com.winhc.repal.cloud.vo.DiagnosisRecordVO>
+     * @author xda
+     * @date 2022/4/14 14:59
+     */
+    @GetMapping("/diagnose/{diagnosisId}")
+    ApiDataResult<DiagnosisRecordVO> getRecordVO(@PathVariable("diagnosisId") Long diagnosisId);
+
+}

+ 44 - 0
src/main/java/com/winhc/repal/cloud/dto/AddDiagnoseRecordDTO.java

@@ -0,0 +1,44 @@
+package com.winhc.repal.cloud.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author: liujian
+ * @description: 添加诊断记录的bean
+ * @date 2020-01-08 9:27
+ */
+@Data
+public class AddDiagnoseRecordDTO {
+
+
+    @ApiModelProperty(value = "原告", required = true)
+    private String creditorName;
+
+    @ApiModelProperty(value = "被告名称,以顿号隔开", required = true)
+    private String debtorName;
+
+    @ApiModelProperty(value = "被告", required = true)
+    private List<DiagnosisDebtorDTO> debtorDTOList;
+
+    @ApiModelProperty(value = "标的", required = true)
+    private Double caseAmt;
+
+    @ApiModelProperty(value = "1可执行诊断;2能胜诉诊断")
+    private Integer diagnosisType;
+
+    @ApiModelProperty(value = "0智能风控;1人工风控")
+    private Integer riskMode;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "操作员ID")
+    private Integer operId;
+
+
+
+
+}

+ 56 - 0
src/main/java/com/winhc/repal/cloud/dto/DiagnosisDebtorDTO.java

@@ -0,0 +1,56 @@
+package com.winhc.repal.cloud.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Set;
+
+/**
+ * @author: liujian
+ * @description: 诊断被告Bean
+ * @date 2020-03-17 14:24
+ */
+@Data
+public class DiagnosisDebtorDTO {
+
+    private Long id;
+    @ApiModelProperty(value = "被告名称")
+    private String litigantName;
+
+    @ApiModelProperty(value = "被告类型:0自然人 ;1企业;2 自然人无关联")
+    private String litigantType;
+
+    @ApiModelProperty(value = "自然人身份证号")
+    private String idNo;
+
+    @ApiModelProperty(value = "自然人关联公司")
+    private String relatedCompany;
+
+    @ApiModelProperty(value = "自然人年龄")
+    private Integer age;
+    @ApiModelProperty(value = "自然人户籍地址")
+    private String personAddress;
+
+    @ApiModelProperty(value = "自然人性别")
+    private String sex;
+
+    @ApiModelProperty("0 成功;1 失败")
+    private Integer status;
+
+    @ApiModelProperty("结果数据主键ID")
+    private String mId;
+
+    @ApiModelProperty(value = "ABCD")
+    private String grade;
+
+    @ApiModelProperty(value = "评分")
+    private Double score;
+
+    @ApiModelProperty(value = "是否选中作为最终评分:Y是 ;N否")
+    private String isChosen;
+
+    // (企业/自然人)措施Id
+    private Set<Integer> mesureIds;
+
+
+}

+ 24 - 0
src/main/java/com/winhc/repal/cloud/dto/GetCompanyRiskNumDTO.java

@@ -0,0 +1,24 @@
+package com.winhc.repal.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description: GetCompanyRiskNumDTO
+ * @Author: xda
+ * @Date: 2021/8/6 15:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("获取公司风险数量")
+public class GetCompanyRiskNumDTO {
+
+    @ApiModelProperty("companyIdList")
+    private List<String> companyIdList;
+}

+ 31 - 0
src/main/java/com/winhc/repal/cloud/dto/GetFinanceDynamicNumDTO.java

@@ -0,0 +1,31 @@
+package com.winhc.repal.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @Description: GetFinanceDynamicNumDTO
+ * @Author: xda
+ * @Date: 2021/8/7 09:43
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("获取财产线索num")
+public class GetFinanceDynamicNumDTO {
+
+    @ApiModelProperty("公司nameList")
+    private List<String> companyNameList;
+
+    @ApiModelProperty("公司companyIdList")
+    private List<String> companyIdList;
+
+
+}

+ 25 - 0
src/main/java/com/winhc/repal/cloud/vo/CompanyRiskNumVO.java

@@ -0,0 +1,25 @@
+package com.winhc.repal.cloud.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description: CompanyRiskNumVO
+ * @Author: xda
+ * @Date: 2021/8/6 15:14
+ */
+@Data
+@ApiModel("公司风险数量")
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyRiskNumVO {
+
+    @ApiModelProperty("companyId")
+    private String companyId;
+
+    @ApiModelProperty("风险数量")
+    private Integer riskNum;
+}

+ 57 - 0
src/main/java/com/winhc/repal/cloud/vo/DiagnosisRecord.java

@@ -0,0 +1,57 @@
+package com.winhc.repal.cloud.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class DiagnosisRecord implements Serializable {
+    private Long diagnosisId;
+
+    @ApiModelProperty(value = "1可执行诊断;2能胜诉诊断")
+    private Integer diagnosisType;
+
+    @ApiModelProperty(value = "0智能风控;1人工风控")
+    private Integer riskMode;
+
+    private String creditorName;
+
+    private String debtorName;
+
+    private Double caseAmt;
+
+    @ApiModelProperty(value = "ABCD")
+    private String grade;
+
+    private Integer score;
+
+    private Date createTime;
+
+    private Long relatedId;
+
+    private String caseId;
+
+    private Long userId;
+
+    private Integer operId;
+
+    @ApiModelProperty(value = "0诊断中;1诊断完成;9诊断失败")
+    private Integer status;
+
+    private String result;
+
+    @ApiModelProperty(value = "评估结果关联要素JSON")
+    private String resultItem;
+
+
+
+    private static final long serialVersionUID = 1L;
+
+
+
+
+
+
+}

+ 53 - 0
src/main/java/com/winhc/repal/cloud/vo/DiagnosisRecordVO.java

@@ -0,0 +1,53 @@
+package com.winhc.repal.cloud.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author: liujian
+ * @description:
+ * @date 2020-03-19 10:12
+ */
+@Data
+public class DiagnosisRecordVO {
+    private Long diagnosisId;
+
+    @ApiModelProperty(value = "1可执行诊断;2能胜诉诊断")
+    private Integer diagnosisType;
+
+    @ApiModelProperty(value = "0智能风控;1人工风控")
+    private Integer riskMode;
+
+    private String creditorName;
+
+    private String debtorName;
+
+    private Double caseAmt;
+
+    @ApiModelProperty(value = "ABCD")
+    private String grade;
+
+    private Double score;
+
+    private Date createTime;
+
+    private Long relatedId;
+
+    private String caseId;
+
+    private Long userId;
+
+    private Integer operId;
+
+    @ApiModelProperty(value = "0诊断中;1诊断完成;9诊断失败")
+    private Integer status;
+
+    private String result;
+
+    @ApiModelProperty(value = "评估结果关联要素JSON")
+    private String resultItem;
+
+
+}

+ 26 - 0
src/main/java/com/winhc/repal/cloud/vo/FinanceDynamicNumVO.java

@@ -0,0 +1,26 @@
+package com.winhc.repal.cloud.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: FinanceDynamicNumVO
+ * @Author: xda
+ * @Date: 2021/8/7 09:41
+ */
+@Data
+@ApiModel("财产线索")
+public class FinanceDynamicNumVO {
+
+    @ApiModelProperty("公司name")
+    private String companyName;
+
+    @ApiModelProperty("财产线索数量")
+    private Integer financeDynamicNum;
+
+    @ApiModelProperty("companyId")
+    private String companyId;
+
+
+}

+ 45 - 35
src/main/java/com/winhc/repal/controller/AccountBookController.java

@@ -1,36 +1,46 @@
-//package com.winhc.returnmoney.controller;
-//
-//import com.winhc.common.base.BeanResponse;
-//import com.winhc.common.enums.CodeMsg;
-//import com.winhc.returnmoney.model.dto.RefreshGradeDTO;
-//import com.winhc.returnmoney.model.dto.UpdateAccountBookDTO;
-//import com.winhc.returnmoney.model.vo.AccountBookDetailVO;
-//import com.winhc.returnmoney.model.vo.AccountBookVO;
-//import com.winhc.returnmoney.service.AccountBookService;
-//import com.winhc.returnmoney.util.RequesterUtil;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//
-//
-///**
-// * @description AccountBook Controller
-// * @author Generator
-// * @date 2020-12-15
-// */
-//@Slf4j
-//@Api(tags = "账本")
-//@RestController
-//@RequestMapping("/accountBook")
-//public class AccountBookController {
-//
-//    @Autowired
-//    private AccountBookService accountBookService;
-//
+package com.winhc.repal.controller;
+
+import com.winhc.common.base.BeanResponse;
+import com.winhc.common.enums.CodeMsg;
+
+import com.winhc.repal.model.vo.RepalBookHomeVO;
+import com.winhc.repal.service.RepalBookService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * @description AccountBook Controller
+ * @author Generator
+ * @date 2020-12-15
+ */
+@Slf4j
+@Api(tags = "账本")
+@RestController
+@RequestMapping("/repalBook")
+public class RepalBookController {
+
+
+
+    @Autowired
+    private RepalBookService repalBookService;
+
+
+    @ApiOperation("首页接口")
+    @RequestMapping(value = "/home", method = RequestMethod.GET)
+    public BeanResponse<RepalBookHomeVO> getRepalBillDetail(@PathVariable("repalBookId") Long repalBookId) {
+        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService);
+    }
+
+
+
+
+
 //    @ApiOperation(value = "获取账本列表")
 //    @RequestMapping( method = RequestMethod.GET)
 //    public BeanResponse<List<AccountBookVO>> getAccountBookList() {
@@ -61,5 +71,5 @@
 //    public BeanResponse<Boolean> deleteAccountBook(@PathVariable("accountBookId") Long accountBookId) {
 //        return BeanResponse.success(CodeMsg.SUCCESS, accountBookService.deleteAccountBook(accountBookId, RequesterUtil.getCurrentUserId()));
 //    }
-//
-//}
+
+}

+ 15 - 0
src/main/java/com/winhc/repal/entity/RepalBill.java

@@ -8,11 +8,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalBill实体对象
@@ -65,6 +68,8 @@ public class RepalBill implements Serializable {
 
     @ApiModelProperty(value = "应收账款日期")
     @TableField("END_DATE")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endDate;
 
     @ApiModelProperty(value = "账款logo")
@@ -93,6 +98,8 @@ public class RepalBill implements Serializable {
 
     @ApiModelProperty(value = "合同到期日期")
     @TableField("CONTRACT_END_DATE")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate contractEndDate;
 
     @ApiModelProperty(value = "合同附件逗号分隔")
@@ -121,6 +128,8 @@ public class RepalBill implements Serializable {
 
     @ApiModelProperty(value = "上次评估时间")
     @TableField("PRE_DIAGNOSIS_DATETIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime preDiagnosisDatetime;
 
     @ApiModelProperty(value = "评估等级")
@@ -145,6 +154,8 @@ public class RepalBill implements Serializable {
 
     @ApiModelProperty(value = "账款结清时间")
     @TableField("SETTLE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime settleTime;
 
     @ApiModelProperty(value = "用户id(创建者id)")
@@ -157,10 +168,14 @@ public class RepalBill implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
 

+ 77 - 0
src/main/java/com/winhc/repal/entity/RepalBillDiagnosis.java

@@ -0,0 +1,77 @@
+package com.winhc.repal.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @description RepalBillDiagnosis实体对象
+ * @author Generator
+ * @date 2022-04-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("REPAL_BILL_DIAGNOSIS")
+@ApiModel(value="RepalBillDiagnosis实体对象", description="回款宝-账款评分记录表")
+public class RepalBillDiagnosis implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "账单id")
+    @TableField("REPAL_BILL_ID")
+    private Long repalBillId;
+
+    @ApiModelProperty(value = "评估等级")
+    @TableField("DIAGNOSIS_GRADE")
+    private String diagnosisGrade;
+
+    @ApiModelProperty(value = "评估分值")
+    @TableField("DIAGNOSIS_SCORE")
+    private BigDecimal diagnosisScore;
+
+    @ApiModelProperty(value = "评估时间")
+    @TableField("DIAGNOSIS_DATETIME")
+    private LocalDateTime diagnosisDatetime;
+
+    @ApiModelProperty(value = "评估状态:0诊断中;1诊断完成;9诊断失败")
+    @TableField("DIAGNOSIS_STATUS")
+    private Integer diagnosisStatus;
+
+    @ApiModelProperty(value = "评估详情")
+    @TableField("DIAGNOSIS_DETAIL")
+    private String diagnosisDetail;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime timeCreated;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime timeModified;
+
+    @ApiModelProperty(value = "履债评估结果id")
+    @TableField("BIZ_ID")
+    private Long bizId;
+
+
+}

+ 5 - 0
src/main/java/com/winhc/repal/entity/RepalBillOperLog.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalBillOperLog实体对象
@@ -55,6 +58,8 @@ public class RepalBillOperLog implements Serializable {
 
     @ApiModelProperty(value = "操作时间")
     @TableField("OPER_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime operTime;
 
 

+ 7 - 0
src/main/java/com/winhc/repal/entity/RepalBook.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalBook实体对象
@@ -63,10 +66,14 @@ public class RepalBook implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
     @ApiModelProperty(value = "是否删除,1删除。0否")

+ 7 - 0
src/main/java/com/winhc/repal/entity/RepalChangeRecord.java

@@ -7,11 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalChangeRecord实体对象
@@ -71,9 +74,13 @@ public class RepalChangeRecord implements Serializable {
     private Integer deleted;
 
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
 

+ 7 - 0
src/main/java/com/winhc/repal/entity/RepalCustomer.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalCustomer实体对象
@@ -72,10 +75,14 @@ public class RepalCustomer implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
     @ApiModelProperty(value = "1客户  2供应商")

+ 7 - 0
src/main/java/com/winhc/repal/entity/RepalGroup.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalGroup实体对象
@@ -44,10 +47,14 @@ public class RepalGroup implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
 

+ 7 - 0
src/main/java/com/winhc/repal/entity/RepalGroupMember.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalGroupMember实体对象
@@ -56,10 +59,14 @@ public class RepalGroupMember implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
 

+ 7 - 0
src/main/java/com/winhc/repal/entity/RepalGroupRole.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalGroupRole实体对象
@@ -48,10 +51,14 @@ public class RepalGroupRole implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
 

+ 5 - 0
src/main/java/com/winhc/repal/entity/RepalLink.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalLink实体对象
@@ -56,6 +59,8 @@ public class RepalLink implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
 

+ 7 - 0
src/main/java/com/winhc/repal/entity/RepalRolePermission.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description RepalRolePermission实体对象
@@ -48,10 +51,14 @@ public class RepalRolePermission implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeCreated;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("TIME_MODIFIED")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timeModified;
 
 

+ 0 - 10
src/main/java/com/winhc/repal/enums/AuthorityEnum.java

@@ -1,10 +0,0 @@
-//package com.winhc.repal.enums;
-//
-///**
-// * @description: 接口权限枚举
-// * @author: anakin
-// * @date 2020.10.12 15:05
-// */
-//public enum AuthorityEnum {
-//    无, 登录用户, 登录且存在的用户, VIP用户
-//}

+ 32 - 0
src/main/java/com/winhc/repal/enums/DeletedStatusEnum.java

@@ -0,0 +1,32 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: DeletedEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:41
+ */
+public enum DeletedStatusEnum {
+
+    /**
+     *  是否删除
+     */
+    NORMAL(0, "正常"),
+    DELETE(1, "删除");
+
+    private final Integer code;
+
+    private final String msg;
+
+    DeletedStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+}

+ 33 - 0
src/main/java/com/winhc/repal/enums/DiagnosisStatusEnum.java

@@ -0,0 +1,33 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: DiagnosisStatusEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:39
+ */
+public enum DiagnosisStatusEnum {
+
+    /**
+     *  评估状态:0诊断中;1诊断完成;9诊断失败
+     */
+    DIAGNOSIS_ING(0, "诊断中"),
+    DIAGNOSIS_SUCCESS(1, "诊断完成"),
+    DIAGNOSIS_FAIL(9, "诊断失败");
+
+    private final Integer code;
+
+    private final String msg;
+
+    DiagnosisStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+}

+ 36 - 0
src/main/java/com/winhc/repal/enums/DiagnosisTrendEnum.java

@@ -0,0 +1,36 @@
+package com.winhc.repal.enums;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * @Description: DiagnosisTrendEnum
+ * @Author: xda
+ * @Date: 2022/4/14 11:40
+ */
+public enum DiagnosisTrendEnum {
+
+    /**
+     *  评估趋势
+     */
+    ASCEND(1, "上升"),
+    DESCENT(2, "下降"),
+    KEEP(0, "保持");
+
+    private final Integer code;
+
+    private final String msg;
+
+    DiagnosisTrendEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+}

+ 0 - 550
src/main/java/com/winhc/repal/enums/Dict.java

@@ -1,550 +0,0 @@
-package com.winhc.repal.enums;
-
-import cn.hutool.core.util.ObjectUtil;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * @description: 字典类
- * @author: yujie
- * @date 2020.8.18 9:17
- */
-public class Dict {
-
-    public enum RefreshStatusEnum {
-        /**
-         *  刷新状态
-         */
-        REFRESH_WAIT(1, "未刷新"),
-        REFRESH_ING(2, "刷新中"),
-        REFRESH_SUCCESS(3, "已刷新"),
-        REFRESH_FAIL(0, "刷新失败");
-
-        private final Integer code;
-
-        private final String msg;
-
-        RefreshStatusEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-    }
-
-    public enum DeletedEnum {
-        /**
-         *  是否删除
-         */
-        NORMAL(0, "正常"),
-        DELETE(1, "删除");
-
-        private final Integer code;
-
-        private final String msg;
-
-        DeletedEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-
-    }
-
-    public enum AccountBillStatusEnum {
-        /**
-         *  账款状态
-         */
-        PROGRESSING(1, "进行中"),
-        OVERDUE(2, "已逾期"),
-        SUCCESS(3, "已收回");
-
-        private final Integer code;
-
-        private final String msg;
-
-        AccountBillStatusEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-
-        public static List<Integer> getBillStatusList() {
-            return Arrays.stream(AccountBillStatusEnum.values()).map(AccountBillStatusEnum::getCode).collect(Collectors.toList());
-        }
-
-    }
-
-    public enum DiagnosisTrendEnum {
-        /**
-         *  评估趋势
-         */
-        ASCEND(1, "上升"),
-        DESCENT(2, "下降"),
-        KEEP(0, "保持");
-
-        private final Integer code;
-
-        private final String msg;
-
-        DiagnosisTrendEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-
-        public static Integer getDiagnosisTrend(BigDecimal preScore, BigDecimal score) {
-            if (Objects.isNull(preScore)) {
-                return 0;
-            }
-            if (score.compareTo(preScore) > 0) {
-                return DiagnosisTrendEnum.ASCEND.getCode();
-            }
-            if (score.compareTo(preScore) < 0) {
-                return DiagnosisTrendEnum.DESCENT.getCode();
-            }
-            return 0;
-        }
-
-    }
-
-    public enum DiagnosisStatusEnum {
-        /**
-         *  评估状态:0诊断中;1诊断完成;9诊断失败
-         */
-        DIAGNOSIS_ING(0, "诊断中"),
-        DIAGNOSIS_SUCCESS(1, "诊断完成"),
-        DIAGNOSIS_FAIL(9, "诊断失败");
-
-        private final Integer code;
-
-        private final String msg;
-
-        DiagnosisStatusEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-    }
-
-    public enum ChangeTypeEnum {
-        /**
-         *  变更类型,增加,减少
-         */
-        INCREASE(1, "增加"),
-        DECREASE(2, "减少");
-
-        private final Integer code;
-
-        private final String msg;
-
-        ChangeTypeEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-
-        public static Integer getMoneyCrease(BigDecimal preMoney, BigDecimal changeMoney) {
-            if (ObjectUtil.hasEmpty(preMoney, changeMoney)) {
-                return null;
-            }
-            if (preMoney.compareTo(changeMoney) < 0) {
-                return ChangeTypeEnum.INCREASE.getCode();
-            }
-            if (preMoney.compareTo(changeMoney) > 0) {
-                return ChangeTypeEnum.DECREASE.getCode();
-            }
-            return null;
-        }
-    }
-
-    public enum ReceiveTypeEnum {
-        /**
-         *  收入类型,1应收金额,2已收金额
-         */
-        RECEIVABLE(1, "应收金额"),
-        RECEIVED(2, "已收金额");
-
-        private final Integer code;
-
-        private final String msg;
-
-        ReceiveTypeEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-    }
-
-    public enum AccountBillStageEnum {
-        /**
-         *  账款阶段,1未起诉,2已起诉,3已申请执行,4终结本次执行
-         */
-        NON_PROSECUTE(1, "未起诉"),
-        PROSECUTE_ING(2, "已起诉"),
-        APPLY_EXECUTE(3, "已申请执行"),
-        FINAL_EXECUTE(4, "终结本次执行");
-
-        private final Integer code;
-
-        private final String msg;
-
-        AccountBillStageEnum(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMsg() {
-            return this.msg;
-        }
-
-        public static String getMsgByCode(Integer code) {
-            for (AccountBillStageEnum e : AccountBillStageEnum.values()) {
-                if (e.getCode().equals(code)) {
-                    return e.getMsg();
-                }
-            }
-            return null;
-        }
-    }
-
-
-    /**
-     * 报告类型
-     */
-    public enum ReportTypeEnum {
-        /**
-         * 报告类型
-         */
-        资信的调查报告(0), 案件进展报告(1), 债权穿透分析报告(2), 公司动态监测报告(3), 律师匹配报告(4),
-        简易资信报告(5), 权益及风险分析报(6), 律师分析报告(7), 可执行诊断报告(8), 案件托管报告(9),
-        财产信息分析报告(10), 履债评估报告(11);
-        private Integer code;
-
-        ReportTypeEnum(Integer code) {
-            this.code = code;
-        }
-
-        public Integer getCode() {
-            return code;
-        }
-
-        public static String getDescByCode(Integer code) {
-            for (ReportTypeEnum e : ReportTypeEnum.values()) {
-                if (e.getCode().equals(code)) {
-                    return e.name();
-                }
-            }
-            return null;
-        }
-
-    }
-
-    /**
-     * 被告类型
-     */
-    public enum LitigantTypeEnum {
-        /**
-         * 报告类型
-         */
-        自然人("0"),企业("1"),自然人无关联("2");
-        private final String code;
-
-        LitigantTypeEnum(String code) {
-            this.code = code;
-        }
-
-        public String getCode() {
-            return code;
-        }
-    }
-
-    public enum rankStatusEnum {
-        /**
-         * 评分结果
-         */
-        待评分(0), 评分完成(1), 评分失败(3);
-        private final Integer code;
-
-        rankStatusEnum(Integer code) {
-            this.code = code;
-        }
-
-        public Integer getCode() {
-            return code;
-        }
-    }
-
-    public enum ReadStatusEnum {
-        /**
-         * 读状态
-         */
-        未读(0),已读(1);
-        private final Integer code;
-
-        ReadStatusEnum(Integer code) {
-            this.code = code;
-        }
-
-        public Integer getCode() {
-            return code;
-        }
-    }
-
-    public enum OverdueEnum{
-        /**
-         * 逾期枚举
-         */
-        即将逾期("OVERDUE_WEEK"),已逾期("OVERDUED"),已逾期三个月("OVERDUE_THREEMONTH"),
-        已逾期半年("OVERDUE_HALFYEAR"),已逾期一年("OVERDUE_YEAR"),已逾期三年("OVERDUE_THREEYEAR"),其他("OTHER");
-        private final String code;
-
-        OverdueEnum(String code) {
-            this.code = code;
-        }
-
-        public String getCode() {
-            return code;
-        }
-    }
-
-
-    public enum RemindEnum {
-        /**
-         * 智能提醒类型
-         */
-        逾期提醒,账款评级,财产线索,风险预警;
-    }
-
-
-    public enum UpdateTypeEnum {
-        /**
-         * 修改类型
-         */
-        END_DATE(1, "应收日期"),
-        RECEIVABLE(2, "应收金额"),
-        ALL(3, "账款信息");
-        private final Integer code;
-
-        private final String message;
-
-        UpdateTypeEnum(Integer code, String message) {
-            this.code = code;
-            this.message = message;
-        }
-
-        public Integer getCode() {
-            return code;
-        }
-
-        public String getMessage() {
-            return message;
-        }
-    }
-
-
-    public enum MsgNameEnum {
-        /**
-         * 模板名称
-         */
-        逾期APP提醒(""),逾期短信提醒(""),
-        评级变动APP提醒(""),评级变动短信提醒(""),
-        财产线索APP提醒(""),财产线索短信提醒(""),
-        风险提醒APP提醒(""),风险提醒短信提醒(""),评级无变动APP提醒("");
-        public String code;
-
-        MsgNameEnum(String code) {
-            this.code = code;
-        }
-    }
-
-    public enum MsgKindEnum{
-        /**
-         * 消息类型
-         */
-        app, weixin, sms, mail, delay
-    }
-
-    public enum VIP_SIGN_ENUM {
-
-        /**
-         *  vip类型
-         */
-        VIP("0"), 非VIP("1");
-        private final String code;
-
-        VIP_SIGN_ENUM(String code) {
-            this.code = code;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-    }
-
-    public enum REMIND_SETTING_ENUM {
-
-        /**
-         *  提醒设置类型
-         */
-        不需要提醒(0), 需要提醒(1);
-        private final Integer code;
-
-        REMIND_SETTING_ENUM(Integer code) {
-            this.code = code;
-        }
-
-        public Integer getCode() {
-            return code;
-        }
-
-    }
-
-    public enum TIME_SLOT_ENUM {
-        全部("ALL"),近30天("MONTH");
-
-        private String code;
-
-        TIME_SLOT_ENUM(String code) {
-            this.code = code;
-        }
-
-        public String getCode() {
-            return code;
-        }
-    }
-
-    public enum OverdueDayTypeNum {
-        /**
-         *  逾期天数类型
-         */
-        三个月内(1),
-        三至六个月(2),
-        半年至一年(3),
-        一年至三年(4),
-        三年以上(5);
-
-        private final Integer code;
-
-        OverdueDayTypeNum(Integer code) {
-            this.code = code;
-        }
-
-        public Integer getCode() {
-            return code;
-        }
-    }
-
-    public enum OverdueTipsEnum {
-        /**
-         *  1催款函,2快速咨询,3追欠款,4律师函服务
-         */
-        催款函(1, "催款函"),
-        快速咨询(2, "去咨询"),
-        追欠款(3, "立即前往"),
-        律师函服务(4, "律师函服务");
-
-        private final Integer code;
-
-        private final String desc;
-
-        OverdueTipsEnum(Integer code, String desc) {
-            this.code = code;
-            this.desc = desc;
-        }
-
-        public Integer getCode() {
-            return code;
-        }
-
-        public String getDesc() {
-            return desc;
-        }
-    }
-
-    /**
-     * 用户身份
-     */
-    public enum IdentityEnum {
-        /**
-         * 用户身份
-         */
-        商务人士("1"),认证律师("2"),认证法务("3"),其他法律人("4");
-        private final String code;
-
-        IdentityEnum(String code) {
-            this.code = code;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public static String getDescByCode(String code) {
-            for (IdentityEnum e : IdentityEnum.values()) {
-                if (e.getCode().equals(code)) {
-                    return e.name();
-                }
-            }
-            // 此处未查到,返回空串
-            return "";
-        }
-    }
-}

+ 0 - 131
src/main/java/com/winhc/repal/enums/DynamicEnum.java

@@ -1,131 +0,0 @@
-//package com.winhc.repal.enums;
-//
-//import java.util.Objects;
-//
-///**
-// * @description: 动态类型
-// * @author: Anakin
-// * @date 2021.8.2 10:12
-// */
-//public enum DynamicEnum {
-//    //经营异常新增
-//    经营异常("company_abnormal_info", "301901", "1","company_abnormal_info","JingYingYiChangDet"),
-//    经营异常_移除("company_abnormal_info", "301902", "1","","JingYingYiChangDet"),
-//    法院公告("company_court_announcement","302001", "2","company_court_announcement_list","KaiTingGongGaoDet"),
-//    开庭公告("company_court_open_announcement","302101", "3","company_court_open_announcement_list",""),
-//    立案信息("company_court_register","302201", "4","company_court_register_list","LiAnXinXiDet"),
-//    环保处罚("company_env_punishment","302401", "5","","HuanBaoChuFaDet"),
-//    严重违法("company_illegal_info","302501", "6","company_illegal_info","YanZhongWeiFaXingWeiDet"),
-//    行政处罚("company_punishment_info","302601", "7","","XingZhengChuFaDet"),
-//    行政处罚_信用中国("company_punishment_info","302601", "7","","XingZhengChuFaDet"),
-//    送达公告("company_send_announcement","302701", "8","","SongDaGongGaoDet"),
-//    税收违法("company_tax_contravention","302801", "9","company_tax_contravention","ShuiShouWeiFaDet"),
-//    司法拍卖("auction_tracking","302901", "10","company_judicial_sale_combine_list","PaiMaiXiangQing"),
-//    欠税公告("company_own_tax","303001", "11","company_own_tax","QianShuiGongGaoDet"),
-//    询价评估结果("zxr_evaluate_results","304501", "12","","XunJiaPingGuDet"),
-//    破产信息("bankruptcy_open_case","303101", "13","bankruptcy_open_case","PoChanChongZhengDet"),
-//    简易注销("company_brief_cancel_announcement","303201", "14","company_brief_cancel_announcement","JianYiZhuXiao"),
-//    失信被执行人("company_dishonest_info","303301", "15","company_dishonest_info","ShiXinQingKuangDet"),
-//    公示催告("company_public_announcement","303401", "16","","GongShiCuiGaoDet"),
-//    被执行人("company_zxr","303501", "17","company_zxr_list","BeiZhiXingRenDet"),
-//    终本案件("company_zxr_final_case","303601", "18","company_zxr_final_case","ZhongBenAnJianDet"),
-//    限制高消费("company_zxr_restrict","303701", "19","company_zxr_restrict","JYXianZhiGaoXiaoFeiDet"),
-//    限制出境("restrictions_on_exit","303801", "20","","XianZhiChuJingDet"),
-//    股权出质("company_equity_info","303901", "21","company_equity_info","GuQuanChuZhiDet"),
-//    股权质押("company_equity_pledge_holder","304001", "22","","GuQuanZhiYaDet"),
-//    股权冻结("company_judicial_assistance","304101", "23","","GuQuanDongJieDet"),
-//    土地抵押("company_land_mortgage","304201", "24","company_land_mortgage","TuDiDiYaDet"),
-//    动产抵押("company_mortgage_info","304301", "25","company_mortgage_info","DongChanDiYaDet"),
-//    裁判文书("company_lawsuit","304401", "26","wenshu_detail_combine","JYWenShuDet"),
-//
-//    抽查检查("company_check_info","201101", "27","","ChouChaJianChaDet"),
-//    双随机抽查("company_double_random_check_info","201201", "28","","ShuangSuiJiChouChaDet"),
-//    融资信息("company_finance","201301", "29","","RongZhiXinXi"),
-//    行政许可("company_license","201401", "30","","XingZhenXuKeDet"),
-//    行政许可_信用中国("company_license_creditchina","201401", "30","","XingZhenXuKeDet"),
-//    购地信息("company_land_announcement","201501", "31","","GouDiXinXiDet"),
-//    地块公示("company_land_publicity","201601", "32","","TuDiXinXiDet"),
-//    土地转让("company_land_transfer","201701", "33","company_land_transfer","TuDiZhuanRangDet"),
-//    知识产权("intellectual","201801", "34","",""),
-////    公司名称("intellectual","101001"),
-//    股东变更("company_holder","101101","42","company_holder","GuDongBianGengDet")
-//    ;
-//    private String tn;
-//    private String code;
-//    private String infoType;
-//    private String opportunity;
-//    private String routing;
-//
-//    DynamicEnum(String tn,String code,  String infoType, String opportunity, String routing) {
-//        this.code = code;
-//        this.tn = tn;
-//        this.infoType = infoType;
-//        this.opportunity = opportunity;
-//        this.routing = routing;
-//    }
-//
-//    public static DynamicEnum getEnum(String code) {
-//        for (DynamicEnum en : DynamicEnum.values()) {
-//            if (Objects.equals(en.getCode(), code)) {
-//                return en;
-//            }
-//        }
-//        return null;
-//    }
-//
-//    public static String getDescByTn(String tn) {
-//        for (DynamicEnum en : DynamicEnum.values()) {
-//            if (Objects.equals(en.getTn(), tn)) {
-//                return en.name();
-//            }
-//        }
-//        return null;
-//    }
-//
-//    public static String getOpportunityByTn(String tn) {
-//        for (DynamicEnum en : DynamicEnum.values()) {
-//            if (Objects.equals(en.getTn(), tn)) {
-//                return en.getOpportunity();
-//            }
-//        }
-//        return null;
-//    }
-//
-//    public static String getInfoTypeByTn(String tn) {
-//        for (DynamicEnum en : DynamicEnum.values()) {
-//            if (Objects.equals(en.getTn(), tn)) {
-//                return en.getInfoType();
-//            }
-//        }
-//        return null;
-//    }
-//
-//    public static String getRoutingByTn(String tn) {
-//        for (DynamicEnum en : DynamicEnum.values()) {
-//            if (Objects.equals(en.getTn(), tn)) {
-//                return en.getRouting();
-//            }
-//        }
-//        return null;
-//    }
-//
-//    public String getCode() {
-//        return code;
-//    }
-//
-//    public String getTn() {
-//        return tn;
-//    }
-//
-//    public String getInfoType() {
-//        return infoType;
-//    }
-//
-//    public String getOpportunity() {
-//        return opportunity;
-//    }
-//
-//    public String getRouting() {
-//        return routing;
-//    }
-//}

+ 0 - 72
src/main/java/com/winhc/repal/enums/FinanceDimensionEnum.java

@@ -1,72 +0,0 @@
-//package com.winhc.repal.enums;
-//
-///**
-// * @description: 财产线索维度枚举
-// * @author: Anakin
-// * @date 2020.12.17 17:07
-// */
-//public enum FinanceDimensionEnum {
-//    破产公告("1","BANKRUPTCY_OPEN_CASE","破产公告", "PoChanChongZhengDet"),
-//    工商信息("2","INCREASE_REGISTERED_CAPITAL_INFO","工商信息", "GongShangXinXiCaiChan"),
-//    招投标("3","COMPANY_BID_LIST","招投标", "ZhaoTouBiaoDet"),
-//    软件著作权("4","COMPANY_COPYRIGHT_REG_LIST","软件著作权","RuanJianZhuZuoQuanDet"),
-//    作品著作权("5","COMPANY_COPYRIGHT_WORKS_LIST","作品著作权", "ZuoPinZhuZuoQuanDet"),
-//    开庭公告("6","COMPANY_COURT_OPEN_ANNOUNCEMENT_LIST","开庭公告", "KaiTingGongGaoDet"),
-//    企业失信被执("7","COMPANY_DISHONEST_INFO","企业失信被执", "ShiXinQingKuangDet"),
-//    股权出质("8","COMPANY_EQUITY_INFO_LIST","股权出质", "GuQuanChuZhiDet"),
-//    融资历史("9","COMPANY_FINANCE","融资历史", "RongZhiXinXi"),
-//    股东("10","COMPANY_HOLDER","股东", "GuDongCaiChan"),
-//    购地信息("11","COMPANY_LAND_ANNOUNCEMENT","购地信息", "GouDiXinXiDet"),
-//    土地抵押("12","COMPANY_LAND_MORTGAGE","土地抵押", "TuDiDiYaDet"),
-//    动产抵押("13","COMPANY_MORTGAGE_INFO","动产抵押", "DongChanDiYaDet"),
-//    专利("14","COMPANY_PATENT_LIST","专利", "ZhuanLiDet"),
-//    商标("15","COMPANY_TM","商标", "ShangBiaoDet"),
-//    企业被执行人("16","COMPANY_ZXR_LIST","企业被执行人", "BeiZhiXingRen"),
-//    限制消费令("17","COMPANY_ZXR_RESTRICT","限制消费令", "JYXianZhiGaoXiaoFeiDet"),
-//    裁判文书("18","WENSHU_DETAIL","裁判文书", "JYNewCaselibDet"),
-//    司法拍卖("19","AUCTION_TRACKING_LIST","司法拍卖", "PaiMaiXiangQing"),
-//    询价评估机构("20","ZXR_EVALUATE","询价评估(机构)","XunJiaPingGuJiGouCaiChan"),
-//    询价评估结果("21","ZXR_EVALUATE_RESULTS","询价评估", "XunJiaPingGuDet");
-//    private String code;
-//    private String tableName;
-//    private String desc;
-//    private String routing;
-//
-//    FinanceDimensionEnum(String code, String tableName, String desc) {
-//        this.code = code;
-//        this.tableName = tableName;
-//        this.desc = desc;
-//    }
-//
-//    FinanceDimensionEnum(String code, String tableName, String desc, String routing) {
-//        this.code = code;
-//        this.tableName = tableName;
-//        this.desc = desc;
-//        this.routing = routing;
-//    }
-//
-//    public String getCode() {
-//        return code;
-//    }
-//
-//    public String getDesc() {
-//        return desc;
-//    }
-//
-//    public String getTableName() {
-//        return tableName;
-//    }
-//
-//    public String getRouting() {
-//        return routing;
-//    }
-//
-//    public static FinanceDimensionEnum getByCode(String code) {
-//        for (FinanceDimensionEnum e : FinanceDimensionEnum.values()) {
-//            if (e.getCode().equals(code)) {
-//                return e;
-//            }
-//        }
-//        return null;
-//    }
-//}

+ 0 - 45
src/main/java/com/winhc/repal/enums/FinanceDynamicTypeEnum.java

@@ -1,45 +0,0 @@
-//package com.winhc.repal.enums;
-//
-///**
-// * @author Aaron
-// * @date 2020/12/19 9:47
-// * @description
-// */
-//public enum FinanceDynamicTypeEnum {
-//    /**
-//     * 财产动态类型
-//     */
-//    新增破产公告("1","新增破产公告"),注册资本上升("2","注册资本上升"),新增招标信息("3","新增招标信息"),
-//    软件著作权("4","新增软件著作权"),作品著作权("5","新增作品著作权"),有恢复执行案件即将开庭("6","有恢复执行案件即将开庭"),
-//    失信信息移除("7","失信信息移除"),出质了持有股权("8","出质了持有股权"),有新的融资("9","有新的融资"),
-//    新增了股东("10","新增了股东"),股东退出("11","股东退出"),购买了新的土地("12","购买了新的土地"),
-//    抵押了公司土地("13","抵押了公司土地"),资产被抵押("14","资产被抵押"),新增专利信息("15","新增专利信息"),
-//    新增商标信息("16","新增商标信息"),被执行人信息移除("17","被执行人信息移除"),限制高消费移除("18","限制高消费移除"),
-//    有恢复执行案件("19","有恢复执行案件"),新增胜诉案件("20","新增胜诉案件"),接受了他人土地抵押("21","接受了他人土地抵押"),
-//    有资产即将被司法拍卖("22","有资产即将被司法拍卖");
-//
-//    private String code;
-//    private String desc;
-//
-//    FinanceDynamicTypeEnum(String code, String desc) {
-//        this.code = code;
-//        this.desc = desc;
-//    }
-//
-//    public String getCode() {
-//        return code;
-//    }
-//
-//    public String getDesc() {
-//        return desc;
-//    }
-//
-//    public static String getDescByCode(String code) {
-//        for (FinanceDynamicTypeEnum e : FinanceDynamicTypeEnum.values()) {
-//            if (e.getCode().equals(code)) {
-//                return e.getDesc();
-//            }
-//        }
-//        return null;
-//    }
-//}

+ 14 - 0
src/main/java/com/winhc/repal/enums/MsgKindEnum.java

@@ -0,0 +1,14 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: MsgKindEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:38
+ */
+public enum MsgKindEnum {
+
+    /**
+     * 消息类型
+     */
+    app, weixin, sms, mail, delay
+}

+ 27 - 0
src/main/java/com/winhc/repal/enums/MsgNameEnum.java

@@ -0,0 +1,27 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: MsgNameEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:34
+ */
+public enum MsgNameEnum {
+
+    /**
+     * 模板名称
+     */
+    逾期APP提醒(""),
+    逾期短信提醒(""),
+    评级变动APP提醒(""),
+    评级变动短信提醒(""),
+    财产线索APP提醒(""),
+    财产线索短信提醒(""),
+    风险提醒APP提醒(""),
+    风险提醒短信提醒(""),
+    评级无变动APP提醒("");
+    public String code;
+
+    MsgNameEnum(String code) {
+        this.code = code;
+    }
+}

+ 29 - 0
src/main/java/com/winhc/repal/enums/OverdueEnum.java

@@ -0,0 +1,29 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: 逾期枚举
+ * @Author: xda
+ * @Date: 2022/4/14 16:32
+ */
+public enum OverdueEnum {
+
+    /**
+     * 逾期枚举
+     */
+    即将逾期("OVERDUE_WEEK"),
+    已逾期("OVERDUED"),
+    已逾期三个月("OVERDUE_THREEMONTH"),
+    已逾期半年("OVERDUE_HALFYEAR"),
+    已逾期一年("OVERDUE_YEAR"),
+    已逾期三年("OVERDUE_THREEYEAR"),
+    其他("OTHER");
+    private final String code;
+
+    OverdueEnum(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

+ 0 - 140
src/main/java/com/winhc/repal/enums/RadarInfoTypeEnum.java

@@ -1,140 +0,0 @@
-//package com.winhc.repal.enums;
-//
-///**
-// * @description: 雷达监控信息类型
-// * @author: yujie
-// * @date 2020.8.24 19:12
-// */
-//public enum RadarInfoTypeEnum {
-//    破产公告("bankruptcy_open_case","破产公告", "PoChanGongGao"),
-//    工商信息("company","工商信息", "GongShangXinXi"),
-//    经营异常("company_abnormal_info","经营异常", "JingYingYiChang"),
-//    年报_对外担保("company_annual_report_out_guarantee","对外担保", "DuiWaiDanBao"),
-//    年报_对外投资("company_annual_report_out_investment","对外投资", "DuiWaiTouZi"),
-//    招投标("company_bid","招投标", "ZhaoTouBiao"),
-//    简易注销_结果("company_brief_cancel_announcement","简易注销", "JianYiZhuXiao"),
-//    抽查检查("company_check_info","抽查检查", "ChouChaJianCha"),
-//    法院公告("company_court_announcement_list","法院公告", "FaYuanGongGao"),
-//    开庭公告("company_court_open_announcement_list","开庭公告", "KaiTingGongGao"),
-//    立案信息("company_court_register_list","立案信息", "LiAnXinXi"),
-//    企业失信被执("company_dishonest_info","企业失信被执", "QiYeShiXinBeiZhi"),
-//    双随机抽查("company_double_random_check_info","双随机抽查", "ShuangSuiJiChouCha"),
-//    招聘信息("company_employment","招聘信息", "ZhaoPinXinXi"),
-//    环保处罚("company_env_punishment","环保处罚", "HuanBaoChuFa"),
-//    股权出质("company_equity_info","股权出质", "GuQuanChuZhi"),
-//    融资历史("company_finance","融资历史", "RongZiLiShi"),
-//    股东("company_holder","股东", "GuDong"),
-//    严重违法("company_illegal_info","严重违法", "YanZhongWeiFa"),
-//    司法拍卖("company_judicial_sale_combine_list","司法拍卖", "SiFaPaiMai"),
-//    购地信息("company_land_announcement","购地信息", "GouDiXinXi"),
-//    土地抵押("company_land_mortgage","土地抵押", "TuDiDiYa"),
-//    地块公示("company_land_publicity","地块公示", "DiKuaiGongShi"),
-//    土地转让("company_land_transfer","土地转让", "TuDiZhuanRang"),
-//    行政许可("company_license","行政许可", "XingZhengXuKe"),
-//    行政许可_信用中国("company_license_creditchina","行政许可(信用中国)", "XingZhengXuKeXinYongZhongGuo"),
-//    行政许可_企业公示("company_license_entpub","行政许可(企业公示)", "XingZhengXuKeQiYeGongShi"),
-//    清算信息("company_liquidating_info","清算信息", "QingSuanXinXi"),
-//    动产抵押("company_mortgage_info","动产抵押", "DongChanDiYa"),
-//    欠税公告("company_own_tax","欠税公告", "QianShuiGongGao"),
-//    公示催告("company_public_announcement2_list","公示催告", "GongShiCuiGao"),
-//    行政处罚("company_punishment_info","行政处罚", "XingZhengChuFa"),
-//    行政处罚_信用中国("company_punishment_info_creditchina","行政处罚(信用中国)", "XingZhengChuFaXinYongZhongGuo"),
-//    送达公告("company_send_announcement_list","送达公告", "SongDaGongGao"),
-//    主要成员("company_staff","主要成员", "ZhuYaoRenYuan"),
-//    企业公告("company_stock_announcement","企业公告", "QiYeGongGao"),
-//    税收违法("company_tax_contravention","税收违法", "ShuiShouWeiFa"),
-//    终本案件("company_zxr_final_case","终本案件", "ZhongBenAnJian"),
-//    限制消费令("company_zxr_restrict","限制消费令", "XianZhiXiaoFeiLing"),
-//    裁判文书("wenshu_detail_combine","裁判文书", "CaiPanWenShu"),
-//    知识产权("intellectual","知识产权", "ZhiShiChanQuan"),
-//    企业被执("company_zxr_list","企业被执","BeiZhiXingRen");
-//    private String code;
-//    private String desc;
-//    private String url;
-//
-//    RadarInfoTypeEnum(String code, String desc, String url) {
-//        this.code = code;
-//        this.desc = desc;
-//        this.url = url;
-//    }
-//
-//    public String getCode() {
-//        return code;
-//    }
-//
-//    public String getDesc() {
-//        return desc;
-//    }
-//
-//    public String getUrl() {
-//        return url;
-//    }
-//
-//    public static String getDescByCode(String code) {
-//        for (RadarInfoTypeEnum e : RadarInfoTypeEnum.values()) {
-//            if (e.getCode().equals(code)) {
-//                return e.name();
-//            }
-//        }
-//        return null;
-//    }
-//    public static RadarInfoTypeEnum getByCode(String code) {
-//        for (RadarInfoTypeEnum e : RadarInfoTypeEnum.values()) {
-//            if (e.getCode().equals(code)) {
-//                return e;
-//            }
-//        }
-//        return null;
-//    }
-//
-//    public static String getUrlByCode(String code) {
-//        for (RadarInfoTypeEnum e : RadarInfoTypeEnum.values()) {
-//            if (e.getCode().equals(code)) {
-//                return e.getUrl();
-//            }
-//        }
-//        return null;
-//    }
-//}
-///**
-// * bankruptcy_open_case破产公告
-// * company工商信息
-// * company_abnormal_info经营异常
-// * company_annual_report_out_guarantee年报_对外担保
-// * company_annual_report_out_investment年报_对外投资
-// * company_bid招投标
-// * company_brief_cancel_announcement_result简易注销_结果
-// * company_check_info抽查检查
-// * company_court_announcement_list法院公告
-// * company_court_open_announcement_list开庭公告
-// * company_court_register_list立案信息
-// * company_dishonest_info企业失信被执
-// * company_double_random_check_info双随机抽查
-// * company_employment招聘信息
-// * company_env_punishment环保处罚
-// * company_equity_info股权出质
-// * company_finance融资历史
-// * company_holder股东
-// * company_illegal_info严重违法
-// * company_judicial_sale_combine_list司法拍卖
-// * company_land_announcement购地信息
-// * company_land_mortgage土地抵押
-// * company_land_publicity地块公示
-// * company_land_transfer土地转让
-// * company_license行政许可
-// * company_license_creditchina行政许可_信用中国
-// * company_license_entpub行政许可_企业公示
-// * company_liquidating_info清算信息
-// * company_mortgage_info动产抵押
-// * company_own_tax欠税公告
-// * company_public_announcement2_list公示催告
-// * company_punishment_info行政处罚
-// * company_punishment_info_creditchina行政处罚_信用中国
-// * company_send_announcement_list送达公告
-// * company_staff主要成员
-// * company_stock_announcement企业公告
-// * company_tax_contravention税收违法
-// * company_zxr_final_case终本案件
-// * company_zxr_restrict限制消费令
-// * wenshu_detail_combine裁判文书
-// */

+ 24 - 0
src/main/java/com/winhc/repal/enums/ReadStatusEnum.java

@@ -0,0 +1,24 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: ReadStatusEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:31
+ */
+public enum ReadStatusEnum {
+
+    /**
+     * 读状态
+     */
+    未读(0),
+    已读(1);
+    private final Integer code;
+
+    ReadStatusEnum(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

+ 34 - 0
src/main/java/com/winhc/repal/enums/RefreshStatusEnum.java

@@ -0,0 +1,34 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: RefreshStatusEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:41
+ */
+public enum RefreshStatusEnum {
+
+    /**
+     *  刷新状态
+     */
+    REFRESH_WAIT(1, "未刷新"),
+    REFRESH_ING(2, "刷新中"),
+    REFRESH_SUCCESS(3, "已刷新"),
+    REFRESH_FAIL(0, "刷新失败");
+
+    private final Integer code;
+
+    private final String msg;
+
+    RefreshStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+}

+ 14 - 0
src/main/java/com/winhc/repal/enums/RemindEnum.java

@@ -0,0 +1,14 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: RemindEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:33
+ */
+public enum RemindEnum {
+
+    /**
+     * 智能提醒类型
+     */
+    逾期提醒,账款评级,财产线索,风险预警;
+}

+ 25 - 0
src/main/java/com/winhc/repal/enums/RemindSettingEnum.java

@@ -0,0 +1,25 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: RemindSettingEnum
+ * @Author: xda
+ * @Date: 2022/4/14 16:38
+ */
+public enum RemindSettingEnum {
+
+    /**
+     *  提醒设置类型
+     */
+    不需要提醒(0),
+    需要提醒(1);
+
+    private final Integer code;
+
+    RemindSettingEnum(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

+ 43 - 0
src/main/java/com/winhc/repal/enums/RepalBillStageEnum.java

@@ -0,0 +1,43 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: 账款阶段
+ * @Author: xda
+ * @Date: 2022/4/14 16:30
+ */
+public enum RepalBillStageEnum {
+
+    /**
+     *  账款阶段,1未起诉,2已起诉,3已申请执行,4终结本次执行
+     */
+    NON_PROSECUTE(1, "未起诉"),
+    PROSECUTE_ING(2, "已起诉"),
+    APPLY_EXECUTE(3, "已申请执行"),
+    FINAL_EXECUTE(4, "终结本次执行");
+
+    private final Integer code;
+
+    private final String msg;
+
+    RepalBillStageEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public static String getMsgByCode(Integer code) {
+        for (RepalBillStageEnum e : RepalBillStageEnum.values()) {
+            if (e.getCode().equals(code)) {
+                return e.getMsg();
+            }
+        }
+        return null;
+    }
+}

+ 42 - 0
src/main/java/com/winhc/repal/enums/RepalBillStatusEnum.java

@@ -0,0 +1,42 @@
+package com.winhc.repal.enums;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 账款状态
+ * @Author: xda
+ * @Date: 2022/4/14 16:40
+ */
+public enum RepalBillStatusEnum {
+
+    /**
+     *  账款状态
+     */
+    PROGRESSING(1, "进行中"),
+    OVERDUE(2, "已逾期"),
+    SUCCESS(3, "已收回"),
+    END(4, "已终止");
+
+    private final Integer code;
+
+    private final String msg;
+
+    RepalBillStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public static List<Integer> getBillStatusList() {
+        return Arrays.stream(RepalBillStatusEnum.values()).map(RepalBillStatusEnum::getCode).collect(Collectors.toList());
+    }
+}

+ 33 - 0
src/main/java/com/winhc/repal/enums/RepalBillTypeEnum.java

@@ -0,0 +1,33 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: RepalBillTypeEnum
+ * @Author: xda
+ * @Date: 2022/4/14 17:03
+ */
+public enum RepalBillTypeEnum {
+
+    /**
+     *  账款类型
+     */
+    RECEIVABLE(1, "应收"),
+    RECEIPT(2, "应付");
+
+    private final Integer code;
+
+    private final String desc;
+
+    RepalBillTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+}

+ 0 - 50
src/main/java/com/winhc/repal/enums/ValueAddedServiceEnum.java

@@ -1,50 +0,0 @@
-//package com.winhc.repal.enums;
-//
-///**
-// * @Description: ValueAddedServiceEnum
-// * @Author: xda
-// * @Date: 2020/12/23  17:35
-// */
-//public enum ValueAddedServiceEnum {
-//
-//    /**
-//     *  增值服务
-//     */
-////    anjianzhenduan("案件诊断", "智能评估案件胜诉概率及债务人履职能力"),
-//    susongtouzi("诉讼投资", "零成本启动诉讼,商事案件首选"),
-//    jinzhidiaocha("尽职调查", "全面结构化深度调查企业情况"),
-//    zhaocaichan("找财产", "快速查找企业财产线索"),
-//    chafengxian("查风险", "查企业风险信息,提前做好预防"),
-//    qiyefayan("企业法眼", "快速查看企业司法信息,便捷、高效"),
-////    chashixinren("查失信限高", "快速识别身边\"老赖\""),
-//    chabeizhixingren("查失信限高", "包括失信、被执、限高、终本等多维度信息"),
-//    chasifaanjian("查司法案件", "司法裁判数据支持,快速查找司法案件"),
-//    soulvshi("找律师", "精准匹配适合您案件的律师"),
-//    hetongmuban("合同模板", "多种合同模板随时下载"),
-//    cuikuanhan("催款函", "一键下载催款函模板"),
-//    leianjiansuo("类案检索", "大数据精准检索同类案件"),
-//    zhaozhaiquan("找债权", "查找债权关系,了解企业债务情况"),
-//    lvshihanfuwu("律师函服务", "专业律师撰写律师函,让发送对象了解法律后果"),
-//    zixunlvshi("咨询律师", "可找律师咨询汇款策略,提高汇款概率")
-//    ;
-//
-//
-//
-//
-//    private String title;
-//
-//    private String desc;
-//
-//    ValueAddedServiceEnum(String title, String desc) {
-//        this.title = title;
-//        this.desc = desc;
-//    }
-//
-//    public String getTitle() {
-//        return title;
-//    }
-//
-//    public String getDesc() {
-//        return desc;
-//    }
-//}

+ 11 - 7
src/main/java/com/winhc/repal/model/vo/RepalBillDetailVO.java

@@ -1,5 +1,6 @@
 package com.winhc.repal.model.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,14 +22,17 @@ import java.util.List;
 @ApiModel("账款详情")
 public class RepalBillDetailVO {
 
+    @ApiModelProperty(value = "所属组织id")
+    private Long repalGroupId;
+
     @ApiModelProperty(value = "账款id")
     private Long repalBillId;
 
     @ApiModelProperty(value = "账本id")
     private Long repalBookId;
 
-    @ApiModelProperty(value = "客户名称")
-    private String custName;
+    @ApiModelProperty(value = "客户name")
+    private String customerName;
 
     @ApiModelProperty(value = "公司companyId")
     private String companyId;
@@ -50,15 +54,15 @@ public class RepalBillDetailVO {
     private String totalMoneyStr;
 
     @ApiModelProperty(value = "待收金额/待付金额")
-    private String receivableMoneyStr;
+    private String receivableStr;
 
     @ApiModelProperty(value = "账款已收金额")
     private String receiptStr;
 
-    @ApiModelProperty(value = "分数趋势,1上升,2下降。0持平(新增)")
+    @ApiModelProperty(value = "分数趋势,1上升,2下降。0持平")
     private Integer diagnosisScoreTrend;
 
-    @ApiModelProperty(value = "本次评估等级描述(新增)")
+    @ApiModelProperty(value = "本次评估等级描述")
     private String diagnosisGradeDesc;
 
     @ApiModelProperty(value = "本次评估分数")
@@ -102,7 +106,7 @@ public class RepalBillDetailVO {
     @Getter
     @Setter
     @ToString
-    private static class BillMoneyChange {
+    public static class BillMoneyChange {
 
         @ApiModelProperty("金额变动文案")
         private String changeDesc;
@@ -116,7 +120,7 @@ public class RepalBillDetailVO {
     @Getter
     @Setter
     @ToString
-    private static class BillContract {
+    public static class BillContract {
 
         @ApiModelProperty("文件url")
         private String contractUrl;

+ 56 - 0
src/main/java/com/winhc/repal/model/vo/RepalBookHomeVO.java

@@ -0,0 +1,56 @@
+package com.winhc.repal.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @Description: RepalBookDetailVO
+ * @Author: xda
+ * @Date: 2022/4/14 17:39
+ */
+@Data
+@ApiModel("账本详情")
+public class RepalBookHomeVO {
+
+    @ApiModelProperty("应收金额信息")
+    private BillMoney receivable;
+
+    @ApiModelProperty("应付金额信息")
+    private BillMoney payment;
+
+
+
+
+
+
+
+
+    @Getter
+    @Setter
+    @ToString
+    @ApiModel("应收/应付")
+    public static class BillMoney {
+
+        @ApiModelProperty("总应收/总应付string")
+        private String totalReceivableStr;
+
+        @ApiModelProperty("总逾期str")
+        private String totalOverdueStr;
+
+        @ApiModelProperty("总额")
+        private String totalMoneyStr;
+
+        @ApiModelProperty("总应收/总应付笔数")
+        private Integer totalReceivableCount;
+
+        @ApiModelProperty("总逾期笔数")
+        private Integer totalOverdueCount;
+
+    }
+}

+ 19 - 0
src/main/java/com/winhc/repal/model/vo/ResultItemVO.java

@@ -0,0 +1,19 @@
+package com.winhc.repal.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Description: ResultItemVO
+ * @Author: xda
+ * @Date: 2021/8/6 13:39
+ */
+@Data
+public class ResultItemVO {
+
+    private String value;
+
+    private String desc;
+
+    private String key;
+
+}

+ 13 - 0
src/main/java/com/winhc/repal/repository/RepalBillDiagnosisMapper.java

@@ -0,0 +1,13 @@
+package com.winhc.repal.repository;
+
+import com.winhc.repal.entity.RepalBillDiagnosis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @description RepalBillDiagnosis Mapper 接口
+ * @author Generator
+ * @date 2022-04-14
+ */
+public interface RepalBillDiagnosisMapper extends BaseMapper<RepalBillDiagnosis> {
+
+}

+ 14 - 0
src/main/java/com/winhc/repal/service/RepalBillDiagnosisService.java

@@ -0,0 +1,14 @@
+package com.winhc.repal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.winhc.repal.entity.RepalBillDiagnosis;
+
+
+/**
+ * @description RepalBillDiagnosis 接口类
+ * @author Generator
+ * @date 2022-04-14
+ */
+public interface RepalBillDiagnosisService extends IService<RepalBillDiagnosis> {
+
+}

+ 8 - 0
src/main/java/com/winhc/repal/service/RepalBookService.java

@@ -2,6 +2,7 @@ package com.winhc.repal.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.winhc.repal.entity.RepalBook;
+import com.winhc.repal.model.vo.RepalBookHomeVO;
 
 
 /**
@@ -12,5 +13,12 @@ import com.winhc.repal.entity.RepalBook;
 public interface RepalBookService extends IService<RepalBook> {
 
 
+    /**
+     *
+     * @return com.winhc.repal.model.vo.RepalBookHomeVO
+     * @author xda
+     * @date 2022/4/14 18:26
+     */
+    RepalBookHomeVO getRepalBookHome();
 
 }

+ 16 - 0
src/main/java/com/winhc/repal/service/RepalGroupMemberService.java

@@ -0,0 +1,16 @@
+package com.winhc.repal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.winhc.repal.entity.RepalGroupMember;
+
+
+/**
+ * @description RepalGroupMember 接口类
+ * @author Generator
+ * @date 2022-04-08
+ */
+public interface RepalGroupMemberService extends IService<RepalGroupMember> {
+
+
+
+}

+ 16 - 0
src/main/java/com/winhc/repal/service/RepalGroupRoleService.java

@@ -0,0 +1,16 @@
+package com.winhc.repal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.winhc.repal.entity.RepalGroupRole;
+
+
+/**
+ * @description RepalGroupRoleMember 接口类
+ * @author Generator
+ * @date 2022-04-08
+ */
+public interface RepalGroupRoleService extends IService<RepalGroupRole> {
+
+
+
+}

+ 9 - 0
src/main/java/com/winhc/repal/service/RepalResponsiblePersonService.java

@@ -24,4 +24,13 @@ public interface RepalResponsiblePersonService extends IService<RepalResponsible
      */
     Map<Long, List<String>> getResponsiblePersonNameList(List<Long> billIdList);
 
+    /**
+     * 获取账款对应负责人
+     * @param billId billId
+     * @return java.util.List<java.lang.String>
+     * @author xda
+     * @date 2022/4/14 11:31
+     */
+    List<String> getResponsiblePersonName(Long billId);
+
 }

+ 16 - 0
src/main/java/com/winhc/repal/service/RepalRolePermissionService.java

@@ -0,0 +1,16 @@
+package com.winhc.repal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.winhc.repal.entity.RepalRolePermission;
+
+
+/**
+ * @description RepalRolePermission 接口类
+ * @author Generator
+ * @date 2022-04-08
+ */
+public interface RepalRolePermissionService extends IService<RepalRolePermission> {
+
+
+
+}

+ 17 - 0
src/main/java/com/winhc/repal/service/impl/RepalBillDiagnosisServiceImpl.java

@@ -0,0 +1,17 @@
+package com.winhc.repal.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.repal.entity.RepalBillDiagnosis;
+import com.winhc.repal.repository.RepalBillDiagnosisMapper;
+import com.winhc.repal.service.RepalBillDiagnosisService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description RepalBillDiagnosis 接口实现类
+ * @author Generator
+ * @date 2022-04-14
+ */
+@Service
+public class RepalBillDiagnosisServiceImpl extends ServiceImpl<RepalBillDiagnosisMapper, RepalBillDiagnosis> implements RepalBillDiagnosisService {
+
+}

+ 112 - 5
src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -2,27 +2,42 @@ package com.winhc.repal.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.common.base.ApiDataResult;
 import com.winhc.common.enums.CodeMsg;
 import com.winhc.common.exception.CommonException;
 import com.winhc.common.model.base.VOPage;
+import com.winhc.repal.cloud.DataMiddlewareService;
+import com.winhc.repal.cloud.InCaseService;
+import com.winhc.repal.cloud.dto.GetCompanyRiskNumDTO;
+import com.winhc.repal.cloud.dto.GetFinanceDynamicNumDTO;
+import com.winhc.repal.cloud.vo.CompanyRiskNumVO;
+import com.winhc.repal.cloud.vo.DiagnosisRecordVO;
+import com.winhc.repal.cloud.vo.FinanceDynamicNumVO;
 import com.winhc.repal.entity.RepalBill;
+import com.winhc.repal.entity.RepalBillDiagnosis;
+import com.winhc.repal.entity.RepalChangeRecord;
+import com.winhc.repal.entity.RepalCustomer;
+import com.winhc.repal.enums.DeletedStatusEnum;
+import com.winhc.repal.enums.RepalBillStatusEnum;
+import com.winhc.repal.enums.RepalBillTypeEnum;
 import com.winhc.repal.model.dto.GetRepalBillPageDTO;
 import com.winhc.repal.model.vo.RepalBillDetailVO;
 import com.winhc.repal.model.vo.RepalBillPageVO;
 import com.winhc.repal.repository.RepalBillMapper;
-import com.winhc.repal.service.RepalBillService;
-import com.winhc.repal.service.RepalResponsiblePersonService;
+import com.winhc.repal.service.*;
+import com.winhc.repal.util.DiagnosisUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -42,6 +57,25 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
     @Autowired
     private RepalResponsiblePersonService repalResponsiblePersonService;
 
+    @Autowired
+    private RepalGroupMemberService repalGroupMemberService;
+
+    @Autowired
+    private RepalCustomerService repalCustomerService;
+
+    @Autowired
+    private DataMiddlewareService dataMiddlewareService;
+
+    @Autowired
+    private InCaseService inCaseService;
+
+    @Autowired
+    private RepalBillDiagnosisService repalBillDiagnosisService;
+
+    @Autowired
+    private RepalChangeRecordService repalChangeRecordService;
+
+
     @Override
     public VOPage<RepalBillPageVO> getRepalBillPage(GetRepalBillPageDTO dto) {
         if (ObjectUtil.hasEmpty(dto.getRepalGroupId(), dto.getRepalBookId())) {
@@ -74,7 +108,80 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
 
     @Override
     public RepalBillDetailVO getRepalBillDetail(Long repalBillId) {
+        RepalBill repalBill = this.getById(repalBillId);
+        if (Objects.isNull(repalBill)) {
+            return null;
+        }
         RepalBillDetailVO vo = new RepalBillDetailVO();
+        BeanUtils.copyProperties(repalBill, vo);
+        vo.setRepalBillId(repalBill.getId());
+        RepalCustomer repalCustomer = repalCustomerService.getById(repalBill.getCustomerId());
+        vo.setCompanyId(repalCustomer.getCompanyId());
+        vo.setCustProperty(repalCustomer.getCustProperty());
+        List<String> nameList = repalResponsiblePersonService.getResponsiblePersonName(vo.getRepalBillId());
+        vo.setResponsiblePersonNames(CollUtil.isEmpty(nameList) ? "" : String.join("、", nameList));
+        vo.setTotalMoneyStr(repalBill.getTotalMoney().stripTrailingZeros().toPlainString());
+        vo.setReceiptStr(repalBill.getReceipt().stripTrailingZeros().toPlainString());
+        vo.setReceivableStr(repalBill.getReceivable().stripTrailingZeros().toPlainString());
+        // 评分趋势
+        vo.setDiagnosisScoreTrend(DiagnosisUtil.getDiagnosisScoreTrend(repalBill.getPreDiagnosisScore(), repalBill.getDiagnosisScore(), repalBill.getPreDiagnosisGrade(), repalBill.getDiagnosisGrade()));
+        if (Objects.nonNull(repalBill.getDiagnosisScore())) {
+            vo.setDiagnosisGradeDesc(DiagnosisUtil.getGradeConclusion(repalBill.getDiagnosisScore()));
+            vo.setDiagnosisScore(repalBill.getDiagnosisScore().stripTrailingZeros().toPlainString());
+        }
+
+        // companyId
+        if (StrUtil.isNotBlank(vo.getCompanyId())) {
+            // 财产数量
+            ApiDataResult<List<FinanceDynamicNumVO>> financeResult = dataMiddlewareService.getFinanceDynamicNumV8List(new GetFinanceDynamicNumDTO().setCompanyIdList(Collections.singletonList(vo.getCompanyId())));
+            if (Objects.nonNull(financeResult) && CollUtil.isNotEmpty(financeResult.getData())) {
+                vo.setAssetsNum(financeResult.getData().get(0).getFinanceDynamicNum());
+            }
+            // 风险数量
+            ApiDataResult<List<CompanyRiskNumVO>> riskResult = dataMiddlewareService.getCompanyRiskNumList(new GetCompanyRiskNumDTO(Collections.singletonList(vo.getCompanyId())));
+            if (Objects.nonNull(riskResult) && CollUtil.isNotEmpty(riskResult.getData())) {
+                vo.setAssetsNum(riskResult.getData().get(0).getRiskNum());
+            }
+        }
+        if (Objects.nonNull(repalBill.getDiagnosisId())) {
+            RepalBillDiagnosis repalBillDiagnosis = repalBillDiagnosisService.getById(repalBill.getDiagnosisId());
+            if (Objects.nonNull(repalBillDiagnosis)) {
+                ApiDataResult<DiagnosisRecordVO> apiDataResult = inCaseService.getRecordVO(repalBillDiagnosis.getBizId());
+                if (Objects.nonNull(apiDataResult)) {
+                    vo.setAnalysisList(DiagnosisUtil.convertItemToList(apiDataResult.getData().getResultItem()));
+                }
+            }
+        }
+        // 合同
+        if (StrUtil.isNotBlank(repalBill.getContractUrl())) {
+            List<String> urlList = Arrays.stream(repalBill.getContractUrl().split(";")).collect(Collectors.toList());
+            vo.setContractList(urlList.stream().map(s -> {
+                RepalBillDetailVO.BillContract billContract = new RepalBillDetailVO.BillContract();
+                billContract.setContractUrl(s);
+                billContract.setContractName(s.substring(s.lastIndexOf("/") + 1));
+                return billContract;
+            }).collect(Collectors.toList()));
+        }
+        if (RepalBillStatusEnum.OVERDUE.getCode().equals(repalBill.getRepalBillStatus())) {
+            if (Objects.nonNull(repalBill.getEndDate())) {
+                if (LocalDate.now().isAfter(repalBill.getEndDate()) || LocalDate.now().compareTo(repalBill.getEndDate()) == 0) {
+                    // 避免天数出现负数
+                    vo.setOverdueDay(Math.toIntExact(LocalDate.now().toEpochDay() - repalBill.getEndDate().toEpochDay()) + 1);
+                }
+            }
+        }
+        List<RepalChangeRecord> repalChangeRecordList = repalChangeRecordService.list(Wrappers.lambdaQuery(RepalChangeRecord.class)
+                .eq(RepalChangeRecord::getRepalBillId, vo.getRepalBillId())
+                .eq(RepalChangeRecord::getDeleted, DeletedStatusEnum.NORMAL.getCode()));
+        if (CollUtil.isNotEmpty(repalChangeRecordList)) {
+            vo.setChangeList(repalChangeRecordList.stream().map(t -> {
+                RepalBillDetailVO.BillMoneyChange billMoneyChange = new RepalBillDetailVO.BillMoneyChange();
+                billMoneyChange.setChangeTime(t.getTimeCreated());
+                billMoneyChange.setChangeDesc(t.getOperUserName() + " 增加回款 " + t.getTransMoney().stripTrailingZeros().toPlainString());
+                return billMoneyChange;
+            }).collect(Collectors.toList()));
+        }
         return vo;
     }
+
 }

+ 5 - 0
src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java

@@ -2,6 +2,7 @@ package com.winhc.repal.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.winhc.repal.entity.RepalBook;
+import com.winhc.repal.model.vo.RepalBookHomeVO;
 import com.winhc.repal.repository.RepalBookMapper;
 import com.winhc.repal.service.RepalBookService;
 import org.springframework.stereotype.Service;
@@ -15,4 +16,8 @@ import org.springframework.stereotype.Service;
 public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook> implements RepalBookService {
 
 
+    @Override
+    public RepalBookHomeVO getRepalBookHome() {
+        return null;
+    }
 }

+ 18 - 0
src/main/java/com/winhc/repal/service/impl/RepalGroupMemberServiceImpl.java

@@ -0,0 +1,18 @@
+package com.winhc.repal.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.repal.entity.RepalGroupMember;
+import com.winhc.repal.repository.RepalGroupMemberMapper;
+import com.winhc.repal.service.RepalGroupMemberService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description RepalGroupMember 接口实现类
+ * @author Generator
+ * @date 2022-04-08
+ */
+@Service
+public class RepalGroupMemberServiceImpl extends ServiceImpl<RepalGroupMemberMapper, RepalGroupMember> implements RepalGroupMemberService {
+
+
+}

+ 18 - 0
src/main/java/com/winhc/repal/service/impl/RepalGroupRoleServiceImpl.java

@@ -0,0 +1,18 @@
+package com.winhc.repal.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.repal.entity.RepalGroupRole;
+import com.winhc.repal.repository.RepalGroupRoleMapper;
+import com.winhc.repal.service.RepalGroupRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description RepalGroupRole 接口实现类
+ * @author Generator
+ * @date 2022-04-08
+ */
+@Service
+public class RepalGroupRoleServiceImpl extends ServiceImpl<RepalGroupRoleMapper, RepalGroupRole> implements RepalGroupRoleService {
+
+
+}

+ 11 - 3
src/main/java/com/winhc/repal/service/impl/RepalResponsiblePersonServiceImpl.java

@@ -8,10 +8,9 @@ import com.winhc.repal.repository.RepalResponsiblePersonMapper;
 import com.winhc.repal.service.RepalResponsiblePersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,4 +35,13 @@ public class RepalResponsiblePersonServiceImpl extends ServiceImpl<RepalResponsi
         }
         return nameList.stream().collect(Collectors.groupingBy(ResponsiblePersonNameVO::getRepalBillId, Collectors.mapping(ResponsiblePersonNameVO::getUserName, Collectors.toList())));
     }
+
+    @Override
+    public List<String> getResponsiblePersonName(Long billId) {
+        List<ResponsiblePersonNameVO> nameList = repalResponsiblePersonMapper.getResponsiblePersonNameList(Collections.singletonList(billId));
+        if (CollUtil.isEmpty(nameList)) {
+            return new ArrayList<>();
+        }
+        return nameList.stream().map(ResponsiblePersonNameVO::getUserName).collect(Collectors.toList());
+    }
 }

+ 18 - 0
src/main/java/com/winhc/repal/service/impl/RepalRolePermissionServiceImpl.java

@@ -0,0 +1,18 @@
+package com.winhc.repal.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.repal.entity.RepalRolePermission;
+import com.winhc.repal.repository.RepalRolePermissionMapper;
+import com.winhc.repal.service.RepalRolePermissionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description RepalRolePermission 接口实现类
+ * @author Generator
+ * @date 2022-04-08
+ */
+@Service
+public class RepalRolePermissionServiceImpl extends ServiceImpl<RepalRolePermissionMapper, RepalRolePermission> implements RepalRolePermissionService {
+
+
+}

+ 87 - 0
src/main/java/com/winhc/repal/util/DiagnosisUtil.java

@@ -0,0 +1,87 @@
+package com.winhc.repal.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.winhc.repal.enums.DiagnosisTrendEnum;
+import com.winhc.repal.model.vo.ResultItemVO;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: DiagnosisUtil 评级工具类
+ * @Author: xda
+ * @Date: 2022/4/14 11:46
+ */
+public class DiagnosisUtil {
+
+    /**
+     *  评分趋势
+     * @param preScore
+     * @param nowScore
+     * @param preGrade
+     * @param nowGrade
+     * @return
+     */
+    public static Integer getDiagnosisScoreTrend(BigDecimal preScore, BigDecimal nowScore, String preGrade, String nowGrade) {
+        if (Objects.isNull(preScore) || StrUtil.isBlank(nowGrade)) {
+            return DiagnosisTrendEnum.KEEP.getCode();
+        } else {
+            if (StrUtil.isNotBlank(preGrade)) {
+                if (preScore.compareTo(nowScore) > 0) {
+                    return DiagnosisTrendEnum.DESCENT.getCode();
+                }
+                if (preScore.compareTo(nowScore) < 0) {
+                    return DiagnosisTrendEnum.ASCEND.getCode();
+                }
+            }
+            return DiagnosisTrendEnum.KEEP.getCode();
+        }
+    }
+
+    /**
+     * 分数描述
+     * @param score score
+     * @return java.lang.String
+     * @author xda
+     * @date 2021/8/6 10:04
+     */
+    public static String getGradeConclusion(BigDecimal score) {
+        if (Objects.isNull(score)) {
+            return "";
+        }
+        if (score.compareTo(new BigDecimal("80")) >= 0) {
+            return "低风险";
+        } else if (score.compareTo(new BigDecimal("65")) >= 0) {
+            return "较低风险";
+        } else if (score.compareTo(new BigDecimal("55")) >= 0) {
+            return "中风险";
+        }
+        return "高风险";
+    }
+
+    public static List<String> convertItemToList(String resultItem) {
+        if (StrUtil.isBlank(resultItem)) {
+            return new ArrayList<>();
+        }
+        List<ResultItemVO> itemList = JSON.parseArray(resultItem, ResultItemVO.class);
+        if (CollUtil.isEmpty(itemList) || itemList.size() != 4) {
+            return new ArrayList<>();
+        }
+        List<String> resultList = new ArrayList<>();
+        Map<String, String> map = itemList.stream().collect(Collectors.toMap(ResultItemVO::getKey, ResultItemVO::getValue));
+        resultList.add(map.get("资信情况"));
+        resultList.add(map.get("履债能力"));
+        resultList.add(map.get("追偿难度"));
+        resultList.add(map.get("追偿周期"));
+        return resultList.size() == 4 ? resultList : new ArrayList<>();
+    }
+
+
+
+}

+ 5 - 0
src/main/resources/mapper/RepalBillDiagnosisMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.winhc.repal.repository.RepalBillDiagnosisMapper">
+
+</mapper>

+ 3 - 3
src/test/java/CodeGenerator.java

@@ -50,7 +50,7 @@ public class CodeGenerator {
     public static final String MAPPER_XMP_PATH = RESOURCES_PATH + "/mapper";
 
     public static void main(String[] args) {
-        genCode("REPAL_RESPONSIBLE_PERSON");
+        genCode("REPAL_BILL_DIAGNOSIS");
     }
     // 生成文件控制
     private static final boolean GEN_CONTROLLER = false;
@@ -58,8 +58,8 @@ public class CodeGenerator {
     private static final boolean GEN_DTO = false;
     private static final boolean GEN_VO = false;
     private static final boolean GEN_CVT = false;
-    private static final boolean GEN_SERVICE = false;
-    private static final boolean GEN_SERVICE_IMPL = false;
+    private static final boolean GEN_SERVICE = true;
+    private static final boolean GEN_SERVICE_IMPL = true;
     private static final boolean GEN_MAPPER = true;
     private static final boolean GEN_MAPPER_XML = true;