fix:个人信息更新修改

yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/entity/PenaltyApplyEntity.java

@@ -78,4 +78,9 @@ public class PenaltyApplyEntity {
      * 类型
      */
     private String type;
+
+    /**
+     * 申请类型：PERSONAL-个人证明，FIRM-律所证明
+     */
+    private String applyType;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyAddForm.java

@@ -21,5 +21,10 @@ public class PenaltyApplyAddForm {
     @NotNull(message = "申请人用途 不能为空")
     private String usePurpose;
 
+    @Schema(description = "类型")
     private String type;
+
+    @Schema(description = "申请类型：PERSONAL-个人证明，FIRM-律所证明", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "申请类型不能为空")
+    private String applyType;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyUpdateForm.java

@@ -25,5 +25,9 @@ public class PenaltyApplyUpdateForm {
     @Schema(description = "律协审批状态（0-未提交，1-已提交，2-审核中，3-已批准，5-已驳回）")
     private Integer auditStatus;
 
+    @Schema(description = "类型")
     private String type;
+
+    @Schema(description = "申请类型：PERSONAL-个人证明，FIRM-律所证明")
+    private String applyType;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/vo/PenaltyApplyVO.java

@@ -50,5 +50,12 @@ public class PenaltyApplyVO {
     @Schema(description = "删除标志（0-正常，1-已删除）")
     private Integer deletedFlag;
 
+    @Schema(description = "类型")
     private String type;
+
+    @Schema(description = "申请类型：PERSONAL-个人证明，FIRM-律所证明")
+    private String applyType;
+
+    @Schema(description = "申请类型名称")
+    private String applyTypeName;
 }

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

@@ -78,6 +78,23 @@ public class PenaltyApplyService {
             }
         }
         List<PenaltyApplyVO> list = penaltyApplyDao.queryPage(page, queryForm);
+        
+        // 转换申请类型名称
+        for (PenaltyApplyVO vo : list) {
+            if ("PERSONAL".equals(vo.getApplyType())) {
+                vo.setApplyTypeName("个人证明");
+            } else if ("FIRM".equals(vo.getApplyType())) {
+                vo.setApplyTypeName("律所证明");
+            } else {
+                // 兼容旧数据
+                if (UserTypeEnum.USER.getDesc().equals(vo.getType())) {
+                    vo.setApplyTypeName("个人证明");
+                } else {
+                    vo.setApplyTypeName("律所证明");
+                }
+            }
+        }
+        
         return SmartPageUtil.convert2PageResult(page, list);
     }
 
@@ -87,29 +104,47 @@ public class PenaltyApplyService {
     public ResponseDTO<String> add(PenaltyApplyAddForm addForm) {
         Long userId = AdminRequestUtil.getRequestUser().getUserId();
         EmployeeEntity entity = employeeService.getById(userId);
-        //判断有没有处罚
-        if (UserTypeEnum.USER.getDesc().equals(addForm.getType())){
+        
+        // 根据申请类型判断是个人证明还是律所证明
+        // PERSONAL = 个人证明（查申请人自己）
+        // FIRM = 律所证明（查律所）
+        if ("PERSONAL".equals(addForm.getApplyType())) {
+            // 个人证明：查询申请人自己是否有处罚记录
             Boolean query = penaltyLawyerService.query(entity.getActualName());
-            if (query){
+            if (query) {
                 return ResponseDTO.error(UserErrorCode.FORM_REPEAT_SUBMIT_PENALTY);
             }
-        }else {
-            //查询机构名称
+        } else if ("FIRM".equals(addForm.getApplyType())) {
+            // 律所证明：查询律所是否有处罚记录
             DepartmentVO departmentById = departmentService.getDepartmentById(entity.getDepartmentId());
             Boolean query = penaltyLawyerService.queryNoName(departmentById.getDepartmentName());
-            if (query){
+            if (query) {
                 return ResponseDTO.error(UserErrorCode.FORM_REPEAT_SUBMIT_PENALTY);
             }
+        } else {
+            // 兼容旧逻辑：如果没有传 applyType，按原来的 type 字段判断
+            if (UserTypeEnum.USER.getDesc().equals(addForm.getType())) {
+                Boolean query = penaltyLawyerService.query(entity.getActualName());
+                if (query) {
+                    return ResponseDTO.error(UserErrorCode.FORM_REPEAT_SUBMIT_PENALTY);
+                }
+            } else {
+                DepartmentVO departmentById = departmentService.getDepartmentById(entity.getDepartmentId());
+                Boolean query = penaltyLawyerService.queryNoName(departmentById.getDepartmentName());
+                if (query) {
+                    return ResponseDTO.error(UserErrorCode.FORM_REPEAT_SUBMIT_PENALTY);
+                }
+            }
         }
 
         PenaltyApplyEntity penaltyApplyEntity = SmartBeanUtil.copy(addForm, PenaltyApplyEntity.class);
         penaltyApplyEntity.setUserId(userId);
         String roleCode = letterService.getRoleCode();
-        //判断类型
-        if (roleCode.equals(UserTypeEnum.CTO.getDesc()) || roleCode.equals(UserTypeEnum.STAFF.getDesc())){
+        // 判断类型
+        if (roleCode.equals(UserTypeEnum.CTO.getDesc()) || roleCode.equals(UserTypeEnum.STAFF.getDesc())) {
             penaltyApplyEntity.setStatus(ReviewEnum.PASS.getValue());
             penaltyApplyEntity.setAuditStatus(ReviewEnum.APPROVAL.getValue());
-        }else {
+        } else {
             penaltyApplyEntity.setStatus(ReviewEnum.APPROVAL.getValue());
         }
         penaltyApplyEntity.setDepartmentId(entity.getDepartmentId());

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

@@ -161,8 +161,8 @@ public class ServiceApplicationsController {
     @Operation(summary = "律所统计信息 @author wzh")
     @PostMapping("/serviceApplications/statistics/department")
     //@SaCheckPermission("serviceApplications:statistics")
-    public ResponseDTO<List<LawyerStatisticsVO>> getLawyerStatisticsByDepartment(@RequestBody @Valid LawyerStatisticsQueryFormList queryForm) {
-        return ResponseDTO.ok(serviceApplicationsService.getLawyerStatisticsByDepartment(queryForm));
+    public ResponseDTO<PageResult<LawyerStatisticsVO>> getLawyerStatisticsByDepartment(@RequestBody @Valid LawyerStatisticsQueryFormPage queryForm) {
+        return ResponseDTO.ok(serviceApplicationsService.getLawyerStatisticsByDepartmentPage(queryForm));
     }
 
     @Operation(summary = "律所统计信息导出 @author wzh")

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

@@ -86,6 +86,14 @@ public interface ServiceApplicationsDao extends BaseMapper<ServiceApplicationsEn
      */
     List<LawyerStatisticsVO> getdepartmentStatistics(@Param("queryForm") LawyerStatisticsQueryForm queryForm);
 
+    /**
+     * 律所统计分页查询
+     * @param page
+     * @param queryForm
+     * @return
+     */
+    List<LawyerStatisticsVO> getdepartmentStatisticsPage(@Param("page") Page<?> page, @Param("queryForm") LawyerStatisticsQueryFormPage queryForm);
+
     /**
      * 月度统计
      * @param queryForm

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

@@ -774,25 +774,59 @@ public class ServiceApplicationsService {
     }
 
     /**
-     * 律所统计
+     * 律所统计（不分页）
      */
     public List<LawyerStatisticsVO> getLawyerStatisticsByDepartment(@Valid LawyerStatisticsQueryFormList queryForms) {
         LawyerStatisticsQueryForm queryForm = getQueryForm(queryForms);
         DictEntity dictItem = dictService.getOne("FILECOST");
-        
+
         // 获取年度统计数据
         List<LawyerStatisticsVO> annualStatistics = getAnnualStatistics(queryForm);
-        
+
         if (!annualStatistics.isEmpty()) {
             // 处理统计数据
             processStatistics(annualStatistics, queryForm, dictItem);
         }
-        
+
         // 屏蔽成本数据
         maskCostDataForUser(annualStatistics);
         return annualStatistics;
     }
-    
+
+    /**
+     * 律所统计（分页）
+     */
+    public PageResult<LawyerStatisticsVO> getLawyerStatisticsByDepartmentPage(@Valid LawyerStatisticsQueryFormPage queryForm) {
+        // 应用权限控制
+        applyUserPermissionControl(queryForm);
+
+        // 设置时间范围（根据季度参数设置）
+        setTimeRangeByQuarter(queryForm);
+
+        DictEntity dictItem = dictService.getOne("FILECOST");
+
+        // 创建分页对象，查询律所列表
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
+
+        // 创建年度查询表单（分页类型）
+        LawyerStatisticsQueryFormPage annualQueryFormPage = createAnnualQueryFormPage(queryForm);
+
+        // 分页查询律所年度统计数据（使用年度时间范围）
+        List<LawyerStatisticsVO> annualStatistics = serviceApplicationsDao.getdepartmentStatisticsPage(page, annualQueryFormPage);
+
+        if (!annualStatistics.isEmpty()) {
+            // 处理统计数据（季度数据、律师明细等）
+            // 创建 LawyerStatisticsQueryForm 用于处理逻辑
+            LawyerStatisticsQueryForm annualQueryForm = createAnnualQueryForm(queryForm);
+            processStatistics(annualStatistics, annualQueryForm, dictItem);
+        }
+
+        // 屏蔽成本数据
+        maskCostDataForUser(annualStatistics);
+
+        return SmartPageUtil.convert2PageResult(page, annualStatistics);
+    }
+
     /**
      * 获取年度统计数据
      */
@@ -807,20 +841,66 @@ public class ServiceApplicationsService {
     private LawyerStatisticsQueryForm createAnnualQueryForm(LawyerStatisticsQueryForm queryForm) {
         LawyerStatisticsQueryForm annualQueryForm = new LawyerStatisticsQueryForm();
         annualQueryForm.setYear(queryForm.getYear());
-        
+
         // 如果指定了机构ID，则应用过滤条件
         if (queryForm.getFirmId() != null) {
             annualQueryForm.setFirmId(queryForm.getFirmId());
         }
-        
+
         // 设置年度时间范围
         String yearStart = queryForm.getYear() + "-01-01";
         String yearEnd = queryForm.getYear() + "-12-31";
         annualQueryForm.setStartTime(yearStart);
         annualQueryForm.setEndTime(yearEnd);
-        
+
         return annualQueryForm;
     }
+
+    /**
+     * 创建年度查询表单（从分页表单）
+     */
+    private LawyerStatisticsQueryForm createAnnualQueryForm(LawyerStatisticsQueryFormPage queryForm) {
+        LawyerStatisticsQueryForm annualQueryForm = new LawyerStatisticsQueryForm();
+        annualQueryForm.setYear(queryForm.getYear());
+        annualQueryForm.setQuarter(queryForm.getQuarter());
+
+        // 如果指定了机构 ID，则应用过滤条件
+        if (queryForm.getFirmId() != null) {
+            annualQueryForm.setFirmId(queryForm.getFirmId());
+        }
+
+        // 设置年度时间范围
+        String yearStart = queryForm.getYear() + "-01-01";
+        String yearEnd = queryForm.getYear() + "-12-31";
+        annualQueryForm.setStartTime(yearStart);
+        annualQueryForm.setEndTime(yearEnd);
+
+        return annualQueryForm;
+    }
+    
+    /**
+     * 创建年度查询表单（分页类型）
+     */
+    private LawyerStatisticsQueryFormPage createAnnualQueryFormPage(LawyerStatisticsQueryFormPage queryForm) {
+        LawyerStatisticsQueryFormPage annualQueryFormPage = new LawyerStatisticsQueryFormPage();
+        annualQueryFormPage.setYear(queryForm.getYear());
+        annualQueryFormPage.setQuarter(queryForm.getQuarter());
+        annualQueryFormPage.setPageNum(queryForm.getPageNum());
+        annualQueryFormPage.setPageSize(queryForm.getPageSize());
+
+        // 如果指定了机构 ID，则应用过滤条件
+        if (queryForm.getFirmId() != null) {
+            annualQueryFormPage.setFirmId(queryForm.getFirmId());
+        }
+
+        // 设置年度时间范围
+        String yearStart = queryForm.getYear() + "-01-01";
+        String yearEnd = queryForm.getYear() + "-12-31";
+        annualQueryFormPage.setStartTime(yearStart);
+        annualQueryFormPage.setEndTime(yearEnd);
+
+        return annualQueryFormPage;
+    }
     
     /**
      * 处理统计数据
@@ -855,6 +935,7 @@ public class ServiceApplicationsService {
     private LawyerStatisticsQueryForm createQuarterlyQueryForm(LawyerStatisticsQueryForm queryForm) {
         LawyerStatisticsQueryForm quarterlyQueryForm = new LawyerStatisticsQueryForm();
         quarterlyQueryForm.setYear(queryForm.getYear());
+        quarterlyQueryForm.setQuarter(queryForm.getQuarter());
         quarterlyQueryForm.setFirmId(queryForm.getFirmId());
         
         // 设置季度时间范围

yun-admin/src/main/java/net/lab1024/sa/admin/module/word/WordApplicationsController.java

@@ -266,13 +266,20 @@ public class WordApplicationsController {
         EmployeeEntity employee = employeeService.getById(penaltyApplyEntity.getUserId());
         DepartmentVO department = departmentService.getById(employee.getDepartmentId());
 
+        // 判断申请类型：优先使用 applyType，兼容旧数据使用 type
+        String applyType = penaltyApplyEntity.getApplyType();
+        if (applyType == null || applyType.isEmpty()) {
+            // 兼容旧数据：根据 type 判断
+            applyType = UserTypeEnum.USER.getDesc().equals(penaltyApplyEntity.getType()) ? "PERSONAL" : "FIRM";
+        }
+
         return new WordCertificateService.CertificateData(
                 department.getDepartmentName(),
                 department.getCreditCode(),
                 employee.getActualName(),
                 employee.getCertificateNumber(),
                 penaltyApplyEntity.getCreateTime(),
-                penaltyApplyEntity.getType()
+                applyType
         );
     }
 
@@ -339,13 +346,15 @@ public class WordApplicationsController {
         int lineHeight = bodyMetrics.getHeight();
         int maxLineWidth = PAGE_WIDTH - LEFT_MARGIN - RIGHT_MARGIN;
         String fullContent = "";
-        if (UserTypeEnum.USER.getDesc().equals(data.getType())){
-        // 构建完整内容
+        // 根据 applyType 判断是个人证明还是律所证明
+        if ("PERSONAL".equals(data.getType())) {
+            // 个人证明：包含律师姓名和执业证号
             fullContent = "兹证明" + data.getCertificateNo() + "（统一社会信用代码：" +
                     data.getPurpose() + "）" + data.getName() +
                     "律师（执业证号：" + data.getIdCard() +
                     "）近五年在我市执业期间未受到律师协会行业处分。";
-        }else {
+        } else {
+            // 律所证明：不包含律师个人信息
             fullContent = "兹证明" + data.getCertificateNo() + "（统一社会信用代码：" +
                     data.getPurpose() + "）" +
                     "近五年在我市执业期间未受到律师协会行业处分。";

yun-admin/src/main/resources/mapper/penaltyapply/PenaltyApplyMapper.xml

@@ -14,7 +14,8 @@
         t_penalty_apply.deleted_flag,
         t_penalty_apply.department_id,
         t_penalty_apply.audit_status,
-        t_penalty_apply.type
+        t_penalty_apply.type,
+        t_penalty_apply.apply_type
     </sql>
 
     <!-- 分页查询 -->
@@ -31,6 +32,7 @@
         tp_apply.audit_status as auditStatus,
         tp_apply.department_id as departmentId,
         tp_apply.type,
+        tp_apply.apply_type as applyType,
         te_employee.actual_name AS userName
         FROM t_penalty_apply tp_apply left join t_employee te_employee on tp_apply.user_id = te_employee.employee_id
         <where>

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

@@ -51,7 +51,7 @@
                 <if test="queryForm.userId != null and queryForm.userId != ''">
                     and user_id = #{queryForm.userId}
                 </if>
-                <if test="queryForm.firmId != null and queryForm.firmId != ''">
+                <if test="queryForm.firmId != null">
                     and firm_id = #{queryForm.firmId}
                 </if>
                 <if test="queryForm.serviceStart != null and queryForm.serviceStart != ''">
@@ -282,15 +282,16 @@
         LEFT JOIN t_department d ON tsa.firm_id = d.department_id
         <where>
             tsa.deleted_flag = 0
-            AND tsa.association_audit_status = 3  <!-- PASS -->
+            AND tsa.association_audit_status = 3  <!-- 只统计律协审核通过的 -->
+            AND tsa.firm_id IS NOT NULL
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.firm_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.firm_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
-                and user_id = #{queryForm.userId}
+                and tsa.user_id = #{queryForm.userId}
             </if>
             <if test="queryForm.lawyerName != null and queryForm.lawyerName != ''">
                 AND e.actual_name LIKE CONCAT('%', #{queryForm.lawyerName}, '%')
@@ -298,7 +299,7 @@
             <if test="queryForm.firmName != null and queryForm.firmName != ''">
                 AND d.department_name LIKE CONCAT('%', #{queryForm.firmName}, '%')
             </if>
-            <if test="queryForm.firmId != null and queryForm.firmId != ''">
+            <if test="queryForm.firmId != null">
                 AND tsa.firm_id = #{queryForm.firmId}
             </if>
         </where>
@@ -318,11 +319,12 @@
         <where>
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
+            AND tsa.firm_id IS NOT NULL
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.firm_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.firm_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
@@ -333,8 +335,8 @@
             <if test="queryForm.firmName != null and queryForm.firmName != ''">
                 AND d.department_name LIKE CONCAT('%', #{queryForm.firmName}, '%')
             </if>
-            <if test="queryForm.firmId != null and queryForm.firmId != ''">
-                AND d.department_id = #{queryForm.firmId}
+            <if test="queryForm.firmId != null">
+                AND tsa.firm_id = #{queryForm.firmId}
             </if>
         </where>
         GROUP BY tsa.user_id, tsa.certificate_number
@@ -353,11 +355,12 @@
         <where>
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
+            AND tsa.firm_id IS NOT NULL
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.firm_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.firm_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
@@ -368,8 +371,8 @@
             <if test="queryForm.firmName != null and queryForm.firmName != ''">
                 AND d.department_name LIKE CONCAT('%', #{queryForm.firmName}, '%')
             </if>
-            <if test="queryForm.firmId != null and queryForm.firmId != ''">
-                AND d.department_id = #{queryForm.firmId}
+            <if test="queryForm.firmId != null">
+                AND tsa.firm_id = #{queryForm.firmId}
             </if>
         </where>
         GROUP BY tsa.user_id, tsa.certificate_number
@@ -386,15 +389,19 @@
         <where>
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
+            AND tsa.firm_id IS NOT NULL
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.firm_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.firm_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
             </if>
+            <if test="queryForm.firmId != null">
+                and tsa.firm_id = #{queryForm.firmId}
+            </if>
         </where>
         GROUP BY tsa.user_id, tsa.certificate_number
         LIMIT 1
@@ -410,17 +417,46 @@
         <where>
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
+            AND tsa.firm_id IS NOT NULL
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
             </if>
-            <if test="queryForm.firmId != null and queryForm.firmId != ''">
-                and d.department_id = #{queryForm.firmId}
+            <if test="queryForm.firmId != null">
+                and tsa.firm_id = #{queryForm.firmId}
+            </if>
+        </where>
+        GROUP BY d.department_id, d.department_name
+    </select>
+    <!-- 律所统计分页查询 -->
+    <select id="getdepartmentStatisticsPage"
+            resultType="net.lab1024.sa.admin.module.service.domain.vo.LawyerStatisticsVO">
+        SELECT
+        d.department_name AS firmName,
+        d.department_id as firmId,
+        COALESCE(SUM(tsa.service_duration), 0) AS annualServiceDuration
+        FROM t_service_applications tsa
+        LEFT JOIN t_department d ON tsa.firm_id = d.department_id
+        <where>
+            tsa.deleted_flag = 0
+            AND tsa.association_audit_status = 3
+            AND tsa.firm_id IS NOT NULL
+            <if test="queryForm.startTime != null and queryForm.startTime != ''">
+                AND tsa.report_time &gt;= #{queryForm.startTime}
+            </if>
+            <if test="queryForm.endTime != null and queryForm.endTime != ''">
+                AND tsa.report_time &lt;= #{queryForm.endTime}
+            </if>
+            <if test="queryForm.userId != null and queryForm.userId != ''">
+                and tsa.user_id = #{queryForm.userId}
+            </if>
+            <if test="queryForm.firmId != null">
+                and tsa.firm_id = #{queryForm.firmId}
             </if>
         </where>
         GROUP BY d.department_id, d.department_name
@@ -436,17 +472,18 @@
         <where>
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
+            AND tsa.firm_id IS NOT NULL
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
             </if>
-            <if test="queryForm.firmId != null and queryForm.firmId != ''">
-                and d.department_id = #{queryForm.firmId}
+            <if test="queryForm.firmId != null">
+                and tsa.firm_id = #{queryForm.firmId}
             </if>
         </where>
         GROUP BY d.department_id, d.department_name
@@ -463,17 +500,18 @@
         <where>
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
+            AND tsa.firm_id IS NOT NULL
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
             </if>
-            <if test="queryForm.firmId != null and queryForm.firmId != ''">
-                and d.department_id = #{queryForm.firmId}
+            <if test="queryForm.firmId != null">
+                and tsa.firm_id = #{queryForm.firmId}
             </if>
         </where>
         group by d.department_id
@@ -490,25 +528,26 @@
         COUNT(CASE WHEN tsa.association_audit_status = 4 THEN 1 END) AS rejectCount,
         COUNT(CASE WHEN tsa.association_audit_status !=0  THEN 1 END) - COUNT(CASE WHEN tsa.association_audit_status in (3,4) THEN 1 END )
         AS pendingCount,
-        COALESCE(SUM(tsa.service_duration), 0) AS totalServiceDuration
+        COALESCE(SUM(CASE WHEN tsa.association_audit_status = 3 THEN tsa.service_duration ELSE 0 END), 0) AS totalServiceDuration
         FROM
         t_department d
-        LEFT JOIN t_employee e ON e.department_id = d.department_id
+        LEFT JOIN t_employee e ON e.department_id = d.department_id AND e.deleted_flag = 0
         LEFT JOIN t_service_applications tsa ON tsa.user_id = e.employee_id
         AND tsa.deleted_flag = 0
+        AND tsa.association_audit_status IN (1, 2, 3)
         <if test="queryForm.firmId != null">
             AND tsa.firm_id = #{queryForm.firmId}
         </if>
         <if test="queryForm.startTime != null">
-            AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+            AND tsa.report_time &gt;= #{queryForm.startTime}
         </if>
         <if test="queryForm.endTime != null">
-            AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+            AND tsa.report_time &lt;= #{queryForm.endTime}
         </if>
-        where
-            1 =1
+        WHERE
+            1 = 1
             <if test="queryForm.firmId != null">
-              and  d.department_id = #{queryForm.firmId}
+              AND d.department_id = #{queryForm.firmId}
             </if>
             <!-- 成本填报律所过滤：只查看律所主任或行政有成本查看权限的律所的数据 -->
             <if test="queryForm.costReportViewOnly != null and queryForm.costReportViewOnly">
@@ -535,10 +574,10 @@
         WHERE tsa.deleted_flag = 0
                   AND tsa.firm_audit_status = 3
         <if test="queryForm.startTime != null and queryForm.startTime != ''">
-            AND tsa.create_time &gt;= #{queryForm.startTime}
+            AND tsa.report_time &gt;= #{queryForm.startTime}
         </if>
         <if test="queryForm.endTime != null and queryForm.endTime != ''">
-            AND tsa.create_time &lt;= #{queryForm.endTime}
+            AND tsa.report_time &lt;= #{queryForm.endTime}
         </if>
         <if test="queryForm.firmId != null">
             AND tsa.firm_id = #{queryForm.firmId}
@@ -556,10 +595,10 @@
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
@@ -579,10 +618,10 @@
             tsa.deleted_flag = 0
             AND tsa.firm_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.create_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.create_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
@@ -618,10 +657,10 @@
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.userId != null and queryForm.userId != ''">
                 and tsa.user_id = #{queryForm.userId}
@@ -641,10 +680,10 @@
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.firmId != null and queryForm.firmId != ''">
                 and d.department_id = #{queryForm.firmId}
@@ -670,10 +709,10 @@
             tsa.deleted_flag = 0
             AND tsa.association_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             <if test="queryForm.firmId != null and queryForm.firmId != ''">
                 and d.department_id = #{queryForm.firmId}
@@ -789,10 +828,10 @@
             WHERE deleted_flag = 0
             AND association_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND association_audit_time &gt;= #{queryForm.startTime}
+                AND report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND association_audit_time &lt;= #{queryForm.endTime}
+                AND report_time &lt;= #{queryForm.endTime}
             </if>
             GROUP BY user_id
         ) stats ON tsa.user_id = stats.user_id
@@ -821,10 +860,10 @@
             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}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             GROUP BY tsa.activity_name_id
         ) stats ON g.goods_id = stats.activity_name_id
@@ -845,10 +884,10 @@
             AND tsa.firm_id = #{queryForm.firmId}
         </if>
         <if test="queryForm.startTime != null and queryForm.startTime != ''">
-            AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+            AND tsa.report_time &gt;= #{queryForm.startTime}
         </if>
         <if test="queryForm.endTime != null and queryForm.endTime != ''">
-            AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+            AND tsa.report_time &lt;= #{queryForm.endTime}
         </if>
         GROUP BY d.department_id, d.department_name
         ORDER BY totalCount DESC
@@ -921,10 +960,10 @@
             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}
+                AND tsa.report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+                AND tsa.report_time &lt;= #{queryForm.endTime}
             </if>
             GROUP BY tsa.activity_name_id
         ) stats ON g.goods_id = stats.activity_name_id
@@ -955,20 +994,20 @@
             WHERE deleted_flag = 0
             AND association_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND association_audit_time &gt;= #{queryForm.startTime}
+                AND report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND association_audit_time &lt;= #{queryForm.endTime}
+                AND report_time &lt;= #{queryForm.endTime}
             </if>
             GROUP BY user_id
         ) user_stats ON tsa.user_id = user_stats.user_id
         WHERE tsa.deleted_flag = 0
         AND tsa.association_audit_status = 3
         <if test="queryForm.startTime != null and queryForm.startTime != ''">
-            AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+            AND tsa.report_time &gt;= #{queryForm.startTime}
         </if>
         <if test="queryForm.endTime != null and queryForm.endTime != ''">
-            AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+            AND tsa.report_time &lt;= #{queryForm.endTime}
         </if>
         <if test="queryForm.firmId != null and queryForm.firmId != ''">
             AND tsa.firm_id = #{queryForm.firmId}
@@ -997,20 +1036,20 @@
             WHERE deleted_flag = 0
             AND association_audit_status = 3
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
-                AND association_audit_time &gt;= #{queryForm.startTime}
+                AND report_time &gt;= #{queryForm.startTime}
             </if>
             <if test="queryForm.endTime != null and queryForm.endTime != ''">
-                AND association_audit_time &lt;= #{queryForm.endTime}
+                AND report_time &lt;= #{queryForm.endTime}
             </if>
             GROUP BY firm_id
         ) firm_stats ON tsa.firm_id = firm_stats.firm_id
         WHERE tsa.deleted_flag = 0
         AND tsa.association_audit_status = 3
         <if test="queryForm.startTime != null and queryForm.startTime != ''">
-            AND tsa.association_audit_time &gt;= #{queryForm.startTime}
+            AND tsa.report_time &gt;= #{queryForm.startTime}
         </if>
         <if test="queryForm.endTime != null and queryForm.endTime != ''">
-            AND tsa.association_audit_time &lt;= #{queryForm.endTime}
+            AND tsa.report_time &lt;= #{queryForm.endTime}
         </if>
         <if test="queryForm.firmId != null and queryForm.firmId != ''">
             AND tsa.firm_id = #{queryForm.firmId}