数据报表：财务数据-审核统计

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportPersonCheckDataDetailDto.java

@@ -1,6 +1,5 @@
 package com.jzg.commons.entity.report.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -13,7 +12,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -31,6 +29,9 @@ import java.util.Date;
 @NoArgsConstructor
 public class ReportPersonCheckDataDetailDto {
 
+
+    private String userId;
+
     /**
      *  订单号
      */

consoleStatistics/src/main/java/com/jzg/console/client/FeeAuditClient.java

@@ -7,6 +7,7 @@ import com.jzg.commons.entity.orders.vo.FeeAuditSummaryParam;
 import com.jzg.commons.entity.orders.vo.FeeAuditSummaryVO;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.report.dto.ReportOperatingProfitDataDto;
+import com.jzg.commons.entity.report.dto.ReportPersonCheckDataDetailDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -49,4 +50,21 @@ public interface FeeAuditClient {
     HttpResult<Map<String, ReportOperatingProfitDataDto>> queryOperatingProfits(@RequestParam("year") Integer year,
                                                                                 @RequestParam("sqlType") String sqlType);
 
+    /**
+     * 查询审核明细
+     *
+     * @param userName 用户登录名
+     * @param systemCode 租户代码
+     * @param pageNo
+     * @param pageSize
+     * @author lipf
+     * @date 2026/7/27 11:13
+     */
+    @GetMapping("/feeAudit/queryPageDetailList")
+    HttpResult<List<ReportPersonCheckDataDetailDto>> queryPageDetailList(@RequestParam("systemCode") String systemCode,
+                                                                         @RequestParam("userName") String userName,
+                                                                         @RequestParam("pageNo") Integer pageNo,
+                                                                         @RequestParam("pageSize") Integer pageSize);
+
+
 }

consoleStatistics/src/main/java/com/jzg/console/client/OrganizationClient.java

@@ -2,7 +2,10 @@ package com.jzg.console.client;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.user.vo.UserInfoWithPhone;
+import com.jzg.commons.entity.vo.SysUserVo;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 

consoleStatistics/src/main/java/com/jzg/console/client/PlatformClient.java

@@ -0,0 +1,29 @@
+package com.jzg.console.client;
+
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.user.vo.UserInfoWithPhone;
+import com.jzg.commons.entity.vo.SysUserVo;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * 调用 quotation-summary 的订单审核接口 Feign 客户端
+ */
+@FeignClient(value = "jzg-platform")
+public interface PlatformClient {
+
+    /**
+     * 平台用户信息查询
+     * @param id sys_user表的序号
+     * @return HttpResult<SysUserVo> 平台用户信息
+     */
+    @GetMapping("/user/userGet")
+    @Operation(summary = "平台用户信息查询")
+    public HttpResult<SysUserVo> userGet(@RequestParam("id") String id);
+
+}

consoleStatistics/src/main/java/com/jzg/console/controller/ReportFinanceDataManageController.java

@@ -331,6 +331,7 @@ public class ReportFinanceDataManageController extends BaseController {
     @Operation(summary = "财务数据-人员审核-明细查询", description = "财务数据-人员审核-明细查询")
     @PostMapping(value = "/personCheckDataDetailPageList")
     public HttpResult<?> personCheckDataDetailPageList(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
+        log.info("财务数据-人员审核-明细查询。 reportSearchCommonVo=[{}]", JSONUtil.toJsonStr(reportSearchCommonVo));
         try{
             IPage<?> pageList = reportPersonCheckDataService.getPageDetailListByParams(reportSearchCommonVo);
             return HttpResult.ok(pageList);

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

@@ -12,8 +12,10 @@ import com.jzg.commons.entity.orders.vo.FeeAuditSummaryVO;
 import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.commons.entity.user.vo.UserInfoWithPhone;
+import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.console.client.FeeAuditClient;
 import com.jzg.console.client.OrganizationClient;
+import com.jzg.console.client.PlatformClient;
 import com.jzg.console.service.ReportPersonCheckDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -45,6 +46,9 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
 
     @Autowired
     private FeeAuditClient feeAuditClient;
+    @Autowired
+    private PlatformClient platformClient;
+
 
 
     /**
@@ -135,12 +139,18 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
         log.info("财务数据-人员审核-明细查询:reportSearchCommonVo=[{}]", JSONUtil.toJsonStr(reportSearchCommonVo));
-
-        Page<ReportPersonCheckDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        //String userId = reportSearchCommonVo.getUserId();
+        //HttpResult<SysUserVo> sysUserVoHttpResult = platformClient.userGet(userId);
+        //SysUserVo sysUserVo = sysUserVoHttpResult.getData();
+        String userName = reportSearchCommonVo.getUserId();
+        String name = reportSearchCommonVo.getUserId();
+        String systemCode = baseController.getSystemCode();
+        List<ReportPersonCheckDataDetailDto> detailList =  feeAuditClient.queryPageDetailList(systemCode,userName, reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize()).getData();
+        detailList = detailList.stream().peek(action->{action.setCheckUserName(name);}).toList();
+//        Page<ReportPersonCheckDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
         IPage<ReportPersonCheckDataDetailDto> detailPageList = new Page<ReportPersonCheckDataDetailDto>();
-        List<ReportPersonCheckDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
+        detailPageList.setTotal(CollUtil.size(detailList));
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
@@ -154,24 +164,25 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
      */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportPersonCheckDataDetailDto> detailList = getDetailList();
+        List<ReportPersonCheckDataDetailDto> detailList =  this.getPageDetailListByParams(reportSearchCommonVo).getRecords().stream().
+                map(action->(ReportPersonCheckDataDetailDto)action).collect(Collectors.toList());
         upLoadFile(reportSearchCommonVo, ReportPersonCheckDataDetailDto.class,detailList,"财务数据-人员审核-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
-    /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
-     */
-    public List<ReportPersonCheckDataDetailDto>  getDetailList(){
-        List<ReportPersonCheckDataDetailDto> list =new ArrayList<>();
-        ReportPersonCheckDataDetailDto reportPersonCheckDataDetailDto = ReportPersonCheckDataDetailDto.builder()
-                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单")
-                .submitCheckTime(new Date()).checkTime(new Date()).checkResult("已审核")
-                .checkDuration(20L).checkUserName("李四").checkUserPhone("18811459985")
-                .build();
-        list.add(reportPersonCheckDataDetailDto);
-        return list;
-    }
+//    /**
+//     *  @version
+//     *  @author: hxl
+//     *  @Date: 2025/9/24 10:42
+//     *  @Description:  模拟数据
+//     */
+//    public List<ReportPersonCheckDataDetailDto>  getDetailList(){
+//        List<ReportPersonCheckDataDetailDto> list =new ArrayList<>();
+//        ReportPersonCheckDataDetailDto reportPersonCheckDataDetailDto = ReportPersonCheckDataDetailDto.builder()
+//                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单")
+//                .submitCheckTime(new Date()).checkTime(new Date()).checkResult("已审核")
+//                .checkDuration(20L).checkUserName("李四").checkUserPhone("18811459985")
+//                .build();
+//        list.add(reportPersonCheckDataDetailDto);
+//        return list;
+//    }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsFeeAuditController.java

@@ -13,6 +13,7 @@ import com.jzg.commons.entity.orders.vo.FeeAuditSummaryParam;
 import com.jzg.commons.entity.orders.vo.FeeAuditSummaryVO;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
+import com.jzg.commons.entity.report.dto.ReportPersonCheckDataDetailDto;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 import com.jzg.commons.entity.vo.QuestionOrder;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
@@ -235,4 +236,22 @@ public class InsFeeAuditController {
         List<FeeAuditSummaryVO>  res = insFeeAuditService.queryAuditSummary(param);
         return HttpResult.ok(res);
     }
+
+    /**
+     * 查询审核明细
+     *
+     * @param userName 用户登录名
+     * @param systemCode 租户代码
+     * @param pageNo
+     * @param pageSize
+     * @author lipf
+     * @date 2026/7/27 11:13
+     */
+    @GetMapping("/queryPageDetailList")
+    HttpResult<List<ReportPersonCheckDataDetailDto>> queryPageDetailList(@RequestParam("systemCode") String systemCode,
+                                                                         @RequestParam("userName") String userName,
+                                                                         @RequestParam("pageNo") Integer pageNo,
+                                                                         @RequestParam("pageSize") Integer pageSize){
+        return HttpResult.ok(insFeeAuditService.queryPageDetailList(systemCode, userName, pageNo, pageSize));
+    }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsFeeAuditMapper.java

@@ -1,13 +1,13 @@
 package com.jzg.quotation.summary.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.FeeAuditParam;
 import com.jzg.commons.entity.orders.po.InsFeeAudit;
 import com.jzg.commons.entity.orders.vo.FeeAuditSummaryParam;
 import com.jzg.commons.entity.orders.vo.FeeAuditSummaryVO;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
+import com.jzg.commons.entity.report.dto.ReportPersonCheckDataDetailDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -46,6 +46,11 @@ public interface InsFeeAuditMapper extends BaseMapper<InsFeeAudit> {
      * @date 2026/7/24 14:41
      */
     List<FeeAuditSummaryVO> queryAuditSummary(@Param("param") FeeAuditSummaryParam param);
+
+
+    Page<ReportPersonCheckDataDetailDto> queryPageDetailList(Page<FeeAuditSummaryVO> page,
+                                                             @Param("systemCode") String systemCode,
+                                                             @Param("userName") String userName);
 }
 
 

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

@@ -13,6 +13,7 @@ import com.jzg.commons.entity.orders.vo.FeeAuditSummaryParam;
 import com.jzg.commons.entity.orders.vo.FeeAuditSummaryVO;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
+import com.jzg.commons.entity.report.dto.ReportPersonCheckDataDetailDto;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 
 import java.util.List;
@@ -122,4 +123,16 @@ public interface InsFeeAuditService extends IService<InsFeeAudit> {
      * @date 2026/7/24 14:33
      */
     List<FeeAuditSummaryVO> queryAuditSummary(FeeAuditSummaryParam param);
+
+    /**
+     * 查询审核明细
+     *
+     * @param userName 用户登录名
+     * @param systemCode 租户代码
+     * @param pageNo
+     * @param pageSize
+     * @author lipf
+     * @date 2026/7/27 11:13
+     */
+    List<ReportPersonCheckDataDetailDto> queryPageDetailList(String systemCode, String userName, Integer pageNo, Integer pageSize);
 }

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

@@ -22,6 +22,7 @@ import com.jzg.commons.entity.orders.vo.FeeAuditSummaryVO;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
+import com.jzg.commons.entity.report.dto.ReportPersonCheckDataDetailDto;
 import com.jzg.commons.entity.rights.po.InsOrderRights;
 import com.jzg.commons.entity.rights.po.InsOrderRightsPackage;
 import com.jzg.commons.entity.vo.*;
@@ -1188,6 +1189,25 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         List<FeeAuditSummaryVO> res = baseMapper.queryAuditSummary(param);
         return res;
     }
+
+    /**
+     * 查询审核明细
+     *
+     * @param userName 用户登录名
+     * @param systemCode 租户代码
+     * @param pageNo
+     * @param pageSize
+     * @author lipf
+     * @date 2026/7/27 11:13
+     */
+    @Override
+    public List<ReportPersonCheckDataDetailDto> queryPageDetailList(String systemCode, String userName, Integer pageNo, Integer pageSize) {
+        log.info("查询审核明细：{},{}，{}，{}", systemCode,  userName,  pageNo,pageSize);
+        Page<FeeAuditSummaryVO> page = new Page<>(pageNo, pageSize);
+        Page<ReportPersonCheckDataDetailDto> res =  baseMapper.queryPageDetailList(page, systemCode,userName);
+        log.info("查询审核明细：{},{}，{}，{}, 查询出[{}]条记录", systemCode,  userName,  pageNo,pageSize, CollUtil.size(res.getRecords()));
+        return res.getRecords();
+    }
 }
 
 

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

@@ -330,4 +330,28 @@
         </where>
         group by ifa.receive_user, ifa.audit_status, problem_identify
     </select>
+    <select id="queryPageDetailList"
+            resultType="com.jzg.commons.entity.report.dto.ReportPersonCheckDataDetailDto">
+        select
+            ifa.order_no,
+            ioci.license_no,
+            ifa.create_time AS submitCheckTime,
+            ifa.audit_time AS checkTime,
+            CASE ifa.audit_status
+            WHEN 0 THEN '待审核'
+            WHEN 1 THEN '审核通过'
+            WHEN 2 THEN '审核驳回'
+            ELSE ifa.audit_status
+            END AS checkResult,
+            ifa.audit_time - ifa.create_time  as checkDuration,
+            ifa.audit_user as checkUserPhone
+        from
+        ins_fee_audit ifa
+        left join ins_orders_car_info ioci on
+        ifa.order_no = ioci.order_no
+        and ifa.system_code = #{systemCode}
+        and ifa.receive_user = #{userName}
+        order by
+        ifa.audit_time desc
+    </select>
 </mapper>