协议费用功能完善

commons/src/main/java/com/jzg/commons/entity/dto/CostManagementVo.java

@@ -80,4 +80,7 @@ public class CostManagementVo {
     @Schema(description = "规则条件集合")
     private List<PtlAgreementCostRuleVo> ruleConditions;
 
+    @Schema(description = "协议描述")
+    private String agreementName;
+
 }

tenant/organization/src/main/java/com/jzg/organization/controller/AccountController.java

@@ -1,15 +1,10 @@
 package com.jzg.organization.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.commons.aop.OperatorTrajectory;
-import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.account.dto.*;
 import com.jzg.commons.entity.account.vo.AccountVo;
-import com.jzg.commons.entity.dto.AgreementAddParam;
-import com.jzg.commons.util.AssertionUtils;
-import com.jzg.organization.mapper.PtlAgreementMapper;
 import com.jzg.organization.service.InvAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Tag(name="来往企业管理接口")
@@ -34,7 +28,7 @@ public class AccountController extends BaseController {
      */
     @PostMapping("/accountPage")
     @Operation(summary = "企业管理列表分页")
-    public HttpResult accountPage(@RequestBody AccountParam param){
+    public HttpResult<Page<AccountVo>> accountPage(@RequestBody AccountParam param){
         Page<AccountVo> result = accountService.queryPage(param);
         return HttpResult.ok(result);
     }
@@ -64,12 +58,13 @@ public class AccountController extends BaseController {
 
     /**
      * 来往企业添加
-     * @param param
-     * @return
+     *
+     * @param param 来往企业的信息
+     * @return HttpResult<String>
      */
     @Operation(summary = "来往企业添加")
     @PostMapping("/accountAdd")
-    public HttpResult accountAdd(@Validated @RequestBody AccountAddParam param) {
+    public HttpResult<String> accountAdd(@Validated @RequestBody AccountAddParam param) {
         accountService.cardAdd(param);
         return HttpResult.ok("新增成功");
     }

tenant/organization/src/main/java/com/jzg/organization/controller/PtlAgreementCostController.java

@@ -1,6 +1,7 @@
 package com.jzg.organization.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.page.HttpResult;
@@ -99,9 +100,14 @@ public class PtlAgreementCostController {
     }
 
 
+    /**
+     *
+     * @author lipf
+     * @date 2026/4/25 17:12
+     */
     @Operation(summary = "费用管理分页列表")
     @PostMapping("pageList")
-    public HttpResult<CostManagementVo> pageList(@RequestBody PtlAgreementCostParam costParam){
+    public HttpResult<Page<CostManagementVo>> pageList(@RequestBody PtlAgreementCostParam costParam){
         return ptlAgreementCostService.pageList(costParam);
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementCostService.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
@@ -37,6 +38,12 @@ public interface PtlAgreementCostService extends IService<PtlAgreementCost> {
 
     HttpResult auditFailed(CostReviewParam costReviewParam);
 
-    HttpResult pageList(PtlAgreementCostParam costParam);
+    /**
+     * 查询协议费用
+     *
+     * @author lipf
+     * @date 2026/4/25 17:12
+     */
+    HttpResult<Page<CostManagementVo>> pageList(PtlAgreementCostParam costParam);
 
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/InvAccountCardServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +14,8 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.mapper.InvAccountCardMapper;
 import com.jzg.organization.service.InvAccountCardService;
 import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -25,8 +28,11 @@ import org.springframework.stereotype.Service;
 public class InvAccountCardServiceImpl extends ServiceImpl<InvAccountCardMapper, InvAccountCard>
     implements InvAccountCardService {
 
+    private static final Logger log = LoggerFactory.getLogger(InvAccountCardServiceImpl.class);
+
     @Override
     public Page<AccountCardVo> queryPage(AccountCardParam param) {
+        log.info("财务中心-账户管理-查询：param=[{}]", JSONUtil.toJsonStr(param));
         Page<AccountCardVo> page = baseMapper.queryPage(param.getPage(), param);
         return page;
     }

tenant/organization/src/main/java/com/jzg/organization/service/impl/InvAccountServiceImpl.java

@@ -31,6 +31,12 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
 
     private static final Logger log = LoggerFactory.getLogger(InvAccountServiceImpl.class);
 
+    /**
+     * 查询财务的来往企业
+     *
+     * @author lipf
+     * @date 2026/4/25 16:41
+     */
     @Override
     public Page<AccountVo> queryPage(AccountParam param) {
         return baseMapper.queryPage(param.getPage(), param);
@@ -57,8 +63,15 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
         return accountVo;
     }
 
+    /**
+     * 添加来往企业
+     *
+     * @author lipf
+     * @date 2026/4/25 16:36
+     */
     @Override
     public void cardAdd(AccountAddParam param) {
+        log.info("添加来往企业。 param=[{}]", JSONUtil.toJsonStr(param));
         InvAccount account = new InvAccount();
         BeanUtils.copyProperties(param,account);
         save(account);

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -333,8 +333,15 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         return !now.isBefore(start) && !now.isAfter(end);
     }
 
+    /**
+     * 查询协议费用
+     *
+     * @author lipf
+     * @date 2026/4/25 17:13
+     */
     @Override
     public HttpResult<Page<CostManagementVo>> pageList(PtlAgreementCostParam costParam) {
+        log.info("查询协议费用信息：costParam=[{}]", JSONUtil.toJsonStr(costParam));
         Page<CostManagementVo> costManagementVoPage = baseMapper.pageList(costParam.getPage(), costParam);
         costManagementVoPage.getRecords().forEach(item->{
             if(item.getCostRules() != null && !item.getCostRules().equals("")){

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -3,7 +3,6 @@ package com.jzg.organization.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.nacos.common.utils.CollectionUtils;
@@ -165,6 +164,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public Page<InsPlyIncome> getReceivablePage(ReceivableQueryVo receivableQueryVo) {
+        log.info("获取私有协议手续费列表。receivableQueryVo=[{}]", JSONUtil.toJsonStr(receivableQueryVo));
         return baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
     }
 
@@ -919,6 +919,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public Page<InvoiceRecordResult> getInvoiceRecordList(InvoiceRecordQueryVo invoiceRecordQueryVo) {
+        log.info("手续费应收-开票记录-查询：invoiceRecordQueryVo=[{}]", JSONUtil.toJsonStr(invoiceRecordQueryVo));
         return baseMapper.getInvoiceRecordList(invoiceRecordQueryVo.getPage(), invoiceRecordQueryVo);
     }
 
@@ -1305,6 +1306,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public List<CompanySuperviseSettlementReportDto> companySuperviseSettlementReport(SettlementReportQueryVo settlementReportQueryVo) {
+        log.info("私有协议查询结算报表：settlementReportQueryVo=[{}]", JSONUtil.toJsonStr(settlementReportQueryVo));
 //        // 构建查手续费类型的数组
 //        List<String> invoiceTypes = new ArrayList<>();
 //        invoiceTypes.add("1");
@@ -1315,7 +1317,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         Map<String, BigDecimal> invoicingAmountMap = commissionInvoicingAmount.stream()
                 .collect(Collectors.toMap(
                         InvoiceAmountDto::getCompanyId,
-                        dto -> dto.getSuperviseAmount() != null ? dto.getSuperviseAmount() : BigDecimal.ZERO,
+                        dto -> dto.getSuperviseAmount()  != null ? dto.getSuperviseAmount() : BigDecimal.ZERO,
                         (existing, replacement) -> existing
                 ));
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDictServiceImpl.java

@@ -40,7 +40,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         List<SysDict> list = list(queryWrapper);
         List<SysDictVo> collect = list.stream().map(SysDictVo::new)
                 .sorted(Comparator.comparing(SysDictVo::getCreateTime, Comparator.nullsLast(Comparator.naturalOrder())))
-                .collect(Collectors.toList());
+                .toList();
         Map<String, List<SysDictVo>> map = collect.stream()
                 .collect(Collectors.groupingBy(vo -> Objects.requireNonNullElse(vo.getParentValue(), "0")));
         collect.forEach(i -> i.setChild(map.getOrDefault(i.getId(), new ArrayList<>())));

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -332,6 +332,7 @@
             pc.create_time,
             pc.create_by,
             pa.agreement_code,
+            pa.agreement_name,
             pa.agreement_title,
             pa.agreement_abbreviation,
             pa.id as ptlAgreementId,