2 次代碼提交 03a505b51a ... f0641b01fa

作者 SHA1 備註 提交日期
  WIN10模板\Admin f0641b01fa Merge remote-tracking branch 'origin/master' 3 月之前
  WIN10模板\Admin 266b580ebe feat: 增加移动端配置后台功能 3 月之前
共有 33 個文件被更改,包括 454 次插入295 次删除
  1. 4 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlickProviderController.java
  2. 11 11
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkPerformanceController.java
  3. 6 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkCompanyIntroductionDO.java
  4. 15 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkHonorConfigDO.java
  5. 15 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkPerformanceDO.java
  6. 94 77
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkProviderDO.java
  7. 6 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkCompanyIntroductionDTO.java
  8. 18 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkHonorConfigDTO.java
  9. 15 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkPerformanceCreditDTO.java
  10. 19 2
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkPerformanceDTO.java
  11. 27 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkPerformanceProjectsDTO.java
  12. 18 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkSocialWelfareDTO.java
  13. 2 2
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkCompanyIntroductionServiceImpl.java
  14. 19 7
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkHonorConfigServiceImpl.java
  15. 16 3
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkPerformanceCreditServiceImpl.java
  16. 13 5
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkPerformanceProjectsServiceImpl.java
  17. 24 6
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkPerformanceServiceImpl.java
  18. 0 104
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkProviderServiceImpl.java
  19. 12 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkPerformanceCreditReporitory.java
  20. 6 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkPerformanceProjectsReporitory.java
  21. 18 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkPerformanceReporitory.java
  22. 0 30
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkProviderRepository.java
  23. 5 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkCompanyIntroductionService.java
  24. 14 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkHonorConfigService.java
  25. 14 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkPerformanceCreditService.java
  26. 10 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkPerformanceProjectsService.java
  27. 21 1
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkPerformanceService.java
  28. 0 47
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkProviderService.java
  29. 14 0
      bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkSocialWelfareService.java
  30. 3 0
      bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkPerformanceCreditQry.java
  31. 3 0
      bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkPerformanceProjectsQry.java
  32. 6 0
      bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkPerformanceQry.java
  33. 6 0
      bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkSocialWelfareQry.java

+ 4 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlickProviderController.java

@@ -0,0 +1,4 @@
+package com.wx.blink.backend.controller;
+
+public class BlickProviderController {
+}

+ 11 - 11
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkPerformanceController.java

@@ -33,8 +33,8 @@ public class BlinkPerformanceController {
 
     @PostMapping("/supports/performance/save")
     @Operation(summary = "保存业绩案例")
-    public ResponseDTO<String> createPerformance(@RequestBody @Valid BlinkPerformanceDTO dto) {
-        return service.createPerformance(dto);
+    public ResponseDTO<String> savePerformance(@RequestBody @Valid BlinkPerformanceDTO dto) {
+        return service.savePerformance(dto);
     }
 
     @PostMapping("/supports/performance/{id}/delete")
@@ -57,25 +57,25 @@ public class BlinkPerformanceController {
 
     @Operation(summary = "保存企业简介")
     @PostMapping("/supports/company/introduction/save")
-    public ResponseDTO<String> saveCompanyIntroduction(@RequestBody @Valid BlinkCompanyIntroductionDTO dto) {
+    public ResponseDTO<String> saveCompanyIntroduction(@RequestBody BlinkCompanyIntroductionDTO dto) {
         return companyService.saveCompanyIntroduction(dto);
     }
 
     @Operation(summary = "业绩案例查询")
     @PostMapping("/supports/performance/query")
-    public ResponseDTO<PageResult<BlinkPerformanceDTO>> queryPerformance(@RequestBody @Valid BlinkPerformanceQry qry) {
+    public ResponseDTO<PageResult<BlinkPerformanceDTO>> queryPerformance(@RequestBody BlinkPerformanceQry qry) {
         return ResponseDTO.ok(service.queryPerformance(qry));
     }
 
     @Operation(summary = "业绩项目列表查询")
     @PostMapping("/supports/performance/project/query")
-    public ResponseDTO<PageResult<BlinkPerformanceProjectsDTO>> queryPerformanceProject(@RequestBody @Valid BlinkPerformanceProjectsQry qry) {
+    public ResponseDTO<PageResult<BlinkPerformanceProjectsDTO>> queryPerformanceProject(@RequestBody BlinkPerformanceProjectsQry qry) {
         return ResponseDTO.ok(service.queryPerformanceProject(qry));
     }
 
     @Operation(summary = "添加资质")
     @PostMapping("/supports/credit/add")
-    public ResponseDTO<String> addPerformanceCredit(@RequestBody @Valid BlinkPerformanceCreditDTO dto) {
+    public ResponseDTO<String> addPerformanceCredit(@RequestBody BlinkPerformanceCreditDTO dto) {
         return creditService.addPerformanceCredit(dto);
     }
 
@@ -88,13 +88,13 @@ public class BlinkPerformanceController {
 
     @Operation(summary = "查询资质列表")
     @PostMapping("/supports/credit/query")
-    public ResponseDTO<PageResult<BlinkPerformanceCreditDTO>> queryPerformanceCredit(@RequestBody @Valid BlinkPerformanceCreditQry qry) {
+    public ResponseDTO<PageResult<BlinkPerformanceCreditDTO>> queryPerformanceCredit(@RequestBody BlinkPerformanceCreditQry qry) {
         return ResponseDTO.ok(creditService.queryPerformanceCredit(qry));
     }
 
     @Operation(summary = "保存荣誉")
     @PostMapping("/supports/honor/save")
-    public ResponseDTO<String> savePerformanceHonor(@RequestBody @Valid BlinkHonorConfigDTO dto) {
+    public ResponseDTO<String> savePerformanceHonor(@RequestBody BlinkHonorConfigDTO dto) {
         return honorService.savePerformanceHonor(dto);
     }
 
@@ -107,13 +107,13 @@ public class BlinkPerformanceController {
 
     @Operation(summary = "查询荣誉列表")
     @PostMapping("/supports/honor/query")
-    public ResponseDTO<PageResult<BlinkHonorConfigDTO>> queryPerformanceHonor(@RequestBody @Valid BlinkHonorConfigQry qry) {
+    public ResponseDTO<PageResult<BlinkHonorConfigDTO>> queryPerformanceHonor(@RequestBody BlinkHonorConfigQry qry) {
         return ResponseDTO.ok(honorService.queryPerformanceHonor(qry));
     }
 
     @Operation(summary = "保存社会公益")
     @PostMapping("/supports/socialWelfare/save")
-    public ResponseDTO<String> savePerformanceSocialWelfare(@RequestBody @Valid BlinkSocialWelfareDTO dto) {
+    public ResponseDTO<String> savePerformanceSocialWelfare(@RequestBody BlinkSocialWelfareDTO dto) {
         return socialWelfareService.savePerformanceSocialWelfare(dto);
     }
 
@@ -126,7 +126,7 @@ public class BlinkPerformanceController {
 
     @Operation(summary = "查询社会公益列表")
     @PostMapping("/supports/socialWelfare/query")
-    public ResponseDTO<PageResult<BlinkSocialWelfareDTO>> queryPerformanceSocialWelfare(@RequestBody @Valid BlinkSocialWelfareQry qry) {
+    public ResponseDTO<PageResult<BlinkSocialWelfareDTO>> queryPerformanceSocialWelfare(@RequestBody BlinkSocialWelfareQry qry) {
         return ResponseDTO.ok(socialWelfareService.queryPerformanceSocialWelfare(qry));
     }
 

+ 6 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkCompanyIntroductionDO.java

@@ -9,7 +9,13 @@ import lombok.Data;
 @Data
 @TableName("blink_company_introduction")
 public class BlinkCompanyIntroductionDO extends BaseEntity {
+    /**
+     * id
+     */
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
+    /**
+     * 企业描述
+     */
     private String description;
 }

+ 15 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkHonorConfigDO.java

@@ -8,11 +8,26 @@ import lombok.Data;
 @Data
 @TableName("blink_honor_config")
 public class BlinkHonorConfigDO extends BaseEntity {
+    /**
+     * id
+     */
     @TableId(value = "id", type = com.baomidou.mybatisplus.annotation.IdType.ASSIGN_UUID)
     private String id;
+    /**
+     * 荣誉名称
+     */
     private String honorName;
+    /**
+     * url
+     */
     private String honorUrl;
+    /**
+     * 权重
+     */
     private Long weight;
+    /**
+     * 状态
+     */
     private Integer state;
 
 }

+ 15 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkPerformanceDO.java

@@ -9,10 +9,25 @@ import lombok.Data;
 @Data
 @TableName("blink_performance")
 public class BlinkPerformanceDO extends BaseEntity {
+    /**
+     * id
+     */
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
+    /**
+     * 名称
+     */
     private String performanceName;
+    /**
+     * url
+     */
     private String performanceUrl;
+    /**
+     * 权重
+     */
     private Long weight;
+    /**
+     * 状态
+     */
     private Integer state;
 }

+ 94 - 77
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkProviderDO.java

@@ -6,157 +6,174 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.wx.blink.base.common.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName("blink_provider")
 public class BlinkProviderDO extends BaseEntity {
     /**
-     * 主键
+     * id
      */
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
-
     /**
      * 服务商类型
      */
     private String providerType;
-
     /**
      * 区域类型
      */
     private String areaType;
-
+    /**
+     * 服务商名称
+     */
+    private String providerName;
     /**
      * 地区类型
      */
     private String regionType;
-
     /**
-     * 服务商名称
+     * 所在地区
      */
-    private String providerName;
-
+    private String countryRegion;
     /**
-     * 服务商编码
+     * 省市区
      */
-    private String providerCode;
-
+    private String provinceCityDistrict;
     /**
-     * 服务商等级
+     * 详细地址
      */
-    private String providerGrade;
-
+    private String address;
     /**
-     * 统一社会代码
+     * 社会统一机构代码
      */
     private String socialCode;
-
     /**
      * 法人
      */
     private String legalPerson;
-
     /**
-     * 销售团队(数量)
+     * 营销团队人数
      */
-    private Integer teamNumber;
-
+    private Long teamNumber;
+    /**
+     * 联系人
+     */
+    private String contactPerson;
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
     /**
      * 当前职务
      */
     private String currentPosition;
-
     /**
-     * 国家或地区
+     * 是否紧急审核
      */
-    private String countryRegion;
-
+    private Integer urgentAudit;
     /**
-     * 省份
+     * 是否有在手项目
      */
-    private String province;
-
+    private Integer handState;
     /**
-     * 省份名称
+     * 企业业务简介
      */
-    private String provinceName;
-
+    private String companyDescription;
     /**
-     * 城市
+     * 企业资源简介
      */
-    private String city;
-
+    private String companyNature;
     /**
-     * 城市名称
+     * 是否有团队
      */
-    private String cityName;
-
+    private Integer hasTeam;
     /**
-     * 区县
+     * 资源来源
      */
-    private String district;
-
+    private String resourceSource;
     /**
-     * 区县名称
+     * 审核人员
      */
-    private String districtName;
-
+    private String reviewer;
     /**
-     * 详细地址
+     * 审核时间
      */
-    private String address;
-
+    private Date reviewerDate;
     /**
-     * 沟通语言
+     * 审核意见
      */
-    private String communicateLanguage;
-
+    private String reviewerResult;
     /**
-     * 联系人
+     * 预计面试日期
      */
-    private String contactPeople;
-
+    private Date expectedInterviewDate;
     /**
-     * 联系人电话
+     * 预计面试地址
      */
-    private String contactPhone;
-
+    private String expectedInterviewLocation;
     /**
-     * 企业业务简介
+     * 预计面试人
      */
-    private String companyDescription;
-
+    private String expectedInterviewer;
     /**
-     * 业务资源简介
+     * 面试评价意见
      */
-    private String companyNature;
-
+    private String evaluationOpinion;
     /**
-     * 审核状态 0待审核 1审核中 2 审核完毕
+     * 面试评价日期
      */
-    private Integer auditStatus;
-
+    private Date evaluationDate;
     /**
-     * 入库状态 0已认证(引荐完毕之后就是已认证) 1不合格
+     * 服务商等级
      */
-    private Integer storeStatus;
-
+    private String providerLevel;
     /**
-     * 面试状态 0未面试 1面试中 2 面试完毕
+     * 属营销经理
      */
-    private Integer interviewStatus;
-
+    private String belongsToMarketingManager;
     /**
-     * 引荐状态 0未引荐 1引荐中 2 引荐完毕
+     * 需缴纳保证金
      */
-    private Integer referralStatus;
-
+    private Double needsDepositAmount;
     /**
-     * 退出状态 1已退出
+     * 保证金是否缴纳
      */
-    private Integer outStatus;
-
+    private Integer isPaidDeposit;
+    /**
+     * 保证金收款人
+     */
+    private String depositReipient;
+    /**
+     * 保证金收款账户
+     */
+    private String depositAccount;
+    /**
+     * 预计引荐日期
+     */
+    private Date expectedReferralDate;
+    /**
+     * 引荐人
+     */
+    private String referral;
+    /**
+     * 引荐客户名称
+     */
+    private String referralCustomerName;
+    /**
+     * 引荐人职位
+     */
+    private String referralPosition;
+    /**
+     * 引荐评价意见
+     */
+    private String referralOpinion;
+    /**
+     * 引荐评价日期
+     */
+    private Date referralDate;
     /**
-     * 注册来源
+     * 服务商状态
      */
-    private String storeSource;
+    private Integer state;
 }

+ 6 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkCompanyIntroductionDTO.java

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class BlinkCompanyIntroductionDTO extends BaseEntity {
+    /**
+     * id
+     */
     private String id;
+    /**
+     * 企业介绍
+     */
     private String description;
 }

+ 18 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkHonorConfigDTO.java

@@ -5,10 +5,28 @@ import lombok.Data;
 
 @Data
 public class BlinkHonorConfigDTO extends BaseEntity {
+    /**
+     * id
+     */
     private String id;
+    /**
+     * 荣誉名称
+     */
     private String honorName;
+    /**
+     * url
+     */
     private String honorUrl;
+    /**
+     * 权重
+     */
     private Long weight;
+    /**
+     * 状态
+     */
     private Integer state;
+    /**
+     * 创建人姓名
+     */
     private String createName;
 }

+ 15 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkPerformanceCreditDTO.java

@@ -5,9 +5,24 @@ import lombok.Data;
 
 @Data
 public class BlinkPerformanceCreditDTO extends BaseEntity {
+    /**
+     * id
+     */
     private String id;
+    /**
+     * 资质名称
+     */
     private String creditName;
+    /**
+     * url
+     */
     private String creditUrl;
+    /**
+     * 权重
+     */
     private Long weight;
+    /**
+     * 状态
+     */
     private Integer state;
 }

+ 19 - 2
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkPerformanceDTO.java

@@ -5,13 +5,30 @@ import lombok.Data;
 
 @Data
 public class BlinkPerformanceDTO extends BaseEntity {
+    /**
+     * id
+     */
     private String id;
+    /**
+     * 名称
+     */
     private String performanceName;
+    /**
+     * url
+     */
     private String performanceUrl;
     private Long weight;
+    /**
+     * 状态
+     */
     private Integer state;
-    // 关联项目数量
+
+    /**
+     * 关联项目数量
+     */
     private Long projectCount;
-    // 创建人姓名
+    /**
+     * 创建人姓名
+     */
     private String creatorName;
 }

+ 27 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkPerformanceProjectsDTO.java

@@ -8,15 +8,42 @@ import java.util.Date;
 
 @Data
 public class BlinkPerformanceProjectsDTO extends BaseEntity {
+    /**
+     * id
+     */
     private String id;
+    /**
+     * projectId
+     */
     private String projectId;
+    /**
+     * 项目名称
+     */
     private String projectName;
     private Double contractAmount;
+    /**
+     * 业绩分类id
+     */
     private String performanceId;
+    /**
+     * 项目地址
+     */
     private String projectAddress;
+    /**
+     * 项目开始时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date projectStartTime;
+    /**
+     * 项目工期
+     */
     private Long projectDuration;
+    /**
+     * 权重
+     */
     private Long weight;
+    /**
+     * 项目描述
+     */
     private String projectDescription;
 }

+ 18 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkSocialWelfareDTO.java

@@ -5,10 +5,28 @@ import lombok.Data;
 
 @Data
 public class BlinkSocialWelfareDTO extends BaseEntity {
+    /**
+     * id
+     */
     private String id;
+    /**
+     * 公益名称
+     */
     private String welfareName;
+    /**
+     * url
+     */
     private String welfareUrl;
+    /**
+     * 权重
+     */
     private Long weight;
+    /**
+     * 状态
+     */
     private Integer state;
+    /**
+     * 创建人名称
+     */
     private String createName;
 }

+ 2 - 2
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkCompanyIntroductionServiceImpl.java

@@ -24,11 +24,11 @@ public class BlinkCompanyIntroductionServiceImpl extends ServiceImpl<BlinkCompan
         BlinkCompanyIntroductionDO companyIntroductionDO = mapper.toDO(dto);
         if (StringUtil.isNotEmpty(dto.getId())) {
             BlinkEntityUtil.setUpdatedInfo(companyIntroductionDO);
+            this.updateById(companyIntroductionDO);
         } else {
             BlinkEntityUtil.setCreateInfo(companyIntroductionDO);
-
+            this.save(companyIntroductionDO);
         }
-        this.save(companyIntroductionDO);
         return ResponseDTO.ok();
     }
 }

+ 19 - 7
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkHonorConfigServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wx.blink.backend.domain.dataobject.BlinkHonorConfigDO;
 import com.wx.blink.backend.domain.dto.BlinkHonorConfigDTO;
-import com.wx.blink.backend.domain.dto.BlinkPerformanceCreditDTO;
 import com.wx.blink.backend.objectmapper.BlinkHonorConfigMapper;
 import com.wx.blink.backend.repository.BlinkHonorConfigReporitory;
 import com.wx.blink.backend.service.IBlinkHonorConfigService;
@@ -26,10 +25,14 @@ public class BlinkHonorConfigServiceImpl extends ServiceImpl<BlinkHonorConfigRep
     private BlinkHonorConfigMapper mapper;
 
 
+    /**
+     * 保存荣誉
+     *
+     * @param dto
+     * @return
+     */
     @Override
     public ResponseDTO<String> savePerformanceHonor(BlinkHonorConfigDTO dto) {
-        ResponseDTO<String> result = new ResponseDTO<>();
-
         // 验重
         Integer count = this.baseMapper.countByHonorName(dto.getHonorName(), dto.getId());
         if (count > 0) {
@@ -42,19 +45,28 @@ public class BlinkHonorConfigServiceImpl extends ServiceImpl<BlinkHonorConfigRep
             this.save(aDo);
         } else {
             BlinkEntityUtil.setUpdatedInfo(aDo);
-            this.save(aDo);
+            this.updateById(aDo);
         }
-        return result;
+        return ResponseDTO.ok();
     }
 
+    /**
+     * 删除荣誉
+     * @param id
+     */
     @Override
     public void deletePerformanceHonor(String id) {
-        BlinkHonorConfigDO aDo   = this.baseMapper.selectById(id);
+        BlinkHonorConfigDO aDo = this.baseMapper.selectById(id);
         aDo.setDeletedFlag(1);
         BlinkEntityUtil.setUpdatedInfo(aDo);
-        this.save(aDo);
+        this.updateById(aDo);
     }
 
+    /**
+     * 查询荣誉列表
+     * @param qry
+     * @return
+     */
     @Override
     public PageResult<BlinkHonorConfigDTO> queryPerformanceHonor(BlinkHonorConfigQry qry) {
         Page<?> page = BlinkPageUtil.convert2PageQuery(qry);

+ 16 - 3
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkPerformanceCreditServiceImpl.java

@@ -26,9 +26,13 @@ public class BlinkPerformanceCreditServiceImpl extends ServiceImpl<BlinkPerforma
     private BlinkPerformanceCreditMapper mapper;
 
 
+    /**
+     * 保存资质
+     * @param dto
+     * @return
+     */
     @Override
     public ResponseDTO<String> addPerformanceCredit(BlinkPerformanceCreditDTO dto) {
-        ResponseDTO<String> result = new ResponseDTO<>();
         // 验重
         Integer count = this.baseMapper.countPerformanceCreditByName(dto.getCreditName(), dto.getId());
         if (count > 0) {
@@ -43,11 +47,15 @@ public class BlinkPerformanceCreditServiceImpl extends ServiceImpl<BlinkPerforma
         } else {
             // 修改
             BlinkEntityUtil.setUpdatedInfo(aDo);
-            this.save(aDo);
+            this.updateById(aDo);
         }
-        return result;
+        return ResponseDTO.ok();
     }
 
+    /**
+     * 删除资质
+     * @param id
+     */
     @Override
     public void deletePerformanceCredit(String id) {
         BlinkPerformanceCreditDO aDo = this.baseMapper.selectById(id);
@@ -56,6 +64,11 @@ public class BlinkPerformanceCreditServiceImpl extends ServiceImpl<BlinkPerforma
         this.save(aDo);
     }
 
+    /**
+     * 查询资质列表
+     * @param qry
+     * @return
+     */
     @Override
     public PageResult<BlinkPerformanceCreditDTO> queryPerformanceCredit(BlinkPerformanceCreditQry qry) {
         Page<?> page = BlinkPageUtil.convert2PageQuery(qry);

+ 13 - 5
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkPerformanceProjectsServiceImpl.java

@@ -18,9 +18,13 @@ public class BlinkPerformanceProjectsServiceImpl extends ServiceImpl<BlinkPerfor
     @Resource
     private BlinkPerformanceProjectsMapper mapper;
 
+    /**
+     * 保存业绩项目
+     * @param dto
+     * @return
+     */
     @Override
     public ResponseDTO<String> createPerformanceProject(BlinkPerformanceProjectsDTO dto) {
-        ResponseDTO<String> result = new ResponseDTO<>();
         // 验重
         Integer count = this.baseMapper.countByPerformanceProjectId(dto.getProjectId(), dto.getId());
         if (count > 0) {
@@ -30,22 +34,26 @@ public class BlinkPerformanceProjectsServiceImpl extends ServiceImpl<BlinkPerfor
         if (StringUtil.isNotEmpty(dto.getId())) {
             // 保存
             BlinkEntityUtil.setUpdatedInfo(aDo);
-            this.save(aDo);
+            this.updateById(aDo);
         } else {
             // 新增
             BlinkEntityUtil.setCreateInfo(aDo);
             this.save(aDo);
         }
-
-        return result;
+        return ResponseDTO.ok();
     }
 
+    /**
+     * 删除业绩项目
+     * @param id
+     * @return
+     */
     @Override
     public ResponseDTO deletePerformanceProject(String id) {
         BlinkPerformanceProjectsDO data = this.baseMapper.selectById(id);
         BlinkEntityUtil.setUpdatedInfo(data);
         data.setDeletedFlag(1);
-        this.save(data);
+        this.updateById(data);
         return ResponseDTO.ok();
     }
 }

+ 24 - 6
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkPerformanceServiceImpl.java

@@ -29,9 +29,13 @@ public class BlinkPerformanceServiceImpl extends ServiceImpl<BlinkPerformanceRep
     @Resource
     private BlinkPerformanceMapper mapper;
 
+    /**
+     * 保存业绩
+     * @param dto
+     * @return
+     */
     @Override
-    public ResponseDTO<String> createPerformance(BlinkPerformanceDTO dto) {
-        ResponseDTO<String> result = new ResponseDTO<>();
+    public ResponseDTO<String> savePerformance(BlinkPerformanceDTO dto) {
         // 验重
         Integer count = this.baseMapper.countByPerformanceName(dto.getPerformanceName(), dto.getId());
         if (count > 0) {
@@ -40,27 +44,36 @@ public class BlinkPerformanceServiceImpl extends ServiceImpl<BlinkPerformanceRep
             BlinkPerformanceDO performanceDO = mapper.toDO(dto);
             if (StringUtil.isEmpty(dto.getId())) {
                 // 新增
-
                 BlinkEntityUtil.setCreateInfo(performanceDO);
                 this.save(performanceDO);
             } else {
                 // 修改
                 BlinkEntityUtil.setUpdatedInfo(performanceDO);
-                this.save(performanceDO);
+                this.updateById(performanceDO);
             }
         }
-        return result;
+        return ResponseDTO.ok();
     }
 
+    /**
+     * 删除业绩
+     * @param id
+     * @return
+     */
     @Override
     public ResponseDTO deletePerformance(String id) {
         BlinkPerformanceDO blinkPerformanceDO = this.baseMapper.selectById(id);
         blinkPerformanceDO.setDeletedFlag(1);
         BlinkEntityUtil.setUpdatedInfo(blinkPerformanceDO);
-        this.save(blinkPerformanceDO);
+        this.updateById(blinkPerformanceDO);
         return ResponseDTO.ok();
     }
 
+    /**
+     * 查询业绩列表
+     * @param qry
+     * @return
+     */
     @Override
     public PageResult<BlinkPerformanceDTO> queryPerformance(BlinkPerformanceQry qry) {
         Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
@@ -70,6 +83,11 @@ public class BlinkPerformanceServiceImpl extends ServiceImpl<BlinkPerformanceRep
         return pageResult;
     }
 
+    /**
+     * 查询业绩项目
+     * @param qry
+     * @return
+     */
     @Override
     public PageResult<BlinkPerformanceProjectsDTO> queryPerformanceProject(BlinkPerformanceProjectsQry qry) {
         Page<?> page = BlinkPageUtil.convert2PageQuery(qry);

+ 0 - 104
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkProviderServiceImpl.java

@@ -41,109 +41,5 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
     @Resource
     private BlinkProviderMapper mapper;
 
-    @Override
-    public ResponseDTO<String> supportsProviderCreate(BlinkProviderCreateVO vo) {
-        //如果是个人注册,使用联系人当做服务商名称
-        if (vo.getProviderType().equals("01")) {
-            vo.setProviderName(vo.getContactPeople());
-            // 验证服务商名称+手机号是否重复
-            BlinkProviderDO providerDO = repository.queryByProviderNameAndPhone(vo.getProviderName(), vo.getContactPhone(), null, Boolean.FALSE);
-            if (Objects.nonNull(providerDO)) {
-                return ResponseDTO.userErrorParam("服务商注册校验失败!请检查");
-            }
-        } else {
-            // 验证服务商名称是否重复
-            BlinkProviderDO providerDO = repository.queryByProviderName(vo.getProviderName(), null, Boolean.FALSE);
-            if (Objects.nonNull(providerDO)) {
-                return ResponseDTO.userErrorParam("服务商名称重复!请检查");
-            }
-        }
-        BlinkProviderDO entity = new BlinkProviderDO();
-        mapper.ProviderCreateVoToDomain(vo, entity);
-        // 生成服务商账号
-        SerialNumberIdEnum serialNumberIdEnum = BlinkEnumUtil.getEnumByValue(4, SerialNumberIdEnum.class);
-        String serialNumber = serialNumberService.generate(serialNumberIdEnum);
-//        // 设置服务商账号
-        entity.setProviderCode("KH" + serialNumber);
-        entity.setCreateUserId("admin");
-        entity.setCreateTime(DateTime.now());
-        this.save(entity);
-        return ResponseDTO.ok();
-    }
 
-    /**
-     * 获取服务商基本信息
-     *
-     * @param id
-     * @return
-     */
-    @Override
-    public ResponseDTO<BlinkProviderDTO> supportsProviderQuery(String id) {
-        // 验证服务商名称是否重复
-        BlinkProviderDO providerDO = repository.queryByProviderName(null, id, Boolean.FALSE);
-        if (!Objects.nonNull(providerDO)) {
-            return ResponseDTO.userErrorParam("服务商不存在!请检查");
-        }
-        BlinkProviderDTO dto = new BlinkProviderDTO();
-        mapper.toBlinkProviderDTO(providerDO, dto);
-        return ResponseDTO.ok(dto);
-    }
-
-    @Override
-    public ResponseDTO<PageResult<BlinkProviderDTO>> supportsProviderQueryPage(BlinkProviderQry qry) {
-        Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
-        List<BlinkProviderDTO> list = repository.supportsProviderQueryPage(page, qry);
-        PageResult<BlinkProviderDTO> pageResult = BlinkPageUtil.convert2PageResult(page, list);
-        return ResponseDTO.ok(pageResult);
-    }
-
-    @Override
-    public ResponseDTO<BlinkProviderDTO> supportsProviderSingleQuery(String id) {
-        //定义返回
-        BlinkProviderDTO providerVO = new BlinkProviderDTO();
-        BlinkProviderDO providerDO = this.getById(id);
-        if (Objects.nonNull(providerDO)) {
-            mapper.domainToProviderVO(providerDO, providerVO);
-        }
-        return ResponseDTO.ok(providerVO);
-    }
-
-    /**
-     * 获取服务商入库审核信息
-     *
-     * @param providerId
-     * @return
-     */
-    @Override
-    public ResponseDTO<BlinkProviderStorageDTO> supportsProviderAuditQuery(String providerId) {
-        BlinkProviderStorageDTO storageDTO = new BlinkProviderStorageDTO();
-        List<BlinkProviderProjectDTO> providerProjectDTOS = new ArrayList<>();
-        providerProjectDTOS.add(new BlinkProviderProjectDTO());
-        storageDTO.setHistoryProjectList(providerProjectDTOS);
-        storageDTO.setCurrentProjectList(providerProjectDTOS);
-        return ResponseDTO.ok(storageDTO);
-    }
-
-    @Override
-    public ResponseDTO<PageResult<BlinkStorageMarginDTO>> supportsStorageMarginQueryPage(BlinkProviderQry qry) {
-        BlinkStorageMarginDTO marginDTO = new BlinkStorageMarginDTO();
-        marginDTO.setProviderId("1");
-        marginDTO.setMarginName("入库保证金");
-        marginDTO.setSerialNumber("202506181740");
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-        String result = df.format(5000.00);
-        marginDTO.setMarginAmount(result);
-        marginDTO.setInitiatedTime("2025.06.30");
-        marginDTO.setBusinessCommissioner("张经理");
-        marginDTO.setCreateTime(new DateTime("2025-06-13 18:34:49.986"));
-        List<BlinkStorageMarginDTO> marginDTOS = new ArrayList<>();
-        marginDTOS.add(marginDTO);
-        marginDTOS.add(marginDTO);
-        marginDTOS.add(marginDTO);
-        marginDTOS.add(marginDTO);
-        marginDTOS.add(marginDTO);
-        Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
-        PageResult<BlinkStorageMarginDTO> pageResult = BlinkPageUtil.convert2PageResult(page, marginDTOS);
-        return ResponseDTO.ok(pageResult);
-    }
 }

+ 12 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkPerformanceCreditReporitory.java

@@ -14,7 +14,19 @@ import java.util.List;
 public interface BlinkPerformanceCreditReporitory extends BaseMapper<BlinkPerformanceCreditDO> {
 
 
+    /**
+     * 查重
+     * @param creditName
+     * @param id
+     * @return
+     */
     Integer countPerformanceCreditByName(@Param("creditName") String creditName, @Param("id") String id);
 
+    /**
+     * 查询资质列表
+     * @param page
+     * @param qry
+     * @return
+     */
     List<BlinkPerformanceCreditDTO> queryPerformanceCredit(Page<?> page, @Param("qry")BlinkPerformanceCreditQry qry);
 }

+ 6 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkPerformanceProjectsReporitory.java

@@ -9,5 +9,11 @@ import org.apache.ibatis.annotations.Param;
 public interface BlinkPerformanceProjectsReporitory extends BaseMapper<BlinkPerformanceProjectsDO> {
 
 
+    /**
+     * 查重
+     * @param projectId
+     * @param id
+     * @return
+     */
     Integer countByPerformanceProjectId(@Param("projectId") String projectId, @Param("id") String id);
 }

+ 18 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkPerformanceReporitory.java

@@ -16,9 +16,27 @@ import java.util.List;
 public interface BlinkPerformanceReporitory extends BaseMapper<BlinkPerformanceDO> {
 
 
+    /**
+     * 验重
+     * @param performanceName
+     * @param id
+     * @return
+     */
     Integer countByPerformanceName(@Param("performanceName") String performanceName, @Param("id") String id);
 
+    /**
+     * 查询业绩分类
+     * @param page
+     * @param qry
+     * @return
+     */
     List<BlinkPerformanceDTO> queryPerformance(Page<?> page, @Param("qry") BlinkPerformanceQry qry);
 
+    /**
+     * 查询业绩项目
+     * @param page
+     * @param qry
+     * @return
+     */
     List<BlinkPerformanceProjectsDTO> queryPerformanceProject(Page<?> page, @Param("qry") BlinkPerformanceProjectsQry qry);
 }

+ 0 - 30
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkProviderRepository.java

@@ -15,34 +15,4 @@ import java.util.List;
 @Component
 public interface BlinkProviderRepository extends BaseMapper<BlinkProviderDO> {
 
-    /**
-     * 验证服务商是否重复
-     *
-     * @param providerName
-     * @param deletedFlag
-     * @param id
-     * @return
-     */
-    BlinkProviderDO queryByProviderName(@Param("providerName") String providerName, @Param("id") String id, @Param("deletedFlag") Boolean deletedFlag);
-
-    /**
-     * 服务商查询列表
-     *
-     * @param page
-     * @param qry
-     * @return
-     */
-    List<BlinkProviderDTO> supportsProviderQueryPage(Page<?> page, @Param("query") BlinkProviderQry qry);
-
-
-    /**
-     * 验证服务商名称+手机号是否重复
-     *
-     * @param providerName
-     * @param contactPhone
-     * @param id
-     * @param deletedFlag
-     * @return
-     */
-    BlinkProviderDO queryByProviderNameAndPhone(@Param("providerName") String providerName, @Param("contactPhone") String contactPhone, @Param("id") Long id, @Param("deletedFlag") Boolean deletedFlag);
 }

+ 5 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkCompanyIntroductionService.java

@@ -5,5 +5,10 @@ import com.wx.blink.backend.domain.dto.BlinkPerformanceDTO;
 import com.wx.blink.base.common.domain.ResponseDTO;
 
 public interface IBlinkCompanyIntroductionService {
+    /**
+     * 保存公司介绍
+     * @param dto
+     * @return
+     */
     ResponseDTO<String> saveCompanyIntroduction(BlinkCompanyIntroductionDTO dto);
 }

+ 14 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkHonorConfigService.java

@@ -7,9 +7,23 @@ import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.common.qry.BlinkHonorConfigQry;
 
 public interface IBlinkHonorConfigService {
+    /**
+     * 保存荣誉
+     * @param dto
+     * @return
+     */
     ResponseDTO<String> savePerformanceHonor(BlinkHonorConfigDTO dto);
 
+    /**
+     * 删除荣誉
+     * @param id
+     */
     void deletePerformanceHonor(String id);
 
+    /**
+     * 查询荣誉列表
+     * @param qry
+     * @return
+     */
     PageResult<BlinkHonorConfigDTO> queryPerformanceHonor(BlinkHonorConfigQry qry);
 }

+ 14 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkPerformanceCreditService.java

@@ -7,9 +7,23 @@ import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.common.qry.BlinkPerformanceCreditQry;
 
 public interface IBlinkPerformanceCreditService {
+    /**
+     * 保存资质
+     * @param dto
+     * @return
+     */
     ResponseDTO<String> addPerformanceCredit(BlinkPerformanceCreditDTO dto);
 
+    /**
+     * 删除资质
+     * @param id
+     */
     void deletePerformanceCredit(String id);
 
+    /**
+     * 查询资质列表
+     * @param qry
+     * @return
+     */
     PageResult<BlinkPerformanceCreditDTO> queryPerformanceCredit(BlinkPerformanceCreditQry qry);
 }

+ 10 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkPerformanceProjectsService.java

@@ -4,7 +4,17 @@ import com.wx.blink.backend.domain.dto.BlinkPerformanceProjectsDTO;
 import com.wx.blink.base.common.domain.ResponseDTO;
 
 public interface IBlinkPerformanceProjectsService {
+    /**
+     * 创建业绩项目
+     * @param dto
+     * @return
+     */
     ResponseDTO<String> createPerformanceProject(BlinkPerformanceProjectsDTO dto);
 
+    /**
+     * 删除业绩项目
+     * @param id
+     * @return
+     */
     ResponseDTO deletePerformanceProject(String id);
 }

+ 21 - 1
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkPerformanceService.java

@@ -11,12 +11,32 @@ import com.wx.blink.common.qry.BlinkPerformanceProjectsQry;
 import com.wx.blink.common.qry.BlinkPerformanceQry;
 
 public interface IBlinkPerformanceService  {
-    ResponseDTO<String> createPerformance(BlinkPerformanceDTO dto);
+    /**
+     * 保存业绩分类
+     * @param dto
+     * @return
+     */
+    ResponseDTO<String> savePerformance(BlinkPerformanceDTO dto);
 
+    /**
+     * 删除业绩分类
+     * @param id
+     * @return
+     */
     ResponseDTO deletePerformance(String id);
 
+    /**
+     * 查询业绩二维表
+     * @param qry
+     * @return
+     */
     PageResult<BlinkPerformanceDTO> queryPerformance(BlinkPerformanceQry qry);
 
+    /**
+     * 查询业绩项目
+     * @param qry
+     * @return
+     */
     PageResult<BlinkPerformanceProjectsDTO> queryPerformanceProject(BlinkPerformanceProjectsQry qry);
 
 }

+ 0 - 47
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkProviderService.java

@@ -12,52 +12,5 @@ import java.util.List;
 
 public interface IBlinkProviderService {
 
-    /**
-     * 服务商创建
-     *
-     * @param vo
-     * @return
-     */
-    ResponseDTO<String> supportsProviderCreate(BlinkProviderCreateVO vo);
 
-    /**
-     * 查询服务商列表
-     *
-     * @param qry
-     * @return
-     */
-    ResponseDTO<PageResult<BlinkProviderDTO>> supportsProviderQueryPage(BlinkProviderQry qry);
-
-    /**
-     * 获取服务商基本信息
-     *
-     * @param id
-     * @return
-     */
-    ResponseDTO<BlinkProviderDTO> supportsProviderQuery(String id);
-
-    /**
-     * 获取服务商入库审核信息
-     *
-     * @param providerId
-     * @return
-     */
-    ResponseDTO<BlinkProviderStorageDTO> supportsProviderAuditQuery(String providerId);
-
-    /**
-     * 获取服务商入库保证金信息
-     *
-     * @param qry
-     * @return
-     */
-    ResponseDTO<PageResult<BlinkStorageMarginDTO>> supportsStorageMarginQueryPage(BlinkProviderQry qry);
-
-
-    /**
-     * 获取服务商信息
-     *
-     * @param id
-     * @return
-     */
-    ResponseDTO<BlinkProviderDTO> supportsProviderSingleQuery(String id);
 }

+ 14 - 0
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkSocialWelfareService.java

@@ -7,9 +7,23 @@ import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.common.qry.BlinkSocialWelfareQry;
 
 public interface IBlinkSocialWelfareService {
+    /**
+     * 保存公益信息
+     * @param dto
+     * @return
+     */
     ResponseDTO<String> savePerformanceSocialWelfare(BlinkSocialWelfareDTO dto);
 
+    /**
+     * 删除公益信息
+     * @param id
+     */
     void deletePerformanceSocialWelfare(String id);
 
+    /**
+     * 查询公益信息列表
+     * @param qry
+     * @return
+     */
     PageResult<BlinkSocialWelfareDTO> queryPerformanceSocialWelfare(BlinkSocialWelfareQry qry);
 }

+ 3 - 0
bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkPerformanceCreditQry.java

@@ -5,6 +5,9 @@ import lombok.Data;
 
 @Data
 public class BlinkPerformanceCreditQry extends PageParam {
+    /**
+     * 资质名称
+     */
     private String creditName;
 
 }

+ 3 - 0
bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkPerformanceProjectsQry.java

@@ -5,6 +5,9 @@ import lombok.Data;
 
 @Data
 public class BlinkPerformanceProjectsQry extends PageParam {
+    /**
+     * 项目名称
+     */
     private String projectName;
     private String performanceId;
 }

+ 6 - 0
bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkPerformanceQry.java

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class BlinkPerformanceQry extends PageParam {
+    /**
+     * 名称
+     */
     private String performanceName;
+    /**
+     * 状态
+     */
     private String state;
 }

+ 6 - 0
bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/qry/BlinkSocialWelfareQry.java

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class BlinkSocialWelfareQry extends PageParam {
+    /**
+     * 状态
+     */
     private String state;
+    /**
+     * 公益名称
+     */
     private String welfareName;
 }