diff --git a/backend/crm/src/main/java/cn/cordys/common/constants/PermissionConstants.java b/backend/crm/src/main/java/cn/cordys/common/constants/PermissionConstants.java index da7939815..897a8a403 100644 --- a/backend/crm/src/main/java/cn/cordys/common/constants/PermissionConstants.java +++ b/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 ------*/ } diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/controller/ContractPaymentPlanController.java b/backend/crm/src/main/java/cn/cordys/crm/contract/controller/ContractPaymentPlanController.java index fabafdcc2..8c8a6d678 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/contract/controller/ContractPaymentPlanController.java +++ b/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(@Validated @RequestBody ContractPaymentPlanPageRequest request) { - Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize()); - return PageUtils.setPageInfo(page, contractPaymentPlanService.list(request, OrganizationContext.getOrganizationId())); + public PagerWithOption> 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); diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/domain/ContractPaymentPlanField.java b/backend/crm/src/main/java/cn/cordys/crm/contract/domain/ContractPaymentPlanField.java new file mode 100644 index 000000000..24d4da187 --- /dev/null +++ b/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 { +} diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/domain/ContractPaymentPlanFieldBlob.java b/backend/crm/src/main/java/cn/cordys/crm/contract/domain/ContractPaymentPlanFieldBlob.java new file mode 100644 index 000000000..5c1fe720d --- /dev/null +++ b/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 { +} diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/dto/response/ContractPaymentPlanListResponse.java b/backend/crm/src/main/java/cn/cordys/crm/contract/dto/response/ContractPaymentPlanListResponse.java index 29865efd4..b1b9648b7 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/contract/dto/response/ContractPaymentPlanListResponse.java +++ b/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 moduleFields; } diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.java b/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.java index dd6a29f73..0e1c92e3b 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.java +++ b/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 list(@Param("request") ContractPaymentPlanPageRequest request, @Param("userId") String userId, + @Param("orgId") String orgId, @Param("dataPermission") DeptDataPermissionDTO deptDataPermission); - List list(@Param("request") ContractPaymentPlanPageRequest request, @Param("orgId") String orgId); - - boolean checkAddExist(@Param("contractPaymentPlan") ContractPaymentPlan contractPaymentPlan); - - boolean checkUpdateExist(@Param("contractPaymentPlan") ContractPaymentPlan ContractPaymentPlan); } diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.xml b/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.xml index c7c3d0dc6..d90278c7e 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.xml +++ b/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractPaymentPlanMapper.xml @@ -3,8 +3,255 @@ + + + + + + + order by + + + cpp.${sortName} ${sortType}, cpp.id ASC + + + sou_sort.${sortName} ${sortType}, cpp.id ASC + + + CASE + WHEN module_table.type = 'INPUT_NUMBER' + THEN sort_table.field_value + 0 + END ${sortType}, + sort_table.field_value ${sortType}, + cpp.id ASC + + + + + order by cpp.create_time desc, cpp.id asc + + + + + + + + + + left join contract_payment_plan_blob ${tablePrefix}_${i} + on cpp.id = ${tablePrefix}_${i}.resource_id and ${tablePrefix}_${i}.field_id = #{condition.name} + + + left join contract_payment_plan ${tablePrefix}_${i} + on cpp.id = ${tablePrefix}_${i}.resource_id and ${tablePrefix}_${i}.field_id = #{condition.name} + + + + left join sys_organization_user ${tablePrefix}_${i} + on ${tablePrefix}_${i}.user_id = cpp.owner + + + + + + + + + + + left join sys_organization_user sou_sort on cpp.owner = sou_sort.user_id + + + left join contract_payment_plan sort_table + on cpp.id = sort_table.resource_id and sort_table.field_id = #{sortName} + left join sys_module_field module_table on sort_table.field_id = module_table.id + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractPaymentPlanFieldService.java b/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractPaymentPlanFieldService.java new file mode 100644 index 000000000..f4cdbefc4 --- /dev/null +++ b/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractPaymentPlanFieldService.java @@ -0,0 +1,38 @@ +package cn.cordys.crm.contract.service; + +import cn.cordys.common.constants.FormKey; +import cn.cordys.common.service.BaseResourceFieldService; +import cn.cordys.crm.contract.domain.ContractPaymentPlanField; +import cn.cordys.crm.contract.domain.ContractPaymentPlanFieldBlob; +import cn.cordys.mybatis.BaseMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @author jianxing + * @date 2025-02-08 16:24:22 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ContractPaymentPlanFieldService extends BaseResourceFieldService { + @Resource + private BaseMapper contractPaymentPlanFieldMapper; + @Resource + private BaseMapper contractPaymentPlanFieldBlobMapper; + + @Override + protected String getFormKey() { + return FormKey.CONTRACT_PAYMENT_PLAN.getKey(); + } + + @Override + protected BaseMapper getResourceFieldMapper() { + return contractPaymentPlanFieldMapper; + } + + @Override + protected BaseMapper getResourceFieldBlobMapper() { + return contractPaymentPlanFieldBlobMapper; + } +} \ No newline at end of file diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractPaymentPlanService.java b/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractPaymentPlanService.java index 204027849..6a8ffce05 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractPaymentPlanService.java +++ b/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractPaymentPlanService.java @@ -1,17 +1,39 @@ package cn.cordys.crm.contract.service; +import cn.cordys.common.constants.BusinessModuleField; +import cn.cordys.common.constants.FormKey; +import cn.cordys.common.domain.BaseModuleFieldValue; +import cn.cordys.common.dto.DeptDataPermissionDTO; +import cn.cordys.common.dto.OptionDTO; +import cn.cordys.common.dto.UserDeptDTO; +import cn.cordys.common.pager.PageUtils; +import cn.cordys.common.pager.PagerWithOption; +import cn.cordys.common.service.BaseService; +import cn.cordys.common.uid.IDGenerator; import cn.cordys.common.util.BeanUtils; +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.mapper.ExtContractPaymentPlanMapper; +import cn.cordys.crm.system.dto.response.ModuleFormConfigDTO; +import cn.cordys.crm.system.service.ModuleFormCacheService; +import cn.cordys.crm.system.service.ModuleFormService; import cn.cordys.mybatis.BaseMapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import jakarta.annotation.Resource; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; import java.util.List; -import cn.cordys.common.uid.IDGenerator; -import cn.cordys.common.service.BaseService; -import cn.cordys.crm.contract.dto.request.*; -import cn.cordys.crm.contract.dto.response.*; -import cn.cordys.crm.contract.mapper.ExtContractPaymentPlanMapper; -import cn.cordys.crm.contract.domain.ContractPaymentPlan; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @@ -28,16 +50,96 @@ public class ContractPaymentPlanService { @Resource private ExtContractPaymentPlanMapper extContractPaymentPlanMapper; + @Resource + private ModuleFormCacheService moduleFormCacheService; + + @Resource + private ModuleFormService moduleFormService; + + @Resource + private ContractPaymentPlanFieldService contractPaymentPlanFieldService; + @Resource private BaseService baseService; - public List list(ContractPaymentPlanPageRequest request, String orgId) { - List list = extContractPaymentPlanMapper.list(request, orgId); - // todo + public PagerWithOption> list(ContractPaymentPlanPageRequest request, String userId, String orgId, DeptDataPermissionDTO deptDataPermission) { + Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize()); + List list = extContractPaymentPlanMapper.list(request, userId, orgId, deptDataPermission); + list = buildListData(list, orgId); + Map> optionMap = buildOptionMap(orgId, list); + return PageUtils.setPageInfoWithOption(page, list, optionMap); + } + + public ModuleFormConfigDTO getFormConfig(String orgId) { + return moduleFormCacheService.getBusinessFormConfig(FormKey.CONTRACT_PAYMENT_PLAN.getKey(), orgId); + } - return baseService.setCreateAndUpdateUserName(list); + public Map> buildOptionMap(String orgId, List list) { + // 处理自定义字段选项数据 + ModuleFormConfigDTO formConfig = getFormConfig(orgId); + // 获取所有模块字段的值 + List moduleFieldValues = moduleFormService.getBaseModuleFieldValues(list, ContractPaymentPlanListResponse::getModuleFields); + // 获取选项值对应的 option + Map> optionMap = moduleFormService.getOptionMap(formConfig, moduleFieldValues); + + // 补充负责人选项 + List ownerFieldOption = moduleFormService.getBusinessFieldOption(list, + ContractPaymentPlanListResponse::getOwner, ContractPaymentPlanListResponse::getOwnerName); + optionMap.put(BusinessModuleField.CONTRACT_PAYMENT_PLAN_OWNER.getBusinessKey(), ownerFieldOption); + + return optionMap; } + public List buildListData(List list, String orgId) { + if (CollectionUtils.isEmpty(list)) { + return list; + } + List planIds = list.stream().map(ContractPaymentPlanListResponse::getId) + .collect(Collectors.toList()); + + Map> caseCustomFiledMap = contractPaymentPlanFieldService.getResourceFieldMap(planIds, true); + + List ownerIds = list.stream() + .map(ContractPaymentPlanListResponse::getOwner) + .distinct() + .toList(); + + List createUserIds = list.stream() + .map(ContractPaymentPlanListResponse::getCreateUser) + .distinct() + .toList(); + List updateUserIds = list.stream() + .map(ContractPaymentPlanListResponse::getUpdateUser) + .distinct() + .toList(); + List userIds = Stream.of(ownerIds, createUserIds, updateUserIds) + .flatMap(Collection::stream) + .distinct() + .toList(); + Map userNameMap = baseService.getUserNameMap(userIds); + + Map userDeptMap = baseService.getUserDeptMapByUserIds(ownerIds, orgId); + + list.forEach(planListResponse -> { + // 获取自定义字段 + List customerFields = caseCustomFiledMap.get(planListResponse.getId()); + planListResponse.setModuleFields(customerFields); + + UserDeptDTO userDeptDTO = userDeptMap.get(planListResponse.getOwner()); + if (userDeptDTO != null) { + planListResponse.setDepartmentId(userDeptDTO.getDeptId()); + planListResponse.setDepartmentName(userDeptDTO.getDeptName()); + } + + String createUserName = baseService.getAndCheckOptionName(userNameMap.get(planListResponse.getCreateUser())); + planListResponse.setCreateUserName(createUserName); + String updateUserName = baseService.getAndCheckOptionName(userNameMap.get(planListResponse.getUpdateUser())); + planListResponse.setUpdateUserName(updateUserName); + planListResponse.setOwnerName(userNameMap.get(planListResponse.getOwner())); + }); + + return list; + } public ContractPaymentPlanGetResponse get(String id) { ContractPaymentPlan contractPaymentPlan = contractPaymentPlanMapper.selectByPrimaryKey(id); diff --git a/backend/crm/src/test/java/cn/cordys/crm/contract/ContractPaymentPlanControllerTests.java b/backend/crm/src/test/java/cn/cordys/crm/contract/ContractPaymentPlanControllerTests.java index 4b0a56ec1..af6b04a71 100644 --- a/backend/crm/src/test/java/cn/cordys/crm/contract/ContractPaymentPlanControllerTests.java +++ b/backend/crm/src/test/java/cn/cordys/crm/contract/ContractPaymentPlanControllerTests.java @@ -51,7 +51,7 @@ void testPageEmpty() throws Exception { Assertions.assertTrue(CollectionUtils.isEmpty(contractPaymentPlanList)); // 校验权限 - requestPostPermissionTest(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_READ, DEFAULT_PAGE, request); + requestPostPermissionTest(PermissionConstants.CONTRACT_PAYMENT_PLAN_READ, DEFAULT_PAGE, request); } @Test @@ -72,7 +72,7 @@ void testAdd() throws Exception { Assertions.assertEquals(request.getPlanAmount().intValue(), contractPaymentPlan.getPlanAmount().intValue()); // 校验权限 - requestPostPermissionTest(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_ADD, DEFAULT_ADD, request); + requestPostPermissionTest(PermissionConstants.CONTRACT_PAYMENT_PLAN_ADD, DEFAULT_ADD, request); } @Test @@ -93,7 +93,7 @@ void testUpdate() throws Exception { this.requestPostWithOk(DEFAULT_UPDATE, emptyRequest); // 校验权限 - requestPostPermissionTest(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_UPDATE, DEFAULT_UPDATE, request); + requestPostPermissionTest(PermissionConstants.CONTRACT_PAYMENT_PLAN_UPDATE, DEFAULT_UPDATE, request); } @Test @@ -108,7 +108,7 @@ void testGet() throws Exception { Assertions.assertEquals(responseContractPaymentPlan, contractPaymentPlan); // 校验权限 - requestGetPermissionTest(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_READ, DEFAULT_GET, addContractPaymentPlan.getId()); + requestGetPermissionTest(PermissionConstants.CONTRACT_PAYMENT_PLAN_READ, DEFAULT_GET, addContractPaymentPlan.getId()); } @Test @@ -124,7 +124,7 @@ void testPage() throws Exception { // todo // 校验权限 - requestPostPermissionTest(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_READ, DEFAULT_PAGE, request); + requestPostPermissionTest(PermissionConstants.CONTRACT_PAYMENT_PLAN_READ, DEFAULT_PAGE, request); } @Test @@ -133,6 +133,6 @@ void delete() throws Exception { this.requestGetWithOk(DEFAULT_DELETE, addContractPaymentPlan.getId()); // todo // 校验权限 - requestGetPermissionTest(PermissionConstants.CONTRACT_CONTRACT_PAYMENT_PLAN_DELETE, DEFAULT_DELETE, addContractPaymentPlan.getId()); + requestGetPermissionTest(PermissionConstants.CONTRACT_PAYMENT_PLAN_DELETE, DEFAULT_DELETE, addContractPaymentPlan.getId()); } } \ No newline at end of file