Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622'

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

@@ -102,11 +102,11 @@ public class FeeAuditParam extends PageRequest {
 
     @Schema(description = "审核时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime auditTimeStart;
+    private LocalDate auditTimeBegin;
 
     @Schema(description = "审核时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime auditTimeEnd;
+    private LocalDate auditTimeEnd;
 
     @Schema(description = "审核人")
     private String auditUser;

commons/src/main/java/com/jzg/commons/entity/orders/vo/FeeAuditVo.java

@@ -128,6 +128,10 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "审核人")
     private String auditUser;
 
+    @ExcelProperty("审核人名称")
+    @Schema(description = "审核人名称")
+    private String auditUserName;
+
     @ExcelProperty("驳回原因")
     @Schema(description = "驳回原因")
     private String refuse;

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportFeeAuditSummaryServiceImpl.java

@@ -16,9 +16,6 @@ import com.jzg.console.service.ReportFeeAuditSummaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalTime;
-import java.util.Objects;
-
 /**
  * 费用审核汇总统计 Service 实现
  */
@@ -47,10 +44,10 @@ public class ReportFeeAuditSummaryServiceImpl implements ReportFeeAuditSummarySe
 
         // 转换时间：LocalDate -> LocalDateTime（开始日期的00:00:00，结束日期的23:59:59）
         if (param.getAuditTimeStart() != null) {
-            feeAuditParam.setAuditTimeStart(param.getAuditTimeStart().atStartOfDay());
+            feeAuditParam.setAuditTimeBegin(param.getAuditTimeStart());
         }
         if (param.getAuditTimeEnd() != null) {
-            feeAuditParam.setAuditTimeEnd(param.getAuditTimeEnd().atTime(LocalTime.MAX));
+            feeAuditParam.setAuditTimeEnd(param.getAuditTimeEnd());
         }
 
         // 调用远程服务获取审核列表

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -180,7 +180,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 //            feeAuditVo.setPartnerCompanySimplyName(allCompanyHierarchyPaths.get(Objects.toString(feeAuditVo.getPartnerCompanyId(),"")));
             feeAuditVo.setPartnerCompanySimplyName(feeAuditVo.getPartnerCompanyName());
             // auditUser 非空时，判断是名称还是手机号
-            feeAuditVo.setAuditUser(userInfoService.getUserNameByMobile(feeAuditVo.getAuditUser()));
+            feeAuditVo.setAuditUserName(userInfoService.getUserNameByMobile(feeAuditVo.getAuditUser()));
             feeAuditVo.setCreateBy(userInfoService.getUserNameByMobile(feeAuditVo.getCreateBy()));
 
             // 循环每条数据，查询 ins_fee_orders 并计算权益金额
@@ -569,6 +569,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             JSONObject requestData = new JSONObject();
             requestData.put("orderNo",orderNos);
             HttpResult httpResult = orgClient.addReceivable(requestData);
+            log.info("httpResult=[{}]", JSONUtil.toJsonStr(httpResult));
             AssertionUtils.isFail(httpResult.getCode() == 500,"应收出错");
             this.dealDistribution(feeOrders,userAccount);
         }else{

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -213,11 +213,11 @@
             <if test="param.niPolicyNumber != null and param.niPolicyNumber != ''">
                 and ioep.no_policy = #{param.niPolicyNumber}
             </if>
-            <if test="param.auditTimeStart != null and param.auditTimeEnd != null">
-                and DATE_FORMAT(ifa.audit_time, '%Y-%m-%d') between #{param.auditTimeStart} AND #{param.auditTimeEnd}
+            <if test="param.auditTimeBegin != null and param.auditTimeEnd != null">
+                and DATE_FORMAT(ifa.audit_time, '%Y-%m-%d') between #{param.auditTimeBegin} AND #{param.auditTimeEnd}
             </if>
             <if test="param.auditUser != null and param.auditUser != ''">
-                and ifa.audit_user = #{param.auditUser}
+                and ifa.audit_user like concat('%',#{param.auditUser},'%')
             </if>
             <if test="param.auditStatus != null and param.auditStatus != ''">
                 and ifa.audit_status = #{param.auditStatus}

tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -36,7 +36,7 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
     /**
      * 获取为审核的订单列表
      */
-    List<InsPlyIncome> getUnauditedOrderList(List<String> orderNo, String orderStatus, String auditStatus, String systemCode);
+    List<InsPlyIncome> getUnauditedOrderList(List<String> orderNo, String auditStatus, String systemCode);
 
     /**
      * 获取应收订单的保司

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

@@ -187,7 +187,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      */
     @Override
     public List<InsPlyIncome> getUnauditOrderList(List<String> orderNo, String orderStatus, String auditStatus, String systemCode) {
-        return baseMapper.getUnauditedOrderList(orderNo, orderStatus, auditStatus, systemCode);
+        return baseMapper.getUnauditedOrderList(orderNo, auditStatus, systemCode);
     }
 
     /**

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

@@ -195,7 +195,7 @@
                     #{id}
                 </foreach>
             </if>
-            AND io.order_status = #{orderStatus}
+            AND io.order_status in (5,0)
             <if test="auditStatus != null and auditStatus != ''">
                 AND ifa.audit_status = #{auditStatus}
             </if>