Forráskód Böngészése

增加组织关系实体

xda 3 éve
szülő
commit
4548c4e713
35 módosított fájl, 327 hozzáadás és 852 törlés
  1. 0 134
      src/main/java/com/winhc/repal/entity/AccountBill.java
  2. 0 68
      src/main/java/com/winhc/repal/entity/AccountBillDiagnosis.java
  3. 0 86
      src/main/java/com/winhc/repal/entity/AccountBillMoneyRecord.java
  4. 0 59
      src/main/java/com/winhc/repal/entity/AccountBillOperLog.java
  5. 0 55
      src/main/java/com/winhc/repal/entity/AccountBillPayer.java
  6. 0 59
      src/main/java/com/winhc/repal/entity/AccountRemindDefinition.java
  7. 0 107
      src/main/java/com/winhc/repal/entity/AccountRemindHistory.java
  8. 0 53
      src/main/java/com/winhc/repal/entity/AccountRemindSetting.java
  9. 0 38
      src/main/java/com/winhc/repal/entity/BetaTestApply.java
  10. 0 76
      src/main/java/com/winhc/repal/entity/Message.java
  11. 5 1
      src/main/java/com/winhc/repal/entity/RepalBill.java
  12. 4 0
      src/main/java/com/winhc/repal/entity/RepalBook.java
  13. 4 0
      src/main/java/com/winhc/repal/entity/RepalCustomer.java
  14. 24 30
      src/main/java/com/winhc/repal/entity/AccountBillReceiptRecord.java
  15. 25 24
      src/main/java/com/winhc/repal/entity/AccountBook.java
  16. 18 25
      src/main/java/com/winhc/repal/entity/AccountBook.java
  17. 18 25
      src/main/java/com/winhc/repal/entity/AccountBook.java
  18. 51 1
      src/main/java/com/winhc/repal/entity/UserExt.java
  19. 26 3
      src/main/java/com/winhc/repal/entity/UserInfo.java
  20. 13 0
      src/main/java/com/winhc/repal/repository/RepalGroupMapper.java
  21. 13 0
      src/main/java/com/winhc/repal/repository/RepalGroupMemberMapper.java
  22. 13 0
      src/main/java/com/winhc/repal/repository/RepalGroupRoleMapper.java
  23. 13 0
      src/main/java/com/winhc/repal/repository/RepalRolePermissionMapper.java
  24. 13 0
      src/main/java/com/winhc/repal/repository/UserExtMapper.java
  25. 13 0
      src/main/java/com/winhc/repal/repository/UserInfoMapper.java
  26. 15 0
      src/main/java/com/winhc/repal/service/RepalGroupService.java
  27. 3 0
      src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java
  28. 18 0
      src/main/java/com/winhc/repal/service/impl/RepalGroupServiceImpl.java
  29. 5 0
      src/main/resources/mapper/RepalGroupMapper.xml
  30. 5 0
      src/main/resources/mapper/RepalGroupMemberMapper.xml
  31. 5 0
      src/main/resources/mapper/RepalGroupRoleMapper.xml
  32. 5 0
      src/main/resources/mapper/RepalRolePermissionMapper.xml
  33. 5 0
      src/main/resources/mapper/UserExtMapper.xml
  34. 5 0
      src/main/resources/mapper/UserInfoMapper.xml
  35. 8 8
      src/test/java/CodeGenerator.java

+ 0 - 134
src/main/java/com/winhc/repal/entity/AccountBill.java

@@ -1,134 +0,0 @@
-package com.winhc.repal.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @description AccountBill实体对象
- * @author Generator
- * @date 2020-12-15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BILL")
-@ApiModel(value="AccountBill实体对象", description="账款表")
-@Accessors(chain = true)
-public class AccountBill implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "账本id")
-    @TableField("ACCOUNT_BOOK_ID")
-    private Long accountBookId;
-
-    @ApiModelProperty(value = "当前应收金额/新版本为账款总金额")
-    @TableField("RECEIVABLE")
-    private BigDecimal receivable;
-
-    @ApiModelProperty(value = "已收回金额")
-    @TableField("RECEIPT")
-    private BigDecimal receipt;
-
-    @ApiModelProperty(value = "账款状态,1进行中,2已逾期,3已收回")
-    @TableField("ACCOUNT_BILL_STATUS")
-    private Integer accountBillStatus;
-
-    @ApiModelProperty(value = "账款阶段,1未起诉,2已起诉,3已申请执行,4终结本次执行")
-    @TableField("ACCOUNT_BILL_STAGE")
-    private Integer accountBillStage;
-
-    @ApiModelProperty(value = "应收账款日期")
-    @TableField("END_DATE")
-    private LocalDate endDate;
-
-    @ApiModelProperty(value = "账款备注")
-    @TableField("ACCOUNT_BILL_REMARK")
-    private String accountBillRemark;
-
-    @ApiModelProperty(value = "账款标题")
-    @TableField("ACCOUNT_BILL_TITLE")
-    private String accountBillTitle;
-
-    @ApiModelProperty(value = "账款logo")
-    @TableField("ACCOUNT_BILL_LOGO")
-    private String accountBillLogo;
-
-    @ApiModelProperty(value = "账款刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    @TableField("REFRESH_STATUS")
-    private Integer refreshStatus;
-
-    @ApiModelProperty(value = "上次评估ID")
-    @TableField("PRE_DIAGNOSIS_ID")
-    private Long preDiagnosisId;
-
-    @ApiModelProperty(value = "评估id")
-    @TableField("DIAGNOSIS_ID")
-    private Long diagnosisId;
-
-    @ApiModelProperty(value = "上次评估等级")
-    @TableField("PRE_DIAGNOSIS_GRADE")
-    private String preDiagnosisGrade;
-
-    @ApiModelProperty(value = "评估等级")
-    @TableField("DIAGNOSIS_GRADE")
-    private String diagnosisGrade;
-
-    @ApiModelProperty(value = "上次评估分数")
-    @TableField("PRE_DIAGNOSIS_SCORE")
-    private BigDecimal preDiagnosisScore;
-
-    @ApiModelProperty(value = "本次评估分数")
-    @TableField("DIAGNOSIS_SCORE")
-    private BigDecimal diagnosisScore;
-
-    @ApiModelProperty(value = "上次评估时间")
-    @TableField("PRE_DIAGNOSIS_DATETIME")
-    private LocalDateTime preDiagnosisDatetime;
-
-    @ApiModelProperty(value = "评估时间")
-    @TableField("DIAGNOSIS_DATETIME")
-    private LocalDateTime diagnosisDatetime;
-
-    @ApiModelProperty(value = "趋势,1上升,2下降。0持平")
-    @TableField("DIAGNOSIS_TREND")
-    private Integer diagnosisTrend;
-
-    @TableField("REMIND_INFO")
-    @ApiModelProperty("提醒消息")
-    private String remindInfo;
-
-    @ApiModelProperty(value = "账款收回时间")
-    @TableField("SETTLE_TIME")
-    private LocalDateTime settleTime;
-
-    @ApiModelProperty("userId")
-    private Long userId;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    @TableField("DELETED")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("TIME_CREATED")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("TIME_MODIFIED")
-    private LocalDateTime timeModified;
-
-
-}

+ 0 - 68
src/main/java/com/winhc/repal/entity/AccountBillDiagnosis.java

@@ -1,68 +0,0 @@
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @description AccountBillDiagnosis实体对象
- * @author Generator
- * @date 2020-12-15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BILL_DIAGNOSIS")
-@ApiModel(value="AccountBillDiagnosis实体对象", description="账款评估记录表")
-@Accessors(chain = true)
-public class AccountBillDiagnosis implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "账款id")
-    @TableField("ACCOUNT_BILL_ID")
-    private Long accountBillId;
-
-    @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")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("TIME_MODIFIED")
-    private LocalDateTime timeModified;
-
-    @ApiModelProperty(value = "履债评估结果id")
-    @TableField("BIZ_ID")
-    private Long bizId;
-}

+ 0 - 86
src/main/java/com/winhc/repal/entity/AccountBillMoneyRecord.java

@@ -1,86 +0,0 @@
-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.winhc.repal.enums.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @description AccountBillMoneyRecord实体对象
- * @author Generator
- * @date 2020-12-15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BILL_MONEY_RECORD")
-@ApiModel(value="AccountBillMoneyRecord实体对象", description="账款金额变动记录")
-public class AccountBillMoneyRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "账本id")
-    @TableField("ACCOUNT_BOOK_ID")
-    private Long accountBookId;
-
-    @ApiModelProperty(value = "账款id")
-    @TableField("ACCOUNT_BILL_ID")
-    private Long accountBillId;
-
-    @ApiModelProperty(value = "变更类型,1增加,2减少")
-    @TableField("CHANGE_TYPE")
-    private Integer changeType;
-
-    @ApiModelProperty(value = "变更金额")
-    @TableField("CHANGE_MONEY")
-    private BigDecimal changeMoney;
-
-    @ApiModelProperty(value = "改变前金额")
-    @TableField("PRE_MONEY")
-    private BigDecimal preMoney;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("TIME_CREATED")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("TIME_MODIFIED")
-    private LocalDateTime timeModified;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    @TableField("DELETED")
-    private Integer deleted;
-
-    public static AccountBillMoneyRecord convert2Record(AccountBill accountBill, BigDecimal preMoney, BigDecimal changeMoney) {
-        AccountBillMoneyRecord record = new AccountBillMoneyRecord();
-        record.setAccountBookId(accountBill.getAccountBookId());
-        record.setAccountBillId(accountBill.getId());
-        record.setChangeType(Dict.ChangeTypeEnum.getMoneyCrease(preMoney, changeMoney));
-        record.setChangeMoney(changeMoney);
-        record.setPreMoney(preMoney);
-        return record;
-    }
-
-    public static AccountBillMoneyRecord convert2NewRecord(AccountBill accountBill, BigDecimal changeMoney) {
-        AccountBillMoneyRecord record = new AccountBillMoneyRecord();
-        record.setAccountBookId(accountBill.getAccountBookId());
-        record.setAccountBillId(accountBill.getId());
-        record.setChangeType(Dict.ChangeTypeEnum.getMoneyCrease(accountBill.getReceivable().subtract(accountBill.getReceipt()), changeMoney));
-        record.setChangeMoney(changeMoney);
-        record.setPreMoney(accountBill.getReceivable().subtract(accountBill.getReceipt()));
-        return record;
-    }
-
-
-}

+ 0 - 59
src/main/java/com/winhc/repal/entity/AccountBillOperLog.java

@@ -1,59 +0,0 @@
-package com.winhc.repal.entity;
-
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @description AccountBillOperLog实体对象
- * @author Generator
- * @date 2020-12-15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BILL_OPER_LOG")
-@ApiModel(value="AccountBillOperLog实体对象", description="账款精灵操作日志表")
-public class AccountBillOperLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "动作代码")
-    @TableField("ACTION_CODE")
-    private String actionCode;
-
-    @ApiModelProperty(value = "动作名称")
-    @TableField("ACTION_NAME")
-    private String actionName;
-
-    @ApiModelProperty(value = "操作时间")
-    @TableField("OPER_TIME")
-    private LocalDateTime operTime;
-
-    @ApiModelProperty(value = "用户ID")
-    @TableField("USER_ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "业务类型")
-    @TableField("BIZ_TYPE")
-    private String bizType;
-
-    @ApiModelProperty(value = "业务ID")
-    @TableField("BIZ_ID")
-    private String bizId;
-
-    @ApiModelProperty(value = "操作内容")
-    @TableField("ACTION_CONTENT")
-    private String actionContent;
-
-
-}

+ 0 - 55
src/main/java/com/winhc/repal/entity/AccountBillPayer.java

@@ -1,55 +0,0 @@
-package com.winhc.repal.entity;
-
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @description AccountBillPayer实体对象
- * @author Generator
- * @date 2020-12-15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BILL_PAYER")
-@ApiModel(value="AccountBillPayer实体对象", description="账款付款人明细表")
-public class AccountBillPayer implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "账款id")
-    @TableField("ACCOUNT_BILL_ID")
-    private Long accountBillId;
-
-    @ApiModelProperty(value = "付款公司名称")
-    @TableField("PAYER_NAME")
-    private String payerName;
-
-    @ApiModelProperty(value = "付款公司CID")
-    @TableField("PAYER_CID")
-    private String payerCid;
-
-    @ApiModelProperty(value = "付款公司companyId")
-    @TableField("PAYER_COMPANY_ID")
-    private String payerCompanyId;
-
-    @ApiModelProperty(value = "付款公司LOGO")
-    @TableField("PAYER_LOGO")
-    private String payerLogo;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("TIME_CREATED")
-    private LocalDateTime timeCreated;
-
-
-}

+ 0 - 59
src/main/java/com/winhc/repal/entity/AccountRemindDefinition.java

@@ -1,59 +0,0 @@
-package com.winhc.repal.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @description AccountRemindDefinition实体对象
- * @author Generator
- * @date 2020-12-15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("ACCOUNT_REMIND_DEFINITION")
-@ApiModel(value="AccountRemindDefinition实体对象", description="")
-public class AccountRemindDefinition implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "提醒类型,枚举(中文):逾期提醒、评级提醒、财产线索、风险提醒")
-    @TableField("REMIND_TYPE")
-    private String remindType;
-
-    @ApiModelProperty(value = "触发时机。"+
-            "1、逾期提醒:OVERDUE_WEEK(逾期前一周)、OVERDUED(已逾期)、OVERDUE_THREEMONTH(逾期三个月)、OVERDUE_HALFYEAR(逾期半年)、OVERDUE_YEAR(逾期1年)、OVERDUE_THREEYEAR(逾期3年)"+
-            "2、评级提醒:A、B、C、D"+
-            "3 4根据动态的数据来")
-    @TableField("OPPORTUNITY")
-    private String opportunity;
-
-    @ApiModelProperty(value = "账单状态,1进行中,2已逾期,3已收回")
-    @TableField("ACCOUNT_BILL_STATUS")
-    private Integer accountBillStatus;
-
-    @ApiModelProperty(value = "账款阶段,1未起诉 2已起诉  3已申请执行 4终结本次执行")
-    @TableField("ACCOUNT_BILL_STAGE")
-    private Integer accountBillStage;
-
-    @ApiModelProperty(value = "提醒文案")
-    @TableField("REMIND_CONTENT")
-    private String remindContent;
-
-    @ApiModelProperty(value = "功能列表")
-    @TableField("FUNCTION_LIST")
-    private String functionList;
-
-
-}

+ 0 - 107
src/main/java/com/winhc/repal/entity/AccountRemindHistory.java

@@ -1,107 +0,0 @@
-package com.winhc.repal.entity;
-
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @description AccountRemindHistory实体对象
- * @author Generator
- * @date 2021-05-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("ACCOUNT_REMIND_HISTORY")
-@ApiModel(value="AccountRemindHistory实体对象", description="智能提醒历史表")
-public class AccountRemindHistory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "用户ID")
-    @TableField("USER_ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "账本ID")
-    @TableField("ACCOUNT_BOOK_ID")
-    private Long accountBookId;
-
-    @ApiModelProperty(value = "账单主键")
-    @TableField("ACCOUNT_BILL_ID")
-    private Long accountBillId;
-
-    @ApiModelProperty(value = "动态主键")
-    @TableField("TREND_ID")
-    private String trendId;
-
-    @ApiModelProperty(value = "动态内容")
-    @TableField("TREND_CONTENT")
-    private String trendContent;
-
-    @ApiModelProperty(value = "提醒时间")
-    @TableField("REMIND_TIME")
-    private LocalDateTime remindTime;
-
-    @ApiModelProperty(value = "公司名称")
-    @TableField("COMPANY_NAME")
-    private String companyName;
-
-    @ApiModelProperty(value = "提醒标题")
-    @TableField("REMIND_TITLE")
-    private String remindTitle;
-
-    @ApiModelProperty(value = "提醒文案")
-    @TableField("REMIND_CONTENT")
-    private String remindContent;
-
-    @ApiModelProperty(value = "功能列表")
-    @TableField("FUNCTION_LIST")
-    private String functionList;
-
-    @ApiModelProperty(value = "提醒类型,枚举(中文):逾期提醒、账款评级、财产线索、风险预警")
-    @TableField("REMIND_TYPE")
-    private String remindType;
-
-    @ApiModelProperty(value = "0未读1已读")
-    @TableField("READ_STATUS")
-    private Integer readStatus;
-
-    @ApiModelProperty(value = "动态类型")
-    @TableField("TRENT_TYPE")
-    private String trentType;
-
-    @ApiModelProperty(value = "跳转详情用")
-    @TableField("BIZ_ID")
-    private String bizId;
-
-    @ApiModelProperty(value = "跳转详情用")
-    @TableField("DIMENSION_TYPE")
-    private String dimensionType;
-
-    @ApiModelProperty(value = "跳转详情用")
-    @TableField("INFO_TYPE")
-    private String infoType;
-
-    @ApiModelProperty(value = "跳转详情用")
-    @TableField("DYNAMIC_ID")
-    private String dynamicId;
-
-    @ApiModelProperty(value = "提醒文案新版")
-    @TableField("NEW_TREND_CONTENT")
-    private String newTrendContent;
-
-    @ApiModelProperty(value = "0旧1新")
-    @TableField("IS_NEW")
-    private String isNew;
-}

+ 0 - 53
src/main/java/com/winhc/repal/entity/AccountRemindSetting.java

@@ -1,53 +0,0 @@
-package com.winhc.repal.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @description AccountRemindSetting实体对象
- * @author Generator
- * @date 2021-08-03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("ACCOUNT_REMIND_SETTING")
-@ApiModel(value="AccountRemindSetting实体对象", description="提醒设置表")
-public class AccountRemindSetting implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "用户id")
-    @TableField("USER_ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "账款逾期是否需要提醒 0不需要  1需要")
-    @TableField("OVERDUE")
-    private Integer overdue;
-
-    @ApiModelProperty(value = "评级变更是否需要提醒 0不需要  1需要")
-    @TableField("RANK")
-    private Integer rank;
-
-    @ApiModelProperty(value = "财产线索是否需要提醒 0不需要  1需要")
-    @TableField("FINANCE")
-    private Integer finance;
-
-    @ApiModelProperty(value = "风险动态是否需要提醒 0不需要  1需要")
-    @TableField("RISK")
-    private Integer risk;
-
-
-}

+ 0 - 38
src/main/java/com/winhc/repal/entity/BetaTestApply.java

@@ -1,38 +0,0 @@
-package com.winhc.repal.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @Description: BetaTestApply
- * @Author: xda
- * @Date: 2020/11/26  19:19
- */
-@Data
-@TableName("BETA_TEST_APPLY")
-public class BetaTestApply {
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @TableField("PRODUCT_CODE")
-    private String productCode;
-
-    @TableField("APPLY_USER_ID")
-    private Long applyUserId;
-
-    @TableField("APPLY_USER_MOBILE_NO")
-    private String applyUserMobileNo;
-
-    @TableField("APPLY_TIME")
-    private LocalDateTime applyTime;
-
-    @TableField("STATUS")
-    private String status;
-
-}

+ 0 - 76
src/main/java/com/winhc/repal/entity/Message.java

@@ -1,76 +0,0 @@
-package com.winhc.repal.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @description Message实体对象
- * @author Generator
- * @date 2021-08-16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("MESSAGE")
-@ApiModel(value="Message实体对象", description="")
-public class Message implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "MESSAGE_ID", type = IdType.AUTO)
-    private Long messageId;
-
-    @TableField("CASE_ID")
-    private String caseId;
-
-    @ApiModelProperty(value = "1风控阶段;2诉讼阶段;3执行阶段;4结算阶段")
-    @TableField("BIZ_STAGE")
-    private Integer bizStage;
-
-    @ApiModelProperty(value = "消息分类:服务提醒(0),小赢管家(1),案件助手(2),动态监测(4),工作台提醒(5)")
-    @TableField("MESSAGE_KIND")
-    private String messageKind;
-
-    @TableField("SUBJECT")
-    private String subject;
-
-    @TableField("CONTENT")
-    private String content;
-
-    @TableField("USER_ACCOUNT")
-    private String userAccount;
-
-    @TableField("WARN_AREA")
-    private String warnArea;
-
-    @TableField("ACTION")
-    private String action;
-
-    @TableField("MESSAGE_TIME")
-    private String messageTime;
-
-    @ApiModelProperty(value = "0已推送;1未推送")
-    @TableField("PUSH_STATUS")
-    private String pushStatus;
-
-    @ApiModelProperty(value = "0已读;1未读")
-    @TableField("READ_STATUS")
-    private String readStatus;
-
-    @TableField("USER_ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "0通知;1消息")
-    @TableField("MESSAGE_TYPE")
-    private String messageType;
-
-
-}

+ 5 - 1
src/main/java/com/winhc/repal/entity/RepalBill.java

@@ -31,6 +31,10 @@ public class RepalBill implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "所属组织id")
+    @TableField("REPAL_GROUP_ID")
+    private Long repalGroupId;
+
     @ApiModelProperty(value = "回款宝账本id")
     @TableField("REPAL_BOOK_ID")
     private Long repalBookId;
@@ -143,7 +147,7 @@ public class RepalBill implements Serializable {
     @TableField("SETTLE_TIME")
     private LocalDateTime settleTime;
 
-    @ApiModelProperty(value = "用户id")
+    @ApiModelProperty(value = "用户id(创建者id)")
     @TableField("USER_ID")
     private Long userId;
 

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

@@ -29,6 +29,10 @@ public class RepalBook implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "所属组织id")
+    @TableField("REPAL_GROUP_ID")
+    private Long repalGroupId;
+
     @ApiModelProperty(value = "收款公司name")
     @TableField("PAYEE_NAME")
     private String payeeName;

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

@@ -30,6 +30,10 @@ public class RepalCustomer implements Serializable {
     @TableId(value = "CUST_ID", type = IdType.AUTO)
     private Long custId;
 
+    @ApiModelProperty(value = "所属组织id")
+    @TableField("REPAL_GROUP_ID")
+    private Long repalGroupId;
+
     @ApiModelProperty(value = "客户名称")
     @TableField("CUST_NAME")
     private String custName;

+ 24 - 30
src/main/java/com/winhc/repal/entity/AccountBillReceiptRecord.java

@@ -1,50 +1,46 @@
 package com.winhc.repal.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 /**
- * @Description: AccountBillReceiptRecord
- * @Author: xda
- * @Date: 2021/8/5 16:10
+ * @description RepalGroup实体对象
+ * @author Generator
+ * @date 2022-04-13
  */
 @Data
-@TableName("ACCOUNT_BILL_RECEIPT_RECORD")
-@AllArgsConstructor
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class AccountBillReceiptRecord {
+@TableName("REPAL_GROUP")
+@ApiModel(value="RepalGroup实体对象", description="回款宝-组织结构")
+public class RepalGroup implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "账本id")
-    @TableField("ACCOUNT_BOOK_ID")
-    private Long accountBookId;
-
-    @ApiModelProperty(value = "账款id")
-    @TableField("ACCOUNT_BILL_ID")
-    private Long accountBillId;
+    @ApiModelProperty(value = "用户id, 创建者")
+    @TableField("USER_ID")
+    private Long userId;
 
-    @ApiModelProperty(value = "变更金额")
-    @TableField("RECEIPT_MONEY")
-    private BigDecimal receiptMoney;
+    @ApiModelProperty(value = "组织name")
+    @TableField("GROUP_NAME")
+    private String groupName;
 
-    @ApiModelProperty(value = "改变前金额")
-    @TableField("PRE_MONEY")
-    private BigDecimal preMoney;
+    @ApiModelProperty(value = "是否删除,1删除。0否")
+    @TableField("DELETED")
+    private Integer deleted;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
@@ -54,7 +50,5 @@ public class AccountBillReceiptRecord {
     @TableField("TIME_MODIFIED")
     private LocalDateTime timeModified;
 
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    @TableField("DELETED")
-    private Integer deleted;
+
 }

+ 25 - 24
src/main/java/com/winhc/repal/entity/AccountBook.java

@@ -13,42 +13,47 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @description AccountBook实体对象
+ * @description RepalGroupMember实体对象
  * @author Generator
- * @date 2020-12-15
+ * @date 2022-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BOOK")
-@ApiModel(value="AccountBook实体对象", description="账本表")
 @Accessors(chain = true)
-public class AccountBook implements Serializable {
+@TableName("REPAL_GROUP_MEMBER")
+@ApiModel(value="RepalGroupMember实体对象", description="回款宝-组织成员")
+public class RepalGroupMember implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "收款公司名称")
-    @TableField("PAYEE_NAME")
-    private String payeeName;
-
-    @ApiModelProperty(value = "收款公司LOGO")
-    @TableField("PAYEE_LOGO")
-    private String payeeLogo;
-
-    @ApiModelProperty(value = "收款公司CID")
-    @TableField("PAYEE_CID")
-    private String payeeCid;
-
-    @ApiModelProperty(value = "账本刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    @TableField("REFRESH_STATUS")
-    private Integer refreshStatus;
+    @ApiModelProperty(value = "组织id")
+    @TableField("REPAL_GROUP_ID")
+    private Long repalGroupId;
 
     @ApiModelProperty(value = "用户id")
     @TableField("USER_ID")
     private Long userId;
 
+    @ApiModelProperty(value = "成员name")
+    @TableField("MEMBER_USER_NAME")
+    private String memberUserName;
+
+    @ApiModelProperty(value = "角色类型。1系统角色。2自定义角色")
+    @TableField("ROLE_TYPE")
+    private Integer roleType;
+
+    @ApiModelProperty(value = "角色id")
+    @TableField("ROLE_ID")
+    private Integer roleId;
+
+    @ApiModelProperty(value = "是否删除,1删除。0否")
+    @TableField("DELETED")
+    private Integer deleted;
+
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
     private LocalDateTime timeCreated;
@@ -57,9 +62,5 @@ public class AccountBook implements Serializable {
     @TableField("TIME_MODIFIED")
     private LocalDateTime timeModified;
 
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    @TableField("DELETED")
-    private Integer deleted;
-
 
 }

+ 18 - 25
src/main/java/com/winhc/repal/entity/AccountBook.java

@@ -13,41 +13,38 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @description AccountBook实体对象
+ * @description RepalGroupRole实体对象
  * @author Generator
- * @date 2020-12-15
+ * @date 2022-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BOOK")
-@ApiModel(value="AccountBook实体对象", description="账本表")
 @Accessors(chain = true)
-public class AccountBook implements Serializable {
+@TableName("REPAL_GROUP_ROLE")
+@ApiModel(value="RepalGroupRole实体对象", description="回款宝-组织角色")
+public class RepalGroupRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "收款公司名称")
-    @TableField("PAYEE_NAME")
-    private String payeeName;
+    @ApiModelProperty(value = "角色类型1系统角色。2自定义角色")
+    @TableField("ROLE_TYPE")
+    private Integer roleType;
 
-    @ApiModelProperty(value = "收款公司LOGO")
-    @TableField("PAYEE_LOGO")
-    private String payeeLogo;
+    @ApiModelProperty(value = "角色name")
+    @TableField("ROLE_NAME")
+    private String roleName;
 
-    @ApiModelProperty(value = "收款公司CID")
-    @TableField("PAYEE_CID")
-    private String payeeCid;
+    @ApiModelProperty(value = "组织id。系统角色id为0")
+    @TableField("REPAL_GROUP_ID")
+    private Long repalGroupId;
 
-    @ApiModelProperty(value = "账本刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    @TableField("REFRESH_STATUS")
-    private Integer refreshStatus;
-
-    @ApiModelProperty(value = "用户id")
-    @TableField("USER_ID")
-    private Long userId;
+    @ApiModelProperty(value = "是否删除,1删除。0否")
+    @TableField("DELETED")
+    private Integer deleted;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
@@ -57,9 +54,5 @@ public class AccountBook implements Serializable {
     @TableField("TIME_MODIFIED")
     private LocalDateTime timeModified;
 
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    @TableField("DELETED")
-    private Integer deleted;
-
 
 }

+ 18 - 25
src/main/java/com/winhc/repal/entity/AccountBook.java

@@ -13,41 +13,38 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @description AccountBook实体对象
+ * @description RepalRolePermission实体对象
  * @author Generator
- * @date 2020-12-15
+ * @date 2022-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("ACCOUNT_BOOK")
-@ApiModel(value="AccountBook实体对象", description="账本表")
 @Accessors(chain = true)
-public class AccountBook implements Serializable {
+@TableName("REPAL_ROLE_PERMISSION")
+@ApiModel(value="RepalRolePermission实体对象", description=" 回款宝-组织角色权限表")
+public class RepalRolePermission implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "收款公司名称")
-    @TableField("PAYEE_NAME")
-    private String payeeName;
+    @ApiModelProperty(value = "权限name")
+    @TableField("PERMISSION_NAME")
+    private String permissionName;
 
-    @ApiModelProperty(value = "收款公司LOGO")
-    @TableField("PAYEE_LOGO")
-    private String payeeLogo;
+    @ApiModelProperty(value = "权限编码")
+    @TableField("PERMISSION_CODE")
+    private String permissionCode;
 
-    @ApiModelProperty(value = "收款公司CID")
-    @TableField("PAYEE_CID")
-    private String payeeCid;
+    @ApiModelProperty(value = "角色id")
+    @TableField("REPAL_GROUP_ROLE_ID")
+    private Long repalGroupRoleId;
 
-    @ApiModelProperty(value = "账本刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    @TableField("REFRESH_STATUS")
-    private Integer refreshStatus;
-
-    @ApiModelProperty(value = "用户id")
-    @TableField("USER_ID")
-    private Long userId;
+    @ApiModelProperty(value = "是否删除,1删除。0否")
+    @TableField("DELETED")
+    private Integer deleted;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
@@ -57,9 +54,5 @@ public class AccountBook implements Serializable {
     @TableField("TIME_MODIFIED")
     private LocalDateTime timeModified;
 
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    @TableField("DELETED")
-    private Integer deleted;
-
 
 }

+ 51 - 1
src/main/java/com/winhc/repal/entity/UserExt.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 /**
  * @description UserExt实体对象
  * @author Generator
- * @date 2020-12-16
+ * @date 2022-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -107,9 +107,11 @@ public class UserExt implements Serializable {
     @TableField("VIP_SIGN")
     private String vipSign;
 
+    @ApiModelProperty(value = "VIP开始时间")
     @TableField("VIP_START_TIME")
     private LocalDateTime vipStartTime;
 
+    @ApiModelProperty(value = "VIP结束时间")
     @TableField("VIP_END_TIME")
     private LocalDateTime vipEndTime;
 
@@ -121,5 +123,53 @@ public class UserExt implements Serializable {
     @TableField("IDENTITY")
     private String identity;
 
+    @ApiModelProperty(value = "是否开启接单 0否 1是")
+    @TableField("RECEIVABLE")
+    private Integer receivable;
+
+    @ApiModelProperty(value = "赢火虫平台证书编号")
+    @TableField("WINHC_CERT_NO")
+    private String winhcCertNo;
+
+    @ApiModelProperty(value = "入驻状态:0 未入驻,1 已入驻")
+    @TableField("SETTLE_STATUS")
+    private String settleStatus;
+
+    @ApiModelProperty(value = "男:M  女:F ")
+    @TableField("GENDER")
+    private String gender;
+
+    @ApiModelProperty(value = "出生年月 yyyy-MM-dd")
+    @TableField("BIRTHDAY")
+    private String birthday;
+
+    @ApiModelProperty(value = "开始执业年份")
+    @TableField("PRACTICE_START_YEAR")
+    private Integer practiceStartYear;
+
+    @ApiModelProperty(value = "1执业律师 2实习律师 3公职律师 4基层法律服务工作者")
+    @TableField("SUB_LAWYER_TYPE")
+    private Integer subLawyerType;
+
+    @ApiModelProperty(value = "律师业务状态,默认1。1可接单。2禁用。")
+    @TableField("LAWYER_BUSINESS_STATUS")
+    private Integer lawyerBusinessStatus;
+
+    @ApiModelProperty(value = "vip最近开通的时间")
+    @TableField("VIP_LAST_OPEN_TIME")
+    private LocalDateTime vipLastOpenTime;
+
+    @ApiModelProperty(value = "接案特权0:有特权;1:无特权")
+    @TableField("CASE_VIP_SIGN")
+    private String caseVipSign;
+
+    @ApiModelProperty(value = "接案特权开始时间")
+    @TableField("CASE_VIP_START_TIME")
+    private LocalDateTime caseVipStartTime;
+
+    @ApiModelProperty(value = "接案特权结束时间")
+    @TableField("CASE_VIP_END_TIME")
+    private LocalDateTime caseVipEndTime;
+
 
 }

+ 26 - 3
src/main/java/com/winhc/repal/entity/UserInfo.java

@@ -14,11 +14,11 @@ import lombok.experimental.Accessors;
 /**
  * @description UserInfo实体对象
  * @author Generator
- * @date 2020-08-18
+ * @date 2022-04-13
  */
 @Data
-@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
 @TableName("USER_INFO")
 @ApiModel(value="UserInfo实体对象", description="")
 public class UserInfo implements Serializable {
@@ -64,7 +64,11 @@ public class UserInfo implements Serializable {
     @TableField("LOGIN_TIME")
     private String loginTime;
 
-    @ApiModelProperty(value = "0:启用;1:冻结;2:手机号失效;3:未激活")
+    @ApiModelProperty(value = "夜间登录时间")
+    @TableField("NIGHT_LOGIN_TIME")
+    private String nightLoginTime;
+
+    @ApiModelProperty(value = "0:启用;1:冻结;2:手机号失效;3:未激活;4:已注销")
     @TableField("STATUS")
     private String status;
 
@@ -81,9 +85,28 @@ public class UserInfo implements Serializable {
     @TableField("OPENID_APSARA_MP")
     private String openidApsaraMp;
 
+    @ApiModelProperty(value = "赢律师openId")
+    @TableField("OPENID_WINLS_MP")
+    private String openidWinlsMp;
+
     @ApiModelProperty(value = "IOS(appstore),Android(vivo、xiaomi、meizu、qutoutiao、huawei、zhihu、yingyongbao、360、weibo、baidu、jinritoutiao、oppo)")
     @TableField("APP_CHANNEL")
     private String appChannel;
 
+    @ApiModelProperty(value = "最后登录的应用名:1赢火虫;2赢律师")
+    @TableField("LOGIN_PACKAGE")
+    private Integer loginPackage;
+
+    @ApiModelProperty(value = "最后登录的渠道:1安卓 2ios 3其他")
+    @TableField("LOGIN_CHANNEL")
+    private Integer loginChannel;
+
+    @TableField("APP_PACKAGE")
+    private String appPackage;
+
+    @ApiModelProperty(value = "最后登录来源。1赢火虫。2赢律师。3小程序。4m站。5pc端。6云法务")
+    @TableField("CLIENT_ORIGIN")
+    private Integer clientOrigin;
+
 
 }

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

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

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

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

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

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

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

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

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

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

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

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

+ 15 - 0
src/main/java/com/winhc/repal/service/RepalGroupService.java

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

+ 3 - 0
src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -20,6 +20,9 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
 
     @Override
     public VOPage<RepalBillPageVO> getRepalBillPage(GetRepalBillPageDTO dto) {
+
+
+
         return null;
     }
 }

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

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

+ 5 - 0
src/main/resources/mapper/RepalGroupMapper.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.RepalGroupMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/RepalGroupMemberMapper.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.RepalGroupMemberMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/RepalGroupRoleMapper.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.RepalGroupRoleMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/RepalRolePermissionMapper.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.RepalRolePermissionMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/UserExtMapper.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.UserExtMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/UserInfoMapper.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.UserInfoMapper">
+
+</mapper>

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

@@ -23,7 +23,7 @@ import java.util.*;
  */
 public class CodeGenerator {
     //JDBC配置,请修改为你项目的实际配置
-    private static final String JDBC_URL = "jdbc:mysql://139.224.213.4:3306/firefly?useUnicode=true&characterEncoding=utf-8";
+    private static final String JDBC_URL = "jdbc:mysql://139.224.213.4:3306/firefly?characterEncoding=utf8&serverTimezone=GMT%2b8&zeroDateTimeBehavior=convertToNull&useSSL=false";
     private static final String JDBC_USERNAME = "firefly";
     private static final String JDBC_PASSWORD = "firefly";
     private static final String JDBC_DIVER_CLASS_NAME = Driver.class.getName();
@@ -50,16 +50,16 @@ public class CodeGenerator {
     public static final String MAPPER_XMP_PATH = RESOURCES_PATH + "/mapper";
 
     public static void main(String[] args) {
-        genCode("REPAL_RESPONSIBLE_PERSON");
+        genCode("USER_EXT");
     }
     // 生成文件控制
     private static final boolean GEN_CONTROLLER = false;
     private static final boolean GEN_ENTITY = true;
-    private static final boolean GEN_DTO = true;
-    private static final boolean GEN_VO = true;
-    private static final boolean GEN_CVT = true;
-    private static final boolean GEN_SERVICE = true;
-    private static final boolean GEN_SERVICE_IMPL = true;
+    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_MAPPER = true;
     private static final boolean GEN_MAPPER_XML = true;
 
@@ -83,7 +83,7 @@ public class CodeGenerator {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setUrl(JDBC_URL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername(JDBC_USERNAME);
         dsc.setPassword(JDBC_PASSWORD);
         dsc.setTypeConvert(new MySqlTypeConvert());