Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -27,6 +27,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -299,9 +300,13 @@ public class QuoteEchoVo extends QuoteVo {
 
     @Schema(description = "是否是疑问订单")
     private boolean isProblem;
+
     @Schema(description = "疑问订单原因")
     private String problemReason;
+
     @Schema(description = "设为疑问订单的时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime problemTime;
 
     @Schema(description = "权益信息")

commons/src/main/java/com/jzg/commons/entity/vo/CostExternalListVo.java

@@ -14,6 +14,14 @@ public class CostExternalListVo {
 
     private String id;
 
+    @Schema(description = "加投比例")
+    private String addThrow;
+
+    @Schema(description = "内部协议id")
+    private String ptlAgreementId;
+
+    @Schema(description = "跟单比例")
+    private String keepPointRatio;
 
     @Schema(description = "协议代码")
     private String agreementCode;
@@ -76,9 +84,22 @@ public class CostExternalListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String auditTime;
 
+    @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String updateTime;
+
     @Schema(description = "审核人")
     private String auditPerson;
 
+    @Schema(description = "修改人")
+    private String updateBy;
+
+    @Schema(description = "是否有效")
+    private String isDelete;
+
+    @Schema(description = "所属机构编码")
+    private String systemCode;
+
     @Schema(description = "审核描述")
     private String reviewDescription;
 

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

@@ -6203,27 +6203,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      */
     @Override
     public Page<ReceiverSettlementReportDto> receiverSettlementReportWithSettlemetnDate(Page page, SettlementReportQueryVo vo) {
-        log.info("平台协议应收-结算报表-对接人结算报表查询。結算时间不为空 settlementReportQueryVo=[{}]", JSONUtil.toJsonStr(vo));
-        Page<InsPlyIncomeInvoiceSettlement> pageRes = insPlyIncomeInvoiceSettlementMapper.querySettlementBySettlementDate(page,vo);
-        List<InsPlyIncomeInvoiceSettlement> records = pageRes.getRecords();
-        Map<String, List<InsPlyIncomeInvoiceSettlement>> res =  records.stream()
-                .collect(Collectors.groupingBy(InsPlyIncomeInvoiceSettlement::getContactPerson));
-        Page<ReceiverSettlementReportDto> pagDto = new Page<>(page.getPages(), page.getSize());
-        List<ReceiverSettlementReportDto> dtos = new ArrayList<>();
-        for (String s : res.keySet()) {
-            ReceiverSettlementReportDto dto = new ReceiverSettlementReportDto();
-            dto.setReceiver(s);
-            List<InsPlyIncomeInvoiceSettlement> settlements = res.get(s);
-            BigDecimal diffAmount = settlements.stream().map(InsPlyIncomeInvoiceSettlement::getSettlementPaymentDifference).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal actualReceivedAmount = settlements.stream().map(InsPlyIncomeInvoiceSettlement::getActualReceivedAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-            dto.setSettledAmount(actualReceivedAmount.toString());
-            dto.setUnSettledAmount(BigDecimal.ZERO.toString());
-            dto.setTotalReceivable(BigDecimalUtil.add(diffAmount, actualReceivedAmount).toString());
-            dto.setTotalPaymentDifference(diffAmount);
-            dtos.add(dto);
-        }
-        pagDto.setRecords(dtos);
-        return pagDto;
+        // 改为复用全量查询方法，从 ins_ply_income 出发，保持数据口径一致
+        // 时间范围通过 vo.startTime / vo.endTime 由 getReceiverSettlementReport SQL 中的 ipii.invoice_time 过滤
+        log.info("平台协议应收-结算报表-对接人结算报表查询（按时间范围）。settlementReportQueryVo=[{}]", JSONUtil.toJsonStr(vo));
+        return this.receiverSettlementReport(page, vo);
     }
 
     /**

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

@@ -32,6 +32,7 @@
 
     <resultMap id="ExternalListVoMap" type="com.jzg.commons.entity.vo.CostExternalListVo">
         <result column="id" property="id" />
+        <result column="ptl_agreement_id" property="ptlAgreementId" />
         <result column="agreement_code" property="agreementCode" />
         <result column="agreement_abbreviation" property="agreementAbbreviation" />
         <result column="product_name" property="productName" />
@@ -40,15 +41,23 @@
         <result column="is_inquiry" property="isInquiry" />
         <result column="effective_time" property="effectiveTime" />
         <result column="failure_time" property="failureTime" />
-        <result column="effective" property="effective" />
+        <result column="audit_method" property="auditMethod" />
         <result column="audit_status" property="auditStatus" />
         <result column="is_enabled" property="isEnabled" />
+        <result column="review_description" property="reviewDescription" />
         <result column="contact_person" property="contactPerson" />
         <result column="contact_mobile" property="contactMobile" />
-        <result column="audit_method" property="auditMethod" />
+        <result column="audit_person" property="auditPerson" />
+        <result column="audit_time" property="auditTime" />
         <result column="priority_level" property="priorityLevel" />
+        <result column="add_throw" property="addThrow" />
+        <result column="keep_point_ratio" property="keepPointRatio" />
         <result column="create_time" property="createTime" />
         <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="is_delete" property="isDelete" />
+        <result column="system_code" property="systemCode" />
         <collection property="costExternalTypeAdds" column="id" ofType="com.jzg.commons.entity.vo.CostExternalTypeVo" select="selectCostExternalTypeVo" />
     </resultMap>
 
@@ -121,19 +130,30 @@
     <select id="pageList" resultMap="ExternalListVoMap">
         SELECT
         ce.id,
+        ce.ptl_agreement_id,
         ce.product_name,
         ce.product_id,
-        ce.cost_describe,
-        ce.is_inquiry,
         ce.effective_time,
         ce.failure_time,
+        ce.audit_method,
         ce.audit_status,
         ce.is_enabled,
+        ce.review_description,
+        ce.is_inquiry,
+        ce.cost_describe,
         ce.contact_person,
         ce.contact_mobile,
-        ce.audit_method,
+        ce.audit_person,
+        ce.audit_time,
         ce.create_time,
         ce.create_by,
+        ce.update_time,
+        ce.update_by,
+        ce.is_delete,
+        ce.system_code,
+        ce.priority_level,
+        ce.add_throw,
+        ce.keep_point_ratio,
         pa.agreement_code,
         pa.agreement_abbreviation
         FROM