fix:统计状态修改

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/vo/ServiceApplicationsTemplateVO.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 
 /**

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java

@@ -2363,10 +2363,10 @@ public class ServiceApplicationsService {
             // 构建两级表头 - 使用 List<List<String>> 格式，每个内部列表是一列
             List<List<String>> head = new ArrayList<>();
             
-            // 第一列：律所名称（合并两行）
+            // 第一列：律所名称（合并两行）- EasyExcel合并规则：两行内容相同才会合并
-            head.add(Arrays.asList("律所名称", ""));
+            head.add(Arrays.asList("律所名称", "律所名称"));
             // 第二列：律师名称（合并两行）
-            head.add(Arrays.asList("律师名称", ""));
+            head.add(Arrays.asList("律师名称", "律师名称"));
             
             // 构建表头
             List<Long> activityIdList = new ArrayList<>();
@@ -2385,7 +2385,7 @@ public class ServiceApplicationsService {
             }
             
             // 最后一列：服务总次数（合并两行）
-            head.add(Arrays.asList("服务总次数", ""));
+            head.add(Arrays.asList("服务总次数", "服务总次数"));
 
             // 构建数据
             List<List<Object>> data = new ArrayList<>();
@@ -2557,8 +2557,8 @@ public class ServiceApplicationsService {
             // 构建两级表头 - 使用 List<List<String>> 格式，每个内部列表是一列
             List<List<String>> head = new ArrayList<>();
             
-            // 第一列：律所名称（合并两行）
+            // 第一列：律所名称（合并两行）- EasyExcel合并规则：两行内容相同才会合并
-            head.add(Arrays.asList("律所名称", ""));
+            head.add(Arrays.asList("律所名称", "律所名称"));
             
             // 构建表头
             List<Long> activityIdList = new ArrayList<>();
@@ -2577,7 +2577,7 @@ public class ServiceApplicationsService {
             }
             
             // 最后一列：服务总次数（合并两行）
-            head.add(Arrays.asList("服务总次数", ""));
+            head.add(Arrays.asList("服务总次数", "服务总次数"));
 
             // 构建数据
             List<List<Object>> data = new ArrayList<>();

yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml

@@ -736,7 +736,7 @@
             GROUP BY user_id
         ) stats ON tsa.user_id = stats.user_id
         WHERE tsa.deleted_flag = 0
-        AND tsa.firm_audit_status = 3
+        AND tsa.association_audit_status = 3
         <if test="queryForm.firmId != null and queryForm.firmId != ''">
             AND tsa.firm_id = #{queryForm.firmId}
         </if>
@@ -757,7 +757,7 @@
                 COUNT(*) AS count
             FROM t_service_applications tsa
             WHERE tsa.deleted_flag = 0
-            AND tsa.firm_audit_status = 3
+            AND tsa.association_audit_status = 3
             AND tsa.user_id = #{userId}
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
                 AND tsa.association_audit_time &gt;= #{queryForm.startTime}
@@ -778,7 +778,7 @@
         FROM t_service_applications tsa
         LEFT JOIN t_department d ON tsa.firm_id = d.department_id
         WHERE tsa.deleted_flag = 0
-        AND tsa.firm_audit_status = 3
+        AND tsa.association_audit_status = 3
         <if test="queryForm.firmId != null and queryForm.firmId != ''">
             AND tsa.firm_id = #{queryForm.firmId}
         </if>
@@ -797,7 +797,7 @@
         LEFT JOIN t_employee e ON tsa.user_id = e.employee_id
         LEFT JOIN t_department d ON tsa.firm_id = d.department_id
         WHERE tsa.deleted_flag = 0
-        AND tsa.firm_audit_status = 3
+        AND tsa.association_audit_status = 3
         AND tsa.firm_id = #{firmId}
         ORDER BY tsa.user_id
     </select>
@@ -814,7 +814,7 @@
         LEFT JOIN t_employee e ON tsa.user_id = e.employee_id
         LEFT JOIN t_department d ON tsa.firm_id = d.department_id
         WHERE tsa.deleted_flag = 0
-        AND tsa.firm_audit_status = 3
+        AND tsa.association_audit_status = 3
         <if test="queryForm.firmId != null and queryForm.firmId != ''">
             AND tsa.firm_id = #{queryForm.firmId}
         </if>
@@ -829,7 +829,7 @@
         FROM t_service_applications tsa
         LEFT JOIN t_department d ON tsa.firm_id = d.department_id
         WHERE tsa.deleted_flag = 0
-        AND tsa.firm_audit_status = 3
+        AND tsa.association_audit_status = 3
         <if test="queryForm.firmId != null and queryForm.firmId != ''">
             AND tsa.firm_id = #{queryForm.firmId}
         </if>
@@ -849,7 +849,7 @@
                 COUNT(*) AS count
             FROM t_service_applications tsa
             WHERE tsa.deleted_flag = 0
-            AND tsa.firm_audit_status = 3
+            AND tsa.association_audit_status = 3
             AND tsa.firm_id = #{firmId}
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
                 AND tsa.association_audit_time &gt;= #{queryForm.startTime}
@@ -894,7 +894,7 @@
             GROUP BY user_id
         ) user_stats ON tsa.user_id = user_stats.user_id
         WHERE tsa.deleted_flag = 0
-        AND tsa.firm_audit_status = 3
+        AND tsa.association_audit_status = 3
         <if test="queryForm.startTime != null and queryForm.startTime != ''">
             AND tsa.association_audit_time &gt;= #{queryForm.startTime}
         </if>
@@ -936,7 +936,7 @@
             GROUP BY firm_id
         ) firm_stats ON tsa.firm_id = firm_stats.firm_id
         WHERE tsa.deleted_flag = 0
-        AND tsa.firm_audit_status = 3
+        AND tsa.association_audit_status = 3
         <if test="queryForm.startTime != null and queryForm.startTime != ''">
             AND tsa.association_audit_time &gt;= #{queryForm.startTime}
         </if>