Przeglądaj źródła

修改bug:
bug表1059,私有应收 批量修改中修改出单协议提示接口异常
bug表1060,平台应收 结算报表-对接人结算报表用结算时间筛选出来的结果不对

jiakai 4 tygodni temu
rodzic
commit
3d94a22b41

+ 5 - 0
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 = "权益信息")

+ 4 - 21
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);
     }
 
     /**