xda 3 år sedan
förälder
incheckning
c33a03306c
43 ändrade filer med 719 tillägg och 1845 borttagningar
  1. 2 2
      src/main/java/com/winhc/repal/ReturnMoneyApplication.java
  2. 106 0
      src/main/java/com/winhc/repal/controller/RepalBillController.java
  3. 10 10
      src/main/java/com/winhc/repal/enums/AuthorityEnum.java
  4. 131 131
      src/main/java/com/winhc/repal/enums/DynamicEnum.java
  5. 72 72
      src/main/java/com/winhc/repal/enums/FinanceDimensionEnum.java
  6. 45 45
      src/main/java/com/winhc/repal/enums/FinanceDynamicTypeEnum.java
  7. 140 140
      src/main/java/com/winhc/repal/enums/RadarInfoTypeEnum.java
  8. 50 50
      src/main/java/com/winhc/repal/enums/ValueAddedServiceEnum.java
  9. 21 0
      src/main/java/com/winhc/repal/model/bo/PageRequest.java
  10. 0 25
      src/main/java/com/winhc/repal/model/cvt/RepalBillConvert.java
  11. 0 25
      src/main/java/com/winhc/repal/model/cvt/RepalBillOperLogConvert.java
  12. 0 25
      src/main/java/com/winhc/repal/model/cvt/RepalBookConvert.java
  13. 0 25
      src/main/java/com/winhc/repal/model/cvt/RepalChangeRecordConvert.java
  14. 0 25
      src/main/java/com/winhc/repal/model/cvt/RepalCustChargeRelConvert.java
  15. 0 25
      src/main/java/com/winhc/repal/model/cvt/RepalResponsiblePersonConvert.java
  16. 55 0
      src/main/java/com/winhc/repal/model/dto/GetRepalBillPageDTO.java
  17. 0 123
      src/main/java/com/winhc/repal/model/dto/RepalBillDTO.java
  18. 0 46
      src/main/java/com/winhc/repal/model/dto/RepalBillOperLogDTO.java
  19. 0 55
      src/main/java/com/winhc/repal/model/dto/RepalBookDTO.java
  20. 0 62
      src/main/java/com/winhc/repal/model/dto/RepalChangeRecordDTO.java
  21. 0 29
      src/main/java/com/winhc/repal/model/dto/RepalCustChargeRelDTO.java
  22. 0 32
      src/main/java/com/winhc/repal/model/dto/RepalResponsiblePersonDTO.java
  23. 0 45
      src/main/java/com/winhc/repal/model/vo/RepalBillOperLogVO.java
  24. 61 0
      src/main/java/com/winhc/repal/model/vo/RepalBillPageVO.java
  25. 0 122
      src/main/java/com/winhc/repal/model/vo/RepalBillVO.java
  26. 0 54
      src/main/java/com/winhc/repal/model/vo/RepalBookVO.java
  27. 0 61
      src/main/java/com/winhc/repal/model/vo/RepalChangeRecordVO.java
  28. 0 28
      src/main/java/com/winhc/repal/model/vo/RepalCustChargeRelVO.java
  29. 0 31
      src/main/java/com/winhc/repal/model/vo/RepalResponsiblePersonVO.java
  30. 0 33
      src/main/java/com/winhc/repal/service/RadarService.java
  31. 1 45
      src/main/java/com/winhc/repal/service/RepalBillOperLogService.java
  32. 9 43
      src/main/java/com/winhc/repal/service/RepalBillService.java
  33. 1 44
      src/main/java/com/winhc/repal/service/RepalBookService.java
  34. 1 45
      src/main/java/com/winhc/repal/service/RepalChangeRecordService.java
  35. 1 45
      src/main/java/com/winhc/repal/service/RepalCustChargeRelService.java
  36. 1 45
      src/main/java/com/winhc/repal/service/RepalResponsiblePersonService.java
  37. 1 43
      src/main/java/com/winhc/repal/service/impl/RepalBillOperLogServiceImpl.java
  38. 6 41
      src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java
  39. 1 43
      src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java
  40. 1 43
      src/main/java/com/winhc/repal/service/impl/RepalChangeRecordServiceImpl.java
  41. 1 43
      src/main/java/com/winhc/repal/service/impl/RepalCustChargeRelServiceImpl.java
  42. 1 43
      src/main/java/com/winhc/repal/service/impl/RepalResponsiblePersonServiceImpl.java
  43. 1 1
      src/main/java/com/winhc/repal/util/ThreadPoolUtil.java

+ 2 - 2
src/main/java/com/winhc/repal/ReturnMoneyApplication.java

@@ -8,10 +8,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableDiscoveryClient
 @EnableFeignClients
 @SpringBootApplication
-public class ReturnMoneyApplication {
+public class RepalApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(ReturnMoneyApplication.class, args);
+        SpringApplication.run(RepalApplication.class, args);
     }
 
 }

+ 106 - 0
src/main/java/com/winhc/repal/controller/RepalBillController.java

@@ -0,0 +1,106 @@
+package com.winhc.repal.controller;
+
+import com.winhc.common.base.BeanResponse;
+import com.winhc.common.enums.CodeMsg;
+import com.winhc.common.model.base.VOPage;
+import com.winhc.repal.model.dto.GetRepalBillPageDTO;
+import com.winhc.repal.model.vo.RepalBillPageVO;
+import com.winhc.repal.service.RepalBillService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+
+/**
+ * @description 回款宝账款
+ * @author Generator
+ * @date 2020-12-15
+ */
+@Api(tags = "回款宝账款")
+@RestController
+@RequestMapping(value = "/repalBill")
+public class RepalBillController {
+
+    @Autowired
+    private RepalBillService repalBillService;
+
+
+    @ApiOperation("获取账本下的账款列表(应收or应付)")
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    public BeanResponse<VOPage<RepalBillPageVO>> getRepalBillPage(GetRepalBillPageDTO dto) {
+        return BeanResponse.success(CodeMsg.SUCCESS, repalBillService.getRepalBillPage(dto));
+    }
+
+//    @ApiOperation("获取账款信息by账款id")
+//    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+//    public BeanResponse<AccountBillDetailVO> getAccountBillDetailById(@PathVariable("id") Long id) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.getAccountBillDetailById(id, RequesterUtil.getCurrentUserId(), getAppPackageName(), getAppVersion()));
+//    }
+//
+//    @ApiOperation("根据类型和账款id修改账款信息")
+//    @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
+//    public BeanResponse<Boolean> updateAccountBillByType(@PathVariable("id")Long id, @Validated @RequestBody UpdateAccountBillDTO dto) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.updateAccountBillByType(dto.setUserId(RequesterUtil.getCurrentUserId()).setAccountBillId(id)));
+//    }
+//
+//    @ApiOperation("新增账款")
+//    @RequestMapping(method = RequestMethod.POST)
+//    public BeanResponse<AccountBillVO> addAccountBook(@Validated @RequestBody AddAccountBillDTO dto) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.addAccountBill(dto, RequesterUtil.getCurrentUserId()));
+//    }
+//
+//    @ApiOperation("删除账款")
+//    @DeleteMapping("/{id}")
+//    public BeanResponse<Boolean> delAccountBook(@PathVariable("id")Long id){
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.deleteAccountBill(id,RequesterUtil.getCurrentUser()));
+//    }
+//
+//    @ApiOperation("简易轮询账款")
+//    @RequestMapping(value = "/poll/{id}", method = RequestMethod.GET)
+//    public BeanResponse<AccountBillVO> pollAccountBillById(@PathVariable("id")Long id) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.pollAccountBillById(new AccountBill().setId(id).setUserId(RequesterUtil.getCurrentUserId())));
+//    }
+//
+//    @ApiOperation("批量轮询")
+//    @RequestMapping(value = "/poll/batch", method = RequestMethod.POST)
+//    public BeanResponse<List<AccountBillVO>> pollBatchAccountBillByIds(@RequestBody BatchPollAccountBillDTO dto) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.pollBatchAccountBillByIds(dto.setUserId(RequesterUtil.getCurrentUserId())));
+//    }
+//
+//    @ApiOperation("联系客服")
+//    @RequestMapping(value = "/apply", method = RequestMethod.GET)
+//    public BeanResponse<Boolean> applyCustomerService(ApplyCustomerServiceDTO dto) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.applyCustomerService(dto.setUserId(RequesterUtil.getCurrentUserId())));
+//    }
+//
+//    @ApiOperation("批量导入")
+//    @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+//    public BeanResponse<BatchImportResultVO> batchImportAccountBill(@RequestBody List<BatchImportAccountBillDTO> dtoList) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.batchImportAccountBill(dtoList));
+//    }
+//
+//    @ApiOperation("账款添加一笔已收回记录")
+//    @RequestMapping(value = "/receipt", method = RequestMethod.POST)
+//    public BeanResponse<Boolean> addAccountBillReceipt(@RequestBody AddAccountBillReceiptDTO dto) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.addAccountBillReceipt(dto, RequesterUtil.getCurrentUserId()));
+//    }
+//
+////    @Deprecated
+////    @ApiOperation("修复cid对应companyId")
+////    @RequestMapping(value = "/fixCompanyId", method = RequestMethod.POST)
+////    public BeanResponse<Boolean> fixCompanyId() {
+////        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.fixCompanyId());
+////    }
+//
+//    @ApiOperation("获取用户应收账款总额和笔数")
+//    @RequestMapping(value = "/total/{userId}", method = RequestMethod.GET)
+//    public BeanResponse<AccountBillTotalVO> getTotalMoneyAndCount(@PathVariable("userId") Long userId) {
+//        return BeanResponse.success(CodeMsg.SUCCESS, accountBillService.getTotalMoneyAndCount(userId));
+//    }
+
+
+
+
+}

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

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

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

@@ -1,131 +1,131 @@
-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;
-    }
-}
+//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;
+//    }
+//}

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

@@ -1,72 +1,72 @@
-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;
-    }
-}
+//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;
+//    }
+//}

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

@@ -1,45 +1,45 @@
-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;
-    }
-}
+//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;
+//    }
+//}

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

@@ -1,140 +1,140 @@
-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裁判文书
- */
+//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裁判文书
+// */

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

@@ -1,50 +1,50 @@
-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;
-    }
-}
+//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;
+//    }
+//}

+ 21 - 0
src/main/java/com/winhc/repal/model/bo/PageRequest.java

@@ -0,0 +1,21 @@
+package com.winhc.repal.model.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: PageRequest
+ * @Author: xda
+ * @Date: 2022/4/8 15:15
+ */
+@Data
+@ApiModel("分页")
+public class PageRequest {
+
+    @ApiModelProperty("pageNum")
+    private int pageNum;
+
+    @ApiModelProperty("pageSize")
+    private int pageSize;
+}

+ 0 - 25
src/main/java/com/winhc/repal/model/cvt/RepalBillConvert.java

@@ -1,25 +0,0 @@
-package com.winhc.repal.model.cvt;
-
-import com.winhc.repal.entity.RepalBill;
-import com.winhc.repal.model.dto.RepalBillDTO;
-import com.winhc.repal.model.vo.RepalBillVO;
-import org.springframework.beans.BeanUtils;
-/**
- * @description RepalBill 对象转换类
- * @author Generator
- * @date 2022-04-08
- */
-public class RepalBillConvert {
-
-    public static RepalBill DTOToEntity(RepalBillDTO dto) {
-        RepalBill entity = new RepalBill();
-        BeanUtils.copyProperties(dto, entity);
-        return entity;
-    }
-
-    public static RepalBillVO EntityToVO(RepalBill entity) {
-        RepalBillVO vo = new RepalBillVO ();
-        BeanUtils.copyProperties(entity, vo);
-        return vo;
-    }
-}

+ 0 - 25
src/main/java/com/winhc/repal/model/cvt/RepalBillOperLogConvert.java

@@ -1,25 +0,0 @@
-package com.winhc.repal.model.cvt;
-
-import com.winhc.repal.entity.RepalBillOperLog;
-import com.winhc.repal.model.dto.RepalBillOperLogDTO;
-import com.winhc.repal.model.vo.RepalBillOperLogVO;
-import org.springframework.beans.BeanUtils;
-/**
- * @description RepalBillOperLog 对象转换类
- * @author Generator
- * @date 2022-04-08
- */
-public class RepalBillOperLogConvert {
-
-    public static RepalBillOperLog DTOToEntity(RepalBillOperLogDTO dto) {
-        RepalBillOperLog entity = new RepalBillOperLog();
-        BeanUtils.copyProperties(dto, entity);
-        return entity;
-    }
-
-    public static RepalBillOperLogVO EntityToVO(RepalBillOperLog entity) {
-        RepalBillOperLogVO vo = new RepalBillOperLogVO ();
-        BeanUtils.copyProperties(entity, vo);
-        return vo;
-    }
-}

+ 0 - 25
src/main/java/com/winhc/repal/model/cvt/RepalBookConvert.java

@@ -1,25 +0,0 @@
-package com.winhc.repal.model.cvt;
-
-import com.winhc.repal.entity.RepalBook;
-import com.winhc.repal.model.dto.RepalBookDTO;
-import com.winhc.repal.model.vo.RepalBookVO;
-import org.springframework.beans.BeanUtils;
-/**
- * @description RepalBook 对象转换类
- * @author Generator
- * @date 2022-04-08
- */
-public class RepalBookConvert {
-
-    public static RepalBook DTOToEntity(RepalBookDTO dto) {
-        RepalBook entity = new RepalBook();
-        BeanUtils.copyProperties(dto, entity);
-        return entity;
-    }
-
-    public static RepalBookVO EntityToVO(RepalBook entity) {
-        RepalBookVO vo = new RepalBookVO ();
-        BeanUtils.copyProperties(entity, vo);
-        return vo;
-    }
-}

+ 0 - 25
src/main/java/com/winhc/repal/model/cvt/RepalChangeRecordConvert.java

@@ -1,25 +0,0 @@
-package com.winhc.repal.model.cvt;
-
-import com.winhc.repal.entity.RepalChangeRecord;
-import com.winhc.repal.model.dto.RepalChangeRecordDTO;
-import com.winhc.repal.model.vo.RepalChangeRecordVO;
-import org.springframework.beans.BeanUtils;
-/**
- * @description RepalChangeRecord 对象转换类
- * @author Generator
- * @date 2022-04-08
- */
-public class RepalChangeRecordConvert {
-
-    public static RepalChangeRecord DTOToEntity(RepalChangeRecordDTO dto) {
-        RepalChangeRecord entity = new RepalChangeRecord();
-        BeanUtils.copyProperties(dto, entity);
-        return entity;
-    }
-
-    public static RepalChangeRecordVO EntityToVO(RepalChangeRecord entity) {
-        RepalChangeRecordVO vo = new RepalChangeRecordVO ();
-        BeanUtils.copyProperties(entity, vo);
-        return vo;
-    }
-}

+ 0 - 25
src/main/java/com/winhc/repal/model/cvt/RepalCustChargeRelConvert.java

@@ -1,25 +0,0 @@
-package com.winhc.repal.model.cvt;
-
-import com.winhc.repal.entity.RepalCustChargeRel;
-import com.winhc.repal.model.dto.RepalCustChargeRelDTO;
-import com.winhc.repal.model.vo.RepalCustChargeRelVO;
-import org.springframework.beans.BeanUtils;
-/**
- * @description RepalCustChargeRel 对象转换类
- * @author Generator
- * @date 2022-04-08
- */
-public class RepalCustChargeRelConvert {
-
-    public static RepalCustChargeRel DTOToEntity(RepalCustChargeRelDTO dto) {
-        RepalCustChargeRel entity = new RepalCustChargeRel();
-        BeanUtils.copyProperties(dto, entity);
-        return entity;
-    }
-
-    public static RepalCustChargeRelVO EntityToVO(RepalCustChargeRel entity) {
-        RepalCustChargeRelVO vo = new RepalCustChargeRelVO ();
-        BeanUtils.copyProperties(entity, vo);
-        return vo;
-    }
-}

+ 0 - 25
src/main/java/com/winhc/repal/model/cvt/RepalResponsiblePersonConvert.java

@@ -1,25 +0,0 @@
-package com.winhc.repal.model.cvt;
-
-import com.winhc.repal.entity.RepalResponsiblePerson;
-import com.winhc.repal.model.dto.RepalResponsiblePersonDTO;
-import com.winhc.repal.model.vo.RepalResponsiblePersonVO;
-import org.springframework.beans.BeanUtils;
-/**
- * @description RepalResponsiblePerson 对象转换类
- * @author Generator
- * @date 2022-04-08
- */
-public class RepalResponsiblePersonConvert {
-
-    public static RepalResponsiblePerson DTOToEntity(RepalResponsiblePersonDTO dto) {
-        RepalResponsiblePerson entity = new RepalResponsiblePerson();
-        BeanUtils.copyProperties(dto, entity);
-        return entity;
-    }
-
-    public static RepalResponsiblePersonVO EntityToVO(RepalResponsiblePerson entity) {
-        RepalResponsiblePersonVO vo = new RepalResponsiblePersonVO ();
-        BeanUtils.copyProperties(entity, vo);
-        return vo;
-    }
-}

+ 55 - 0
src/main/java/com/winhc/repal/model/dto/GetRepalBillPageDTO.java

@@ -0,0 +1,55 @@
+package com.winhc.repal.model.dto;
+
+import com.winhc.common.model.base.VOPage;
+import com.winhc.repal.model.bo.PageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * @Description: GetRepalBillPageDTO
+ * @Author: xda
+ * @Date: 2022/4/8 14:34
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("获取账本下的账款列表")
+public class GetRepalBillPageDTO extends PageRequest {
+
+    @ApiModelProperty("账本id")
+    private Long repalBookId;
+
+    @ApiModelProperty("排序类型。1日期升序。2日期降序。3总金额升序。4总金额降序")
+    private Integer sortedType;
+
+    @ApiModelProperty("到期时间,[1]今天, [2]本周, [3]本月, [4]本年")
+    private Integer overdueType;
+
+    @ApiModelProperty(value = "自定义开始日期yyyy-MM-dd,string")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDate;
+
+    @ApiModelProperty(value = "自定义结束日期yyyy-MM-dd,string")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDate;
+
+    @ApiModelProperty(value = "账款逾期状态,[1]进行中,[2]即将逾期(7天内),[3]已逾期.[4]已结清。[5]已终止")
+    private Integer overdueStatus;
+
+    @ApiModelProperty(value = "[1]风险预警。[2]财产提醒。[3]评级动态。[4]逾期动态")
+    private Integer dynamicType;
+
+    @ApiModelProperty(value = "评估等级,[ABCD]")
+    private String diagnosisGrade;
+
+
+
+
+
+
+
+}

+ 0 - 123
src/main/java/com/winhc/repal/model/dto/RepalBillDTO.java

@@ -1,123 +0,0 @@
-package com.winhc.repal.model.dto;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalBill DTO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalBill DTO对象", description="回款宝账款")
-public class RepalBillDTO {
-
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "回款宝账本id")
-    private Long repalBookId;
-
-    @ApiModelProperty(value = "账款总金额")
-    private BigDecimal totalMoney;
-
-    @ApiModelProperty(value = "账款当前应收金额")
-    private BigDecimal receivable;
-
-    @ApiModelProperty(value = "账款已收金额")
-    private BigDecimal receipt;
-
-    @ApiModelProperty(value = "账单状态,1进行中,2已逾期,3已收回,4已终止")
-    private Integer repalBillStatus;
-
-    @ApiModelProperty(value = "账款阶段")
-    private Integer repalBillStage;
-
-    @ApiModelProperty(value = "账款类型。1应收。2应付")
-    private Integer repalBillType;
-
-    @ApiModelProperty(value = "应收账款日期")
-    private LocalDate endDate;
-
-    @ApiModelProperty(value = "账款logo")
-    private String billLogo;
-
-    @ApiModelProperty(value = "账款标题")
-    private String billTitlle;
-
-    @ApiModelProperty(value = "账款备注")
-    private String billRemark;
-
-    @ApiModelProperty(value = "客户id")
-    private String customerId;
-
-    @ApiModelProperty(value = "客户name")
-    private String customerName;
-
-    @ApiModelProperty(value = "合同name")
-    private String contractName;
-
-    @ApiModelProperty(value = "合同到期日期")
-    private LocalDate contractEndDate;
-
-    @ApiModelProperty(value = "合同附件逗号分隔")
-    private String contractUrl;
-
-    @ApiModelProperty(value = "账单刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    private Integer refreshStatus;
-
-    @ApiModelProperty(value = "上次评估ID")
-    private Long preDiagnosisId;
-
-    @ApiModelProperty(value = "评估id")
-    private Long diagnosisId;
-
-    @ApiModelProperty(value = "上次评估等级")
-    private String preDiagnosisGrade;
-
-    @ApiModelProperty(value = "上次评估分数")
-    private BigDecimal preDiagnosisScore;
-
-    @ApiModelProperty(value = "上次评估时间")
-    private LocalDateTime preDiagnosisDatetime;
-
-    @ApiModelProperty(value = "评估等级")
-    private String diagnosisGrade;
-
-    @ApiModelProperty(value = "评估时间")
-    private LocalDateTime diagnosisDatetime;
-
-    @ApiModelProperty(value = "本次评估分数")
-    private BigDecimal diagnosisScore;
-
-    @ApiModelProperty(value = "趋势,1上升,2下降。0持平")
-    private Integer diagnosisTrend;
-
-    @ApiModelProperty(value = "提醒消息")
-    private String remindInfo;
-
-    @ApiModelProperty(value = "账款结清时间")
-    private LocalDateTime settleTime;
-
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime timeModified;
-
-
-}

+ 0 - 46
src/main/java/com/winhc/repal/model/dto/RepalBillOperLogDTO.java

@@ -1,46 +0,0 @@
-package com.winhc.repal.model.dto;
-
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalBillOperLog DTO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalBillOperLog DTO对象", description="回款宝账款操作表")
-public class RepalBillOperLogDTO {
-
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "动作代码")
-    private String actionCode;
-
-    @ApiModelProperty(value = "动作名称")
-    private String actionName;
-
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "业务类型")
-    private String bizType;
-
-    @ApiModelProperty(value = "业务ID")
-    private String bizId;
-
-    @ApiModelProperty(value = "操作内容")
-    private String actionContent;
-
-    @ApiModelProperty(value = "操作时间")
-    private LocalDateTime operTime;
-
-
-}

+ 0 - 55
src/main/java/com/winhc/repal/model/dto/RepalBookDTO.java

@@ -1,55 +0,0 @@
-package com.winhc.repal.model.dto;
-
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalBook DTO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalBook DTO对象", description="回款宝账本")
-public class RepalBookDTO {
-
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "收款公司name")
-    private String payeeName;
-
-    @ApiModelProperty(value = "首款公司logo")
-    private String payeeLogo;
-
-    @ApiModelProperty(value = "收款公司companyId")
-    private String payeeCompanyId;
-
-    @ApiModelProperty(value = "客户id")
-    private String customerId;
-
-    @ApiModelProperty(value = "客户name")
-    private String customerName;
-
-    @ApiModelProperty(value = "账本刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    private Integer refreshStatus;
-
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime timeModified;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    private Integer deleted;
-
-
-}

+ 0 - 62
src/main/java/com/winhc/repal/model/dto/RepalChangeRecordDTO.java

@@ -1,62 +0,0 @@
-package com.winhc.repal.model.dto;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalChangeRecord DTO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalChangeRecord DTO对象", description="回款宝账款收付款记录表")
-public class RepalChangeRecordDTO {
-
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "账本id")
-    private Long repalBookId;
-
-    @ApiModelProperty(value = "账款id")
-    private Long repalBillId;
-
-    @ApiModelProperty(value = "剩余金额=preMoney-receiptMoney")
-    private BigDecimal afterMoney;
-
-    @ApiModelProperty(value = "收回金额/已付金额")
-    private BigDecimal transMoney;
-
-    @ApiModelProperty(value = "收回前金额/应付前金额")
-    private BigDecimal preMoney;
-
-    @ApiModelProperty(value = "操作人id")
-    private Long operUserId;
-
-    @ApiModelProperty(value = "操作人name")
-    private String operUserName;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "附件url,逗号分隔")
-    private String fileUrl;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "")
-    private LocalDateTime timeModified;
-
-
-}

+ 0 - 29
src/main/java/com/winhc/repal/model/dto/RepalCustChargeRelDTO.java

@@ -1,29 +0,0 @@
-package com.winhc.repal.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalCustChargeRel DTO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalCustChargeRel DTO对象", description="客户-负责人-关系表")
-public class RepalCustChargeRelDTO {
-
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "客户id")
-    private Long custId;
-
-    @ApiModelProperty(value = "负责人id")
-    private Long memberId;
-
-
-}

+ 0 - 32
src/main/java/com/winhc/repal/model/dto/RepalResponsiblePersonDTO.java

@@ -1,32 +0,0 @@
-package com.winhc.repal.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalResponsiblePerson DTO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalResponsiblePerson DTO对象", description="回款宝账款负责人表")
-public class RepalResponsiblePersonDTO {
-
-
-    @ApiModelProperty(value = "主键id")
-    private Long id;
-
-    @ApiModelProperty(value = "账本id")
-    private Long repalBookId;
-
-    @ApiModelProperty(value = "账款id")
-    private Long repalBillId;
-
-    @ApiModelProperty(value = "责任人id")
-    private Long userId;
-
-
-}

+ 0 - 45
src/main/java/com/winhc/repal/model/vo/RepalBillOperLogVO.java

@@ -1,45 +0,0 @@
-package com.winhc.repal.model.vo;
-
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalBillOperLog VO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalBillOperLog VO对象", description="回款宝账款操作表")
-public class RepalBillOperLogVO {
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "动作代码")
-    private String actionCode;
-
-    @ApiModelProperty(value = "动作名称")
-    private String actionName;
-
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "业务类型")
-    private String bizType;
-
-    @ApiModelProperty(value = "业务ID")
-    private String bizId;
-
-    @ApiModelProperty(value = "操作内容")
-    private String actionContent;
-
-    @ApiModelProperty(value = "操作时间")
-    private LocalDateTime operTime;
-
-
-}

+ 61 - 0
src/main/java/com/winhc/repal/model/vo/RepalBillPageVO.java

@@ -0,0 +1,61 @@
+package com.winhc.repal.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Description: RepalBillPageVO
+ * @Author: xda
+ * @Date: 2022/4/8 11:13
+ */
+@Data
+@ApiModel("账款分页对象")
+public class RepalBillPageVO {
+
+    @ApiModelProperty(value = "账款id")
+    private Long repalBillId;
+
+    @ApiModelProperty(value = "账本id")
+    private Long repalBookId;
+
+    @ApiModelProperty(value = "账款逾期状态,1进行中,2三天后到期,3已逾期.4已结清。5已终止")
+    private Integer repalOverdueStatus;
+
+    @ApiModelProperty(value = "本次评估等级")
+    private String diagnosisGrade;
+
+    @ApiModelProperty(value = "本次评估分数趋势,1上升,2下降。0持平")
+    private Integer diagnosisScoreTrend;
+
+    @ApiModelProperty(value = "本次评估分数")
+    private String diagnosisScore;
+
+    @ApiModelProperty("动态countList")
+    private List<Integer> dynamicCountList;
+
+    @ApiModelProperty("到期日期,字符串,格式yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDate;
+
+    @ApiModelProperty(value = "客户性质 1企业 2个人 3政府事业单位")
+    private Integer custProperty;
+
+    @ApiModelProperty(value = "客户名称")
+    private String custName;
+
+    @ApiModelProperty(value = "账款总金额")
+    private String totalMoneyStr;
+
+    @ApiModelProperty(value = "待收金额/待付金额")
+    private String receivableMoneyStr;
+
+    @ApiModelProperty(value = "负责人name,、分隔")
+    private String responsiblePersonNames;
+
+
+}

+ 0 - 122
src/main/java/com/winhc/repal/model/vo/RepalBillVO.java

@@ -1,122 +0,0 @@
-package com.winhc.repal.model.vo;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalBill VO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalBill VO对象", description="回款宝账款")
-public class RepalBillVO {
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "回款宝账本id")
-    private Long repalBookId;
-
-    @ApiModelProperty(value = "账款总金额")
-    private BigDecimal totalMoney;
-
-    @ApiModelProperty(value = "账款当前应收金额")
-    private BigDecimal receivable;
-
-    @ApiModelProperty(value = "账款已收金额")
-    private BigDecimal receipt;
-
-    @ApiModelProperty(value = "账单状态,1进行中,2已逾期,3已收回,4已终止")
-    private Integer repalBillStatus;
-
-    @ApiModelProperty(value = "账款阶段")
-    private Integer repalBillStage;
-
-    @ApiModelProperty(value = "账款类型。1应收。2应付")
-    private Integer repalBillType;
-
-    @ApiModelProperty(value = "应收账款日期")
-    private LocalDate endDate;
-
-    @ApiModelProperty(value = "账款logo")
-    private String billLogo;
-
-    @ApiModelProperty(value = "账款标题")
-    private String billTitlle;
-
-    @ApiModelProperty(value = "账款备注")
-    private String billRemark;
-
-    @ApiModelProperty(value = "客户id")
-    private String customerId;
-
-    @ApiModelProperty(value = "客户name")
-    private String customerName;
-
-    @ApiModelProperty(value = "合同name")
-    private String contractName;
-
-    @ApiModelProperty(value = "合同到期日期")
-    private LocalDate contractEndDate;
-
-    @ApiModelProperty(value = "合同附件逗号分隔")
-    private String contractUrl;
-
-    @ApiModelProperty(value = "账单刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    private Integer refreshStatus;
-
-    @ApiModelProperty(value = "上次评估ID")
-    private Long preDiagnosisId;
-
-    @ApiModelProperty(value = "评估id")
-    private Long diagnosisId;
-
-    @ApiModelProperty(value = "上次评估等级")
-    private String preDiagnosisGrade;
-
-    @ApiModelProperty(value = "上次评估分数")
-    private BigDecimal preDiagnosisScore;
-
-    @ApiModelProperty(value = "上次评估时间")
-    private LocalDateTime preDiagnosisDatetime;
-
-    @ApiModelProperty(value = "评估等级")
-    private String diagnosisGrade;
-
-    @ApiModelProperty(value = "评估时间")
-    private LocalDateTime diagnosisDatetime;
-
-    @ApiModelProperty(value = "本次评估分数")
-    private BigDecimal diagnosisScore;
-
-    @ApiModelProperty(value = "趋势,1上升,2下降。0持平")
-    private Integer diagnosisTrend;
-
-    @ApiModelProperty(value = "提醒消息")
-    private String remindInfo;
-
-    @ApiModelProperty(value = "账款结清时间")
-    private LocalDateTime settleTime;
-
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime timeModified;
-
-
-}

+ 0 - 54
src/main/java/com/winhc/repal/model/vo/RepalBookVO.java

@@ -1,54 +0,0 @@
-package com.winhc.repal.model.vo;
-
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalBook VO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalBook VO对象", description="回款宝账本")
-public class RepalBookVO {
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "收款公司name")
-    private String payeeName;
-
-    @ApiModelProperty(value = "首款公司logo")
-    private String payeeLogo;
-
-    @ApiModelProperty(value = "收款公司companyId")
-    private String payeeCompanyId;
-
-    @ApiModelProperty(value = "客户id")
-    private String customerId;
-
-    @ApiModelProperty(value = "客户name")
-    private String customerName;
-
-    @ApiModelProperty(value = "账本刷新状态。1未刷新,2刷新中,3已刷新,0刷新失败")
-    private Integer refreshStatus;
-
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime timeModified;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    private Integer deleted;
-
-
-}

+ 0 - 61
src/main/java/com/winhc/repal/model/vo/RepalChangeRecordVO.java

@@ -1,61 +0,0 @@
-package com.winhc.repal.model.vo;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalChangeRecord VO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalChangeRecord VO对象", description="回款宝账款收付款记录表")
-public class RepalChangeRecordVO {
-
-    @ApiModelProperty(value = "")
-    private Long id;
-
-    @ApiModelProperty(value = "账本id")
-    private Long repalBookId;
-
-    @ApiModelProperty(value = "账款id")
-    private Long repalBillId;
-
-    @ApiModelProperty(value = "剩余金额=preMoney-receiptMoney")
-    private BigDecimal afterMoney;
-
-    @ApiModelProperty(value = "收回金额/已付金额")
-    private BigDecimal transMoney;
-
-    @ApiModelProperty(value = "收回前金额/应付前金额")
-    private BigDecimal preMoney;
-
-    @ApiModelProperty(value = "操作人id")
-    private Long operUserId;
-
-    @ApiModelProperty(value = "操作人name")
-    private String operUserName;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "附件url,逗号分隔")
-    private String fileUrl;
-
-    @ApiModelProperty(value = "是否删除,1删除。0否")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "")
-    private LocalDateTime timeCreated;
-
-    @ApiModelProperty(value = "")
-    private LocalDateTime timeModified;
-
-
-}

+ 0 - 28
src/main/java/com/winhc/repal/model/vo/RepalCustChargeRelVO.java

@@ -1,28 +0,0 @@
-package com.winhc.repal.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalCustChargeRel VO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalCustChargeRel VO对象", description="客户-负责人-关系表")
-public class RepalCustChargeRelVO {
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "客户id")
-    private Long custId;
-
-    @ApiModelProperty(value = "负责人id")
-    private Long memberId;
-
-
-}

+ 0 - 31
src/main/java/com/winhc/repal/model/vo/RepalResponsiblePersonVO.java

@@ -1,31 +0,0 @@
-package com.winhc.repal.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @description RepalResponsiblePerson VO对象
- * @author Generator
- * @date 2022-04-08
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value="RepalResponsiblePerson VO对象", description="回款宝账款负责人表")
-public class RepalResponsiblePersonVO {
-
-    @ApiModelProperty(value = "主键id")
-    private Long id;
-
-    @ApiModelProperty(value = "账本id")
-    private Long repalBookId;
-
-    @ApiModelProperty(value = "账款id")
-    private Long repalBillId;
-
-    @ApiModelProperty(value = "责任人id")
-    private Long userId;
-
-
-}

+ 0 - 33
src/main/java/com/winhc/repal/service/RadarService.java

@@ -1,33 +0,0 @@
-//package com.winhc.returnmoney.service;
-//
-//import AccountBillPayer;
-//import com.winhc.returnmoney.model.dto.RadarRtaDTO;
-//import org.springframework.web.bind.annotation.RequestParam;
-//
-//import java.util.List;
-//
-///**
-// * @Description: RadarService
-// * @Author: xda
-// * @Date: 2020/12/18 15:39
-// */
-//public interface RadarService {
-//
-//    /**
-//     * 添加监控
-//     * @param payerList payerList
-//     * @return java.lang.Boolean
-//     * @author xda
-//     * @date 2020/12/18 15:40
-//     */
-//    Boolean addRadarRecord(List<AccountBillPayer> payerList);
-//
-//    /**
-//     * 取消监控,只需要bizId和type
-//     * @param dtoList dtoList
-//     * @return java.lang.Boolean
-//     * @author xda
-//     * @date 2020/12/31 09:01
-//     */
-//    Boolean cancelReleats(List<RadarRtaDTO> dtoList);
-//}

+ 1 - 45
src/main/java/com/winhc/repal/service/RepalBillOperLogService.java

@@ -1,11 +1,7 @@
 package com.winhc.repal.service;
 
-import com.winhc.repal.entity.RepalBillOperLog;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalBillOperLogDTO;
-import com.winhc.repal.model.vo.RepalBillOperLogVO;
-import java.util.List;
+import com.winhc.repal.entity.RepalBillOperLog;
 
 
 /**
@@ -15,45 +11,5 @@ import java.util.List;
  */
 public interface RepalBillOperLogService extends IService<RepalBillOperLog> {
 
-    /**
-    * add RepalBillOperLog
-    * @param dto data transfer object
-    */
-    void add(RepalBillOperLogDTO dto);
-
-    /**
-    * update RepalBillOperLog
-    * @param id key
-    * @param dto data transfer object
-    */
-    void update(Long id, RepalBillOperLogDTO dto);
-
-    /**
-    * delete RepalBillOperLog
-    * @param id key
-    */
-    void delete(Long id);
-
-    /**
-    * find RepalBillOperLog
-    * @param id key
-    * @return RepalBillOperLog
-    */
-    RepalBillOperLogVO find(Long id);
-
-    /**
-    * find RepalBillOperLog list
-    * @param dto data transfer object
-    * @return list of RepalBillOperLog
-    */
-    List<RepalBillOperLogVO> find(RepalBillOperLogDTO dto);
 
-     /**
-     * find RepalBillOperLog page
-     * @param dto data transfer object
-     * @param pageNum page number
-     * @param pageSize page size
-     * @return page of RepalBillOperLog
-     */
-     VOPage<RepalBillOperLogVO> find(RepalBillOperLogDTO dto, Integer pageNum, Integer pageSize);
 }

+ 9 - 43
src/main/java/com/winhc/repal/service/RepalBillService.java

@@ -1,11 +1,10 @@
 package com.winhc.repal.service;
 
-import com.winhc.repal.entity.RepalBill;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalBillDTO;
-import com.winhc.repal.model.vo.RepalBillVO;
-import java.util.List;
+import com.winhc.repal.entity.RepalBill;
+import com.winhc.repal.model.dto.GetRepalBillPageDTO;
+import com.winhc.repal.model.vo.RepalBillPageVO;
 
 
 /**
@@ -16,44 +15,11 @@ import java.util.List;
 public interface RepalBillService extends IService<RepalBill> {
 
     /**
-    * add RepalBill
-    * @param dto data transfer object
-    */
-    void add(RepalBillDTO dto);
-
-    /**
-    * update RepalBill
-    * @param id key
-    * @param dto data transfer object
-    */
-    void update(Long id, RepalBillDTO dto);
-
-    /**
-    * delete RepalBill
-    * @param id key
-    */
-    void delete(Long id);
-
-    /**
-    * find RepalBill
-    * @param id key
-    * @return RepalBill
-    */
-    RepalBillVO find(Long id);
-
-    /**
-    * find RepalBill list
-    * @param dto data transfer object
-    * @return list of RepalBill
-    */
-    List<RepalBillVO> find(RepalBillDTO dto);
-
-     /**
-     * find RepalBill page
-     * @param dto data transfer object
-     * @param pageNum page number
-     * @param pageSize page size
-     * @return page of RepalBill
+     * 应收/应付分页列表
+     * @param dto dto
+     * @return com.winhc.common.model.base.VOPage<com.winhc.repal.model.vo.RepalBillPageVO>
+     * @author xda
+     * @date 2022/4/8 15:16
      */
-     VOPage<RepalBillVO> find(RepalBillDTO dto, Integer pageNum, Integer pageSize);
+    VOPage<RepalBillPageVO> getRepalBillPage(GetRepalBillPageDTO dto);
 }

+ 1 - 44
src/main/java/com/winhc/repal/service/RepalBookService.java

@@ -1,11 +1,7 @@
 package com.winhc.repal.service;
 
-import com.winhc.repal.entity.RepalBook;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalBookDTO;
-import com.winhc.repal.model.vo.RepalBookVO;
-import java.util.List;
+import com.winhc.repal.entity.RepalBook;
 
 
 /**
@@ -15,45 +11,6 @@ import java.util.List;
  */
 public interface RepalBookService extends IService<RepalBook> {
 
-    /**
-    * add RepalBook
-    * @param dto data transfer object
-    */
-    void add(RepalBookDTO dto);
-
-    /**
-    * update RepalBook
-    * @param id key
-    * @param dto data transfer object
-    */
-    void update(Long id, RepalBookDTO dto);
-
-    /**
-    * delete RepalBook
-    * @param id key
-    */
-    void delete(Long id);
-
-    /**
-    * find RepalBook
-    * @param id key
-    * @return RepalBook
-    */
-    RepalBookVO find(Long id);
 
-    /**
-    * find RepalBook list
-    * @param dto data transfer object
-    * @return list of RepalBook
-    */
-    List<RepalBookVO> find(RepalBookDTO dto);
 
-     /**
-     * find RepalBook page
-     * @param dto data transfer object
-     * @param pageNum page number
-     * @param pageSize page size
-     * @return page of RepalBook
-     */
-     VOPage<RepalBookVO> find(RepalBookDTO dto, Integer pageNum, Integer pageSize);
 }

+ 1 - 45
src/main/java/com/winhc/repal/service/RepalChangeRecordService.java

@@ -1,11 +1,7 @@
 package com.winhc.repal.service;
 
-import com.winhc.repal.entity.RepalChangeRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalChangeRecordDTO;
-import com.winhc.repal.model.vo.RepalChangeRecordVO;
-import java.util.List;
+import com.winhc.repal.entity.RepalChangeRecord;
 
 
 /**
@@ -15,45 +11,5 @@ import java.util.List;
  */
 public interface RepalChangeRecordService extends IService<RepalChangeRecord> {
 
-    /**
-    * add RepalChangeRecord
-    * @param dto data transfer object
-    */
-    void add(RepalChangeRecordDTO dto);
-
-    /**
-    * update RepalChangeRecord
-    * @param id key
-    * @param dto data transfer object
-    */
-    void update(Long id, RepalChangeRecordDTO dto);
-
-    /**
-    * delete RepalChangeRecord
-    * @param id key
-    */
-    void delete(Long id);
-
-    /**
-    * find RepalChangeRecord
-    * @param id key
-    * @return RepalChangeRecord
-    */
-    RepalChangeRecordVO find(Long id);
-
-    /**
-    * find RepalChangeRecord list
-    * @param dto data transfer object
-    * @return list of RepalChangeRecord
-    */
-    List<RepalChangeRecordVO> find(RepalChangeRecordDTO dto);
 
-     /**
-     * find RepalChangeRecord page
-     * @param dto data transfer object
-     * @param pageNum page number
-     * @param pageSize page size
-     * @return page of RepalChangeRecord
-     */
-     VOPage<RepalChangeRecordVO> find(RepalChangeRecordDTO dto, Integer pageNum, Integer pageSize);
 }

+ 1 - 45
src/main/java/com/winhc/repal/service/RepalCustChargeRelService.java

@@ -1,11 +1,7 @@
 package com.winhc.repal.service;
 
-import com.winhc.repal.entity.RepalCustChargeRel;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalCustChargeRelDTO;
-import com.winhc.repal.model.vo.RepalCustChargeRelVO;
-import java.util.List;
+import com.winhc.repal.entity.RepalCustChargeRel;
 
 
 /**
@@ -15,45 +11,5 @@ import java.util.List;
  */
 public interface RepalCustChargeRelService extends IService<RepalCustChargeRel> {
 
-    /**
-    * add RepalCustChargeRel
-    * @param dto data transfer object
-    */
-    void add(RepalCustChargeRelDTO dto);
-
-    /**
-    * update RepalCustChargeRel
-    * @param id key
-    * @param dto data transfer object
-    */
-    void update(Integer id, RepalCustChargeRelDTO dto);
-
-    /**
-    * delete RepalCustChargeRel
-    * @param id key
-    */
-    void delete(Integer id);
-
-    /**
-    * find RepalCustChargeRel
-    * @param id key
-    * @return RepalCustChargeRel
-    */
-    RepalCustChargeRelVO find(Integer id);
-
-    /**
-    * find RepalCustChargeRel list
-    * @param dto data transfer object
-    * @return list of RepalCustChargeRel
-    */
-    List<RepalCustChargeRelVO> find(RepalCustChargeRelDTO dto);
 
-     /**
-     * find RepalCustChargeRel page
-     * @param dto data transfer object
-     * @param pageNum page number
-     * @param pageSize page size
-     * @return page of RepalCustChargeRel
-     */
-     VOPage<RepalCustChargeRelVO> find(RepalCustChargeRelDTO dto, Integer pageNum, Integer pageSize);
 }

+ 1 - 45
src/main/java/com/winhc/repal/service/RepalResponsiblePersonService.java

@@ -1,11 +1,7 @@
 package com.winhc.repal.service;
 
-import com.winhc.repal.entity.RepalResponsiblePerson;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalResponsiblePersonDTO;
-import com.winhc.repal.model.vo.RepalResponsiblePersonVO;
-import java.util.List;
+import com.winhc.repal.entity.RepalResponsiblePerson;
 
 
 /**
@@ -15,45 +11,5 @@ import java.util.List;
  */
 public interface RepalResponsiblePersonService extends IService<RepalResponsiblePerson> {
 
-    /**
-    * add RepalResponsiblePerson
-    * @param dto data transfer object
-    */
-    void add(RepalResponsiblePersonDTO dto);
-
-    /**
-    * update RepalResponsiblePerson
-    * @param id key
-    * @param dto data transfer object
-    */
-    void update(Long id, RepalResponsiblePersonDTO dto);
-
-    /**
-    * delete RepalResponsiblePerson
-    * @param id key
-    */
-    void delete(Long id);
-
-    /**
-    * find RepalResponsiblePerson
-    * @param id key
-    * @return RepalResponsiblePerson
-    */
-    RepalResponsiblePersonVO find(Long id);
-
-    /**
-    * find RepalResponsiblePerson list
-    * @param dto data transfer object
-    * @return list of RepalResponsiblePerson
-    */
-    List<RepalResponsiblePersonVO> find(RepalResponsiblePersonDTO dto);
 
-     /**
-     * find RepalResponsiblePerson page
-     * @param dto data transfer object
-     * @param pageNum page number
-     * @param pageSize page size
-     * @return page of RepalResponsiblePerson
-     */
-     VOPage<RepalResponsiblePersonVO> find(RepalResponsiblePersonDTO dto, Integer pageNum, Integer pageSize);
 }

+ 1 - 43
src/main/java/com/winhc/repal/service/impl/RepalBillOperLogServiceImpl.java

@@ -1,21 +1,10 @@
 package com.winhc.repal.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.winhc.repal.entity.RepalBillOperLog;
 import com.winhc.repal.repository.RepalBillOperLogMapper;
 import com.winhc.repal.service.RepalBillOperLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalBillOperLogDTO;
-import com.winhc.repal.model.cvt.RepalBillOperLogConvert;
-import com.winhc.repal.model.vo.RepalBillOperLogVO;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @description RepalBillOperLog 接口实现类
@@ -25,36 +14,5 @@ import java.util.stream.Collectors;
 @Service
 public class RepalBillOperLogServiceImpl extends ServiceImpl<RepalBillOperLogMapper, RepalBillOperLog> implements RepalBillOperLogService {
 
-    @Override
-    public void add(RepalBillOperLogDTO dto) {
-        save(RepalBillOperLogConvert.DTOToEntity(dto));
-    }
-
-    @Override
-    public void update(Long id, RepalBillOperLogDTO dto) {
-        update(RepalBillOperLogConvert.DTOToEntity(dto),new UpdateWrapper<RepalBillOperLog>().lambda().eq(RepalBillOperLog::getId,id));
-    }
-
-    @Override
-    public void delete(Long id) {
-        removeById(id);
-    }
-
-    @Override
-    public RepalBillOperLogVO find(Long id) {
-        return RepalBillOperLogConvert.EntityToVO(getById(id));
-    }
-
-    @Override
-    public List<RepalBillOperLogVO> find(RepalBillOperLogDTO dto) {
-        return list(new QueryWrapper<>(RepalBillOperLogConvert.DTOToEntity(dto))).stream().map(RepalBillOperLogConvert::EntityToVO)
-                 .collect(Collectors.toList());
-    }
 
-     @Override
-     public VOPage<RepalBillOperLogVO> find(RepalBillOperLogDTO dto, Integer pageNum, Integer pageSize) {
-         IPage<RepalBillOperLog> pageRepalBillOperLog = page(new Page<>(pageNum, pageSize), new QueryWrapper<>(RepalBillOperLogConvert.DTOToEntity(dto)));
-         return new VOPage<>(pageNum,pageSize,pageRepalBillOperLog.getTotal(), pageRepalBillOperLog.getRecords().stream()
-                 .map(RepalBillOperLogConvert::EntityToVO).collect(Collectors.toList()));
-    }
 }

+ 6 - 41
src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -1,21 +1,13 @@
 package com.winhc.repal.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.common.model.base.VOPage;
 import com.winhc.repal.entity.RepalBill;
+import com.winhc.repal.model.dto.GetRepalBillPageDTO;
+import com.winhc.repal.model.vo.RepalBillPageVO;
 import com.winhc.repal.repository.RepalBillMapper;
 import com.winhc.repal.service.RepalBillService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalBillDTO;
-import com.winhc.repal.model.cvt.RepalBillConvert;
-import com.winhc.repal.model.vo.RepalBillVO;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @description RepalBill 接口实现类
@@ -25,36 +17,9 @@ import java.util.stream.Collectors;
 @Service
 public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill> implements RepalBillService {
 
-    @Override
-    public void add(RepalBillDTO dto) {
-        save(RepalBillConvert.DTOToEntity(dto));
-    }
-
-    @Override
-    public void update(Long id, RepalBillDTO dto) {
-        update(RepalBillConvert.DTOToEntity(dto),new UpdateWrapper<RepalBill>().lambda().eq(RepalBill::getId,id));
-    }
-
-    @Override
-    public void delete(Long id) {
-        removeById(id);
-    }
 
     @Override
-    public RepalBillVO find(Long id) {
-        return RepalBillConvert.EntityToVO(getById(id));
-    }
-
-    @Override
-    public List<RepalBillVO> find(RepalBillDTO dto) {
-        return list(new QueryWrapper<>(RepalBillConvert.DTOToEntity(dto))).stream().map(RepalBillConvert::EntityToVO)
-                 .collect(Collectors.toList());
-    }
-
-     @Override
-     public VOPage<RepalBillVO> find(RepalBillDTO dto, Integer pageNum, Integer pageSize) {
-         IPage<RepalBill> pageRepalBill = page(new Page<>(pageNum, pageSize), new QueryWrapper<>(RepalBillConvert.DTOToEntity(dto)));
-         return new VOPage<>(pageNum,pageSize,pageRepalBill.getTotal(), pageRepalBill.getRecords().stream()
-                 .map(RepalBillConvert::EntityToVO).collect(Collectors.toList()));
+    public VOPage<RepalBillPageVO> getRepalBillPage(GetRepalBillPageDTO dto) {
+        return null;
     }
 }

+ 1 - 43
src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java

@@ -1,21 +1,10 @@
 package com.winhc.repal.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.winhc.repal.entity.RepalBook;
 import com.winhc.repal.repository.RepalBookMapper;
 import com.winhc.repal.service.RepalBookService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalBookDTO;
-import com.winhc.repal.model.cvt.RepalBookConvert;
-import com.winhc.repal.model.vo.RepalBookVO;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @description RepalBook 接口实现类
@@ -25,36 +14,5 @@ import java.util.stream.Collectors;
 @Service
 public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook> implements RepalBookService {
 
-    @Override
-    public void add(RepalBookDTO dto) {
-        save(RepalBookConvert.DTOToEntity(dto));
-    }
-
-    @Override
-    public void update(Long id, RepalBookDTO dto) {
-        update(RepalBookConvert.DTOToEntity(dto),new UpdateWrapper<RepalBook>().lambda().eq(RepalBook::getId,id));
-    }
-
-    @Override
-    public void delete(Long id) {
-        removeById(id);
-    }
-
-    @Override
-    public RepalBookVO find(Long id) {
-        return RepalBookConvert.EntityToVO(getById(id));
-    }
-
-    @Override
-    public List<RepalBookVO> find(RepalBookDTO dto) {
-        return list(new QueryWrapper<>(RepalBookConvert.DTOToEntity(dto))).stream().map(RepalBookConvert::EntityToVO)
-                 .collect(Collectors.toList());
-    }
 
-     @Override
-     public VOPage<RepalBookVO> find(RepalBookDTO dto, Integer pageNum, Integer pageSize) {
-         IPage<RepalBook> pageRepalBook = page(new Page<>(pageNum, pageSize), new QueryWrapper<>(RepalBookConvert.DTOToEntity(dto)));
-         return new VOPage<>(pageNum,pageSize,pageRepalBook.getTotal(), pageRepalBook.getRecords().stream()
-                 .map(RepalBookConvert::EntityToVO).collect(Collectors.toList()));
-    }
 }

+ 1 - 43
src/main/java/com/winhc/repal/service/impl/RepalChangeRecordServiceImpl.java

@@ -1,21 +1,10 @@
 package com.winhc.repal.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.winhc.repal.entity.RepalChangeRecord;
 import com.winhc.repal.repository.RepalChangeRecordMapper;
 import com.winhc.repal.service.RepalChangeRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalChangeRecordDTO;
-import com.winhc.repal.model.cvt.RepalChangeRecordConvert;
-import com.winhc.repal.model.vo.RepalChangeRecordVO;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @description RepalChangeRecord 接口实现类
@@ -25,36 +14,5 @@ import java.util.stream.Collectors;
 @Service
 public class RepalChangeRecordServiceImpl extends ServiceImpl<RepalChangeRecordMapper, RepalChangeRecord> implements RepalChangeRecordService {
 
-    @Override
-    public void add(RepalChangeRecordDTO dto) {
-        save(RepalChangeRecordConvert.DTOToEntity(dto));
-    }
-
-    @Override
-    public void update(Long id, RepalChangeRecordDTO dto) {
-        update(RepalChangeRecordConvert.DTOToEntity(dto),new UpdateWrapper<RepalChangeRecord>().lambda().eq(RepalChangeRecord::getId,id));
-    }
-
-    @Override
-    public void delete(Long id) {
-        removeById(id);
-    }
-
-    @Override
-    public RepalChangeRecordVO find(Long id) {
-        return RepalChangeRecordConvert.EntityToVO(getById(id));
-    }
-
-    @Override
-    public List<RepalChangeRecordVO> find(RepalChangeRecordDTO dto) {
-        return list(new QueryWrapper<>(RepalChangeRecordConvert.DTOToEntity(dto))).stream().map(RepalChangeRecordConvert::EntityToVO)
-                 .collect(Collectors.toList());
-    }
 
-     @Override
-     public VOPage<RepalChangeRecordVO> find(RepalChangeRecordDTO dto, Integer pageNum, Integer pageSize) {
-         IPage<RepalChangeRecord> pageRepalChangeRecord = page(new Page<>(pageNum, pageSize), new QueryWrapper<>(RepalChangeRecordConvert.DTOToEntity(dto)));
-         return new VOPage<>(pageNum,pageSize,pageRepalChangeRecord.getTotal(), pageRepalChangeRecord.getRecords().stream()
-                 .map(RepalChangeRecordConvert::EntityToVO).collect(Collectors.toList()));
-    }
 }

+ 1 - 43
src/main/java/com/winhc/repal/service/impl/RepalCustChargeRelServiceImpl.java

@@ -1,21 +1,10 @@
 package com.winhc.repal.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.winhc.repal.entity.RepalCustChargeRel;
 import com.winhc.repal.repository.RepalCustChargeRelMapper;
 import com.winhc.repal.service.RepalCustChargeRelService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalCustChargeRelDTO;
-import com.winhc.repal.model.cvt.RepalCustChargeRelConvert;
-import com.winhc.repal.model.vo.RepalCustChargeRelVO;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @description RepalCustChargeRel 接口实现类
@@ -25,36 +14,5 @@ import java.util.stream.Collectors;
 @Service
 public class RepalCustChargeRelServiceImpl extends ServiceImpl<RepalCustChargeRelMapper, RepalCustChargeRel> implements RepalCustChargeRelService {
 
-    @Override
-    public void add(RepalCustChargeRelDTO dto) {
-        save(RepalCustChargeRelConvert.DTOToEntity(dto));
-    }
-
-    @Override
-    public void update(Integer id, RepalCustChargeRelDTO dto) {
-        update(RepalCustChargeRelConvert.DTOToEntity(dto),new UpdateWrapper<RepalCustChargeRel>().lambda().eq(RepalCustChargeRel::getId,id));
-    }
-
-    @Override
-    public void delete(Integer id) {
-        removeById(id);
-    }
-
-    @Override
-    public RepalCustChargeRelVO find(Integer id) {
-        return RepalCustChargeRelConvert.EntityToVO(getById(id));
-    }
-
-    @Override
-    public List<RepalCustChargeRelVO> find(RepalCustChargeRelDTO dto) {
-        return list(new QueryWrapper<>(RepalCustChargeRelConvert.DTOToEntity(dto))).stream().map(RepalCustChargeRelConvert::EntityToVO)
-                 .collect(Collectors.toList());
-    }
 
-     @Override
-     public VOPage<RepalCustChargeRelVO> find(RepalCustChargeRelDTO dto, Integer pageNum, Integer pageSize) {
-         IPage<RepalCustChargeRel> pageRepalCustChargeRel = page(new Page<>(pageNum, pageSize), new QueryWrapper<>(RepalCustChargeRelConvert.DTOToEntity(dto)));
-         return new VOPage<>(pageNum,pageSize,pageRepalCustChargeRel.getTotal(), pageRepalCustChargeRel.getRecords().stream()
-                 .map(RepalCustChargeRelConvert::EntityToVO).collect(Collectors.toList()));
-    }
 }

+ 1 - 43
src/main/java/com/winhc/repal/service/impl/RepalResponsiblePersonServiceImpl.java

@@ -1,21 +1,10 @@
 package com.winhc.repal.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.winhc.repal.entity.RepalResponsiblePerson;
 import com.winhc.repal.repository.RepalResponsiblePersonMapper;
 import com.winhc.repal.service.RepalResponsiblePersonService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.winhc.common.model.base.VOPage;
-import com.winhc.repal.model.dto.RepalResponsiblePersonDTO;
-import com.winhc.repal.model.cvt.RepalResponsiblePersonConvert;
-import com.winhc.repal.model.vo.RepalResponsiblePersonVO;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @description RepalResponsiblePerson 接口实现类
@@ -25,36 +14,5 @@ import java.util.stream.Collectors;
 @Service
 public class RepalResponsiblePersonServiceImpl extends ServiceImpl<RepalResponsiblePersonMapper, RepalResponsiblePerson> implements RepalResponsiblePersonService {
 
-    @Override
-    public void add(RepalResponsiblePersonDTO dto) {
-        save(RepalResponsiblePersonConvert.DTOToEntity(dto));
-    }
-
-    @Override
-    public void update(Long id, RepalResponsiblePersonDTO dto) {
-        update(RepalResponsiblePersonConvert.DTOToEntity(dto),new UpdateWrapper<RepalResponsiblePerson>().lambda().eq(RepalResponsiblePerson::getId,id));
-    }
-
-    @Override
-    public void delete(Long id) {
-        removeById(id);
-    }
-
-    @Override
-    public RepalResponsiblePersonVO find(Long id) {
-        return RepalResponsiblePersonConvert.EntityToVO(getById(id));
-    }
-
-    @Override
-    public List<RepalResponsiblePersonVO> find(RepalResponsiblePersonDTO dto) {
-        return list(new QueryWrapper<>(RepalResponsiblePersonConvert.DTOToEntity(dto))).stream().map(RepalResponsiblePersonConvert::EntityToVO)
-                 .collect(Collectors.toList());
-    }
 
-     @Override
-     public VOPage<RepalResponsiblePersonVO> find(RepalResponsiblePersonDTO dto, Integer pageNum, Integer pageSize) {
-         IPage<RepalResponsiblePerson> pageRepalResponsiblePerson = page(new Page<>(pageNum, pageSize), new QueryWrapper<>(RepalResponsiblePersonConvert.DTOToEntity(dto)));
-         return new VOPage<>(pageNum,pageSize,pageRepalResponsiblePerson.getTotal(), pageRepalResponsiblePerson.getRecords().stream()
-                 .map(RepalResponsiblePersonConvert::EntityToVO).collect(Collectors.toList()));
-    }
 }

+ 1 - 1
src/main/java/com/winhc/repal/util/ThreadPoolUtil.java

@@ -47,7 +47,7 @@ public class ThreadPoolUtil {
                 TimeUnit.SECONDS,
                 new LinkedBlockingQueue<>(),
                 (r -> {
-                    Thread thread = new Thread(r, "ReturnMoneyService_ThreadPool_" + ATOMIC_INTEGER.getAndIncrement());
+                    Thread thread = new Thread(r, "RepalService_ThreadPool_" + ATOMIC_INTEGER.getAndIncrement());
                     thread.setPriority(Thread.MAX_PRIORITY);
                     thread.setDaemon(true);
                     thread.setUncaughtExceptionHandler(LOGGER_UNCAUGHT_EXCEPTION_HANDLER);