feat: contract payment plan page api

backend/crm/src/main/java/cn/cordys/common/constants/PermissionConstants.java

@@ -187,10 +187,10 @@ public class PermissionConstants {
     /*------ end: CONTRACT ------*/
 
     /*------ start: CONTRACT_CONTRACT_PAYMENT_PLAN_ROLE ------*/
-    public static final String CONTRACT_CONTRACT_PAYMENT_PLAN_READ = "CONTRACT_CONTRACT_PAYMENT_PLAN:READ";
-    public static final String CONTRACT_CONTRACT_PAYMENT_PLAN_ADD = "CONTRACT_CONTRACT_PAYMENT_PLAN:ADD";
-    public static final String CONTRACT_CONTRACT_PAYMENT_PLAN_UPDATE = "CONTRACT_CONTRACT_PAYMENT_PLAN:UPDATE";
-    public static final String CONTRACT_CONTRACT_PAYMENT_PLAN_DELETE = "CONTRACT_CONTRACT_PAYMENT_PLAN:DELETE";
+    public static final String CONTRACT_PAYMENT_PLAN_READ = "CONTRACT_CONTRACT_PAYMENT_PLAN:READ";
+    public static final String CONTRACT_PAYMENT_PLAN_ADD = "CONTRACT_CONTRACT_PAYMENT_PLAN:ADD";
+    public static final String CONTRACT_PAYMENT_PLAN_UPDATE = "CONTRACT_CONTRACT_PAYMENT_PLAN:UPDATE";
+    public static final String CONTRACT_PAYMENT_PLAN_DELETE = "CONTRACT_CONTRACT_PAYMENT_PLAN:DELETE";
     /*------ end: CONTRACT_CONTRACT_PAYMENT_PLAN_ROLE ------*/
 }
 

backend/crm/src/main/java/cn/cordys/crm/contract/controller/ContractPaymentPlanController.java

@@ -1,24 +1,26 @@
 package cn.cordys.crm.contract.controller;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import cn.cordys.common.constants.PermissionConstants;
+import cn.cordys.common.dto.DeptDataPermissionDTO;
+import cn.cordys.common.pager.PagerWithOption;
+import cn.cordys.common.service.DataScopeService;
+import cn.cordys.common.utils.ConditionFilterUtils;
+import cn.cordys.context.OrganizationContext;
+import cn.cordys.crm.contract.domain.ContractPaymentPlan;
+import cn.cordys.crm.contract.dto.request.ContractPaymentPlanAddRequest;
+import cn.cordys.crm.contract.dto.request.ContractPaymentPlanPageRequest;
+import cn.cordys.crm.contract.dto.request.ContractPaymentPlanUpdateRequest;
+import cn.cordys.crm.contract.dto.response.ContractPaymentPlanGetResponse;
+import cn.cordys.crm.contract.dto.response.ContractPaymentPlanListResponse;
+import cn.cordys.crm.contract.service.ContractPaymentPlanService;
+import cn.cordys.security.SessionUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import cn.cordys.common.constants.PermissionConstants;
-import cn.cordys.context.OrganizationContext;
 
-import cn.cordys.common.pager.Pager;
-import cn.cordys.security.SessionUtils;
-import cn.cordys.crm.contract.domain.ContractPaymentPlan;
-import cn.cordys.crm.contract.dto.request.*;
-import cn.cordys.crm.contract.dto.response.*;
-
-import cn.cordys.crm.contract.service.ContractPaymentPlanService;
-import cn.cordys.common.pager.PageUtils;
 import java.util.List;
 
 /**
@@ -32,38 +34,42 @@
 public class ContractPaymentPlanController {
     @Resource
     private ContractPaymentPlanService contractPaymentPlanService;
+    @Resource
+    private DataScopeService dataScopeService;
 
     @PostMapping("/page")
-    @RequiresPermissions(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_READ)
+    @RequiresPermissions(PermissionConstants.CONTRACT_PAYMENT_PLAN_READ)
     @Operation(summary = "合同回款计划列表")
-    public Pager<List<ContractPaymentPlanListResponse>> list(@Validated @RequestBody ContractPaymentPlanPageRequest request) {
-        Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize());
-        return PageUtils.setPageInfo(page, contractPaymentPlanService.list(request, OrganizationContext.getOrganizationId()));
+    public PagerWithOption<List<ContractPaymentPlanListResponse>> list(@Validated @RequestBody ContractPaymentPlanPageRequest request) {
+        ConditionFilterUtils.parseCondition(request);
+        DeptDataPermissionDTO deptDataPermission = dataScopeService.getDeptDataPermission(SessionUtils.getUserId(),
+                OrganizationContext.getOrganizationId(), request.getViewId(), PermissionConstants.CONTRACT_PAYMENT_PLAN_READ);
+        return contractPaymentPlanService.list(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId(), deptDataPermission);
     }
 
     @GetMapping("/get/{id}")
-    @RequiresPermissions(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_READ)
+    @RequiresPermissions(PermissionConstants.CONTRACT_PAYMENT_PLAN_READ)
     @Operation(summary = "合同回款计划详情")
     public ContractPaymentPlanGetResponse get(@PathVariable String id){
         return contractPaymentPlanService.get(id);
     }
 
     @PostMapping("/add")
-    @RequiresPermissions(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_ADD)
+    @RequiresPermissions(PermissionConstants.CONTRACT_PAYMENT_PLAN_ADD)
     @Operation(summary = "添加合同回款计划")
     public ContractPaymentPlan add(@Validated @RequestBody ContractPaymentPlanAddRequest request) {
 		return contractPaymentPlanService.add(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
     }
 
     @PostMapping("/update")
-    @RequiresPermissions(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_UPDATE)
+    @RequiresPermissions(PermissionConstants.CONTRACT_PAYMENT_PLAN_UPDATE)
     @Operation(summary = "更新合同回款计划")
     public ContractPaymentPlan update(@Validated @RequestBody ContractPaymentPlanUpdateRequest request) {
         return contractPaymentPlanService.update(request, SessionUtils.getUserId());
     }
 
     @GetMapping("/delete/{id}")
-    @RequiresPermissions(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_DELETE)
+    @RequiresPermissions(PermissionConstants.CONTRACT_PAYMENT_PLAN_DELETE)
     @Operation(summary = "删除合同回款计划")
     public void delete(@PathVariable String id) {
 		contractPaymentPlanService.delete(id);

backend/crm/src/main/java/cn/cordys/crm/contract/domain/ContractPaymentPlanField.java

@@ -0,0 +1,17 @@
+package cn.cordys.crm.contract.domain;
+
+import cn.cordys.common.domain.BaseResourceField;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+
+/**
+ * 合同回款自定义属性
+ *
+ * @author jianxing
+ * @date 2025-02-10 18:12:46
+ */
+@Data
+@Table(name = "contract_payment_plan_field")
+public class ContractPaymentPlanField extends BaseResourceField {
+}

backend/crm/src/main/java/cn/cordys/crm/contract/domain/ContractPaymentPlanFieldBlob.java

@@ -0,0 +1,17 @@
+package cn.cordys.crm.contract.domain;
+
+import cn.cordys.common.domain.BaseResourceField;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+
+/**
+ * 合同回款自定义属性大文本
+ *
+ * @author jianxing
+ * @date 2025-02-27 14:43:46
+ */
+@Data
+@Table(name = "contract_payment_plan_field_blob")
+public class ContractPaymentPlanFieldBlob extends BaseResourceField {
+}

backend/crm/src/main/java/cn/cordys/crm/contract/dto/response/ContractPaymentPlanListResponse.java

@@ -1,9 +1,12 @@
 package cn.cordys.crm.contract.dto.response;
 
+import cn.cordys.common.domain.BaseModuleFieldValue;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.cordys.crm.contract.domain.ContractPaymentPlan;
 
+import java.util.List;
+
 /**
  *
  * @author jianxing
@@ -16,4 +19,19 @@ public class ContractPaymentPlanListResponse extends ContractPaymentPlan {
 
     @Schema(description = "更新人名称")
     private String updateUserName;
+
+    @Schema(description = "负责人名称")
+    private String ownerName;
+
+    @Schema(description = "归属部门")
+    private String departmentId;
+
+    @Schema(description = "归属部门名称")
+    private String departmentName;
+
+    @Schema(description = "合同名称")
+    private String contractName;
+
+    @Schema(description = "自定义字段集合")
+    private List<BaseModuleFieldValue> moduleFields;
 }

backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.java

@@ -1,9 +1,9 @@
 package cn.cordys.crm.contract.mapper;
 
-import cn.cordys.crm.contract.dto.request.*;
-import cn.cordys.crm.contract.dto.response.*;
+import cn.cordys.common.dto.DeptDataPermissionDTO;
+import cn.cordys.crm.contract.dto.request.ContractPaymentPlanPageRequest;
+import cn.cordys.crm.contract.dto.response.ContractPaymentPlanListResponse;
 import org.apache.ibatis.annotations.Param;
-import cn.cordys.crm.contract.domain.ContractPaymentPlan;
 
 import java.util.List;
 
@@ -13,10 +13,7 @@
  * @date 2025-11-21 15:11:29
  */
 public interface ExtContractPaymentPlanMapper {
+    List<ContractPaymentPlanListResponse> list(@Param("request") ContractPaymentPlanPageRequest request, @Param("userId") String userId,
+                                               @Param("orgId") String orgId, @Param("dataPermission") DeptDataPermissionDTO deptDataPermission);
 
-    List<ContractPaymentPlanListResponse> list(@Param("request") ContractPaymentPlanPageRequest request, @Param("orgId") String orgId);
-
-    boolean checkAddExist(@Param("contractPaymentPlan") ContractPaymentPlan contractPaymentPlan);
-
-    boolean checkUpdateExist(@Param("contractPaymentPlan") ContractPaymentPlan ContractPaymentPlan);
 }