From e83d080187d1e43ca28354889ca1f7ffb02d01d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwangzihua=E2=80=9D?= <wzh971129>
Date: Mon, 12 Jan 2026 09:00:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ServiceApplicationsMapper.xml     | 122 +++++++++++++++++-
 1 file changed, 118 insertions(+), 4 deletions(-)

diff --git a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml
index fb4b40b..33d44d0 100644
--- a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml
+++ b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml
@@ -34,7 +34,8 @@
         t_service_applications.activity_category_id,
         t_service_applications.activity_name_id,
         t_service_applications.attachment_ids,
-        t_service_applications.report_time
+        t_service_applications.report_time,
+        t_service_applications.position_id
     </sql>
 
     <!-- 分页查询 -->
@@ -77,6 +78,12 @@
                 <if test="queryForm.activityCategoryId != null and queryForm.activityCategoryId != ''">
                     and activity_category_id = #{queryForm.activityCategoryId}
                 </if>
+                <if test="queryForm.associationAuditStatus != null and queryForm.associationAuditStatus != ''">
+                    and association_audit_status = #{queryForm.associationAuditStatus}
+                </if>
+                <if test="queryForm.firmAuditStatus != null and queryForm.firmAuditStatus != ''">
+                    and firm_audit_status = #{queryForm.firmAuditStatus}
+                </if>
                 <if test="queryForm.activityNameId != null and queryForm.activityNameId != ''">
                     and activity_name_id = #{queryForm.activityNameId}
                 </if>
@@ -86,10 +93,32 @@
                         #{item}
                     </foreach>
                 </if>
+                <if test="queryForm.positionId != null and queryForm.positionId != ''">
+                    and position_id = #{queryForm.positionId}
+                </if>
+                <!-- 协会角色过滤条件：只在没有明确指定任一审核状态时才应用此规则，且对自己创建的数据不过滤 -->
+                <if test="queryForm.includeAssociationReviewed != null and queryForm.includeAssociationReviewed and (queryForm.associationAuditStatus == null or queryForm.associationAuditStatus == '') and (queryForm.firmAuditStatus == null or queryForm.firmAuditStatus == '')">
+                    AND (
+                        (t_service_applications.association_audit_status IS NOT NULL 
+                        AND t_service_applications.association_audit_status &gt;= 1)
+                        OR t_service_applications.user_id = #{queryForm.currentUserId} <!-- 对自己创建的数据不过滤 -->
+                    )
+                </if>
+                <!-- 普通律所用户不过滤审核状态，当noStatusFilter为true时，不应用firm审核状态过滤 -->
+                <if test="queryForm.noStatusFilter != null and queryForm.noStatusFilter">
+                    <!-- 普通律所用户：不过滤firm_audit_status，可以看到所有状态的数据 -->
+                </if>
+                <!-- 律所管理员过滤条件：只在没有明确指定任一审核状态时才应用此规则，且对自己创建的数据不过滤 -->
+                <if test="queryForm.includeFirmReviewed != null and queryForm.includeFirmReviewed and (queryForm.firmAuditStatus == null or queryForm.firmAuditStatus == '') and (queryForm.associationAuditStatus == null or queryForm.associationAuditStatus == '')">
+                    AND (
+                        (t_service_applications.firm_audit_status IS NOT NULL 
+                        AND (t_service_applications.firm_audit_status = 1 OR t_service_applications.firm_audit_status = 3 OR t_service_applications.firm_audit_status = 4))
+                        OR t_service_applications.user_id = #{queryForm.currentUserId} <!-- 对自己创建的数据不过滤 -->
+                    )
+                </if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY t_service_applications.firm_audit_status DESC,association_audit_status DESC
     </select>
-
     <update id="batchUpdateDeleted">
         update t_service_applications set deleted_flag = #{deletedFlag}
         where application_id in
@@ -102,14 +131,71 @@
         update t_service_applications set deleted_flag = #{deletedFlag}
         where application_id = #{applicationId}
     </update>
+    
     <update id="batchSubmit">
-        update t_service_applications set firm_audit_status = #{deletedFlag}
+        update t_service_applications set firm_audit_status = #{deletedFlag}, report_time = NOW()
+        where application_id in
+        <foreach collection="idList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="batchSubmitAsFirm">
+        update t_service_applications set 
+            firm_audit_status = #{firmAuditStatus},
+            firm_audit_user = #{userId},
+            firm_audit_time = #{submitTime},
+            report_time = NOW()
         where application_id in
         <foreach collection="idList" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
     </update>
 
+    <update id="batchSubmitAsAssociation">
+        update t_service_applications set 
+            association_audit_status = #{associationAuditStatus},
+            association_audit_user = #{userId},
+            association_audit_time = #{submitTime},
+            report_time = NOW()
+        where application_id in
+        <foreach collection="idList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="batchReview">
+        update t_service_applications set firm_audit_status = #{value}
+        where application_id in
+        <foreach collection="fileKeyList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </update>
+
+    <!-- 律所审核 -->
+    <update id="batchReviewAsFirm">
+        update t_service_applications set 
+            firm_audit_status = #{value},
+            firm_audit_user = #{userId},
+            firm_audit_time = #{reviewTime}
+        where application_id in
+        <foreach collection="fileKeyList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </update>
+
+    <!-- 协会审核 -->
+    <update id="batchReviewAsAssociation">
+        update t_service_applications set 
+            association_audit_status = #{value},
+            association_audit_user = #{userId},
+            association_audit_time = #{reviewTime}
+        where application_id in
+        <foreach collection="fileKeyList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </update>
+
     <!-- 律师统计查询（无参数，保持向后兼容） -->
     <select id="getLawyerStatistics" resultType="net.lab1024.sa.admin.module.service.domain.vo.LawyerStatisticsVO">
         SELECT 
@@ -290,4 +376,32 @@
         </where>
         group by d.department_id
     </select>
+    
+    <!-- 服务上报统计 -->
+    <select id="getServiceReportStatistics" resultType="net.lab1024.sa.admin.module.service.domain.vo.ServiceReportStatisticsVO">
+        SELECT
+            d.department_id AS firmId,
+            d.department_name AS firmName,
+            COUNT(DISTINCT tsa.user_id) AS lawyerCount,
+            COUNT(tsa.application_id) AS reportCount,
+            COUNT(CASE WHEN tsa.firm_audit_status = 3 THEN 1 END) AS approvedCount,  -- 3表示通过
+            COUNT(1) AS pendingCount,  -- 1表示待审核, 2表示退回
+            COALESCE(SUM(tsa.service_duration), 0) AS totalServiceDuration
+        FROM t_service_applications tsa
+        LEFT JOIN t_department d ON tsa.firm_id = d.department_id
+        <where>
+            tsa.deleted_flag = 0
+            <if test="queryForm.year != null">
+                AND YEAR(tsa.service_start) = #{queryForm.year}
+            </if>
+            <if test="queryForm.quarter != null">
+                AND QUARTER(tsa.service_start) = #{queryForm.quarter}
+            </if>
+            <if test="queryForm.firmId != null">
+                AND tsa.firm_id = #{queryForm.firmId}
+            </if>
+        </where>
+        GROUP BY tsa.firm_id, d.department_name
+        ORDER BY d.department_name
+    </select>
 </mapper>
\ No newline at end of file