提交机构审核关联审核表机构查询

src/main/java/com/ydtech/modules/admin/controller/AgreeReportConroller.java

@@ -31,10 +31,10 @@ public class AgreeReportConroller {
      *  @version
      *  @author: hxl
      *  @Date: 2024/6/28 8:36
-     *  @Description:  查询后线人员的机构
+     *  @Description:  控制台战略合作单位统计
      */
     @PostMapping("queryPage")
-    @ApiOperation(value = "查询后线人员的机构")
+    @ApiOperation(value = "控制台战略合作单位统计")
     public HttpResult<BasePageResult<AgreeReportDto>> queryPage(@RequestBody AgreeReportQueryDto agreeReportQueryDto) {
 
         try{

src/main/java/com/ydtech/modules/admin/controller/FinanceDataReportConroller.java

@@ -90,8 +90,6 @@ public class FinanceDataReportConroller {
     @ApiOperation(value = "查询财务数据 -机构 - 已提现/提现中/驳回的金额")
     public HttpResult<BasePageResult<RevenueAndExpenditureDeptDataDto>> queryRevenueAndExpenditureDeptDataPage(@RequestBody RevenueAndExpenditureDeptQueryDto revenueAndExpenditureDeptQueryDto) {
         try{
-            // todo 机构历史记录表未关联审核表的id  无法联查
-            // todo  审核表中缺少审核时间，驳回人，驳回时间，驳回原因
             BasePageResult<RevenueAndExpenditureDeptDataDto> result = financeDataReportService.queryRevenueAndExpenditureDeptDataPage(revenueAndExpenditureDeptQueryDto);
             return HttpResult.ok("查询数据成功", result);
         }catch (Exception e){

src/main/resources/mapper/modules/admin/SysDeptAccountHistoryMapper.xml

@@ -61,11 +61,20 @@
         his.amount as "amount",
         DATE_FORMAT(his.create_time, '%Y-%m-%d %H:%i:%s') as "createTime",
         his.dept_id as deptId,
-        dept.name as deptName
+        dept.name as deptName,
+        his.auditing_id as auditiingId,
+        CASE sda.status
+        WHEN '0' THEN '提现中'
+        WHEN '1' THEN '已提现'
+        WHEN '2' THEN '已驳回'
+        ELSE ''
+        END  AS auditingStatus,
+        sda.auditing_time as auditingTime
         FROM
         sys_dept_account_history his
         LEFT JOIN ins_area_company ins ON his.suborder = ins.id
         left join  sys_dept dept on dept.id =his.dept_id
+        left join  sys_dept_account_withdraw sda on sda.id =his.auditing_id
         WHERE
            his.documentary =1
         <if test="vo.deptId !=null and vo.deptId != '' ">