fix:4-19日修改

.idea/encodings.xml

@@ -4,11 +4,17 @@
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources/dev" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/pre" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/prod" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yun-admin/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yun-admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yun-admin/src/main/resources/dev" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yun-admin/src/main/resources/pre" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yun-admin/src/main/resources/prod" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yun-base/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yun-base/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yun-base/src/main/resources/dev" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yun-base/src/main/resources/pre" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yun-base/src/main/resources/prod" charset="UTF-8" />
   </component>
 </project>

.idea/jarRepositories.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />

.idea/misc.xml

@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>

.idea/sqldialects.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/sql/LetterMenu.sql" dialect="GenericSQL" />
-  </component>
-</project>

yun-admin/src/main/java/net/lab1024/sa/admin/module/cost/controller/FirmReportsController.java

@@ -96,17 +96,19 @@ public class FirmReportsController {
         return firmReportsService.reject(idList);
     }
 
-    //查询本年度已经提交的收入和成本
+    //查询指定年份已经提交的收入和成本
-    @Operation(summary = "查询本年度已经提交的收入 @author wzh")
+    @Operation(summary = "查询指定年份已经提交的收入 @author wzh")
     @PostMapping("/firmReports/income")
-    public ResponseDTO<FirmReportsCountVO> income() {
+    public ResponseDTO<FirmReportsCountVO> income(@RequestBody(required = false) FirmReportsQueryForm queryForm) {
-        return ResponseDTO.ok(firmReportsService.income());
+        Integer year = queryForm != null && queryForm.getDeclareYear() != null ? queryForm.getDeclareYear() : DateTimeUtil.getCurrentYear();
+        return ResponseDTO.ok(firmReportsService.income(year));
     }
-    //查询本年度已经提交的成本
+    //查询指定年份已经提交的成本
-    @Operation(summary = "查询本年度已经提交的成本 @author wzh")
+    @Operation(summary = "查询指定年份已经提交的成本 @author wzh")
     @PostMapping("/firmReports/cost")
-    public ResponseDTO<Long> firmReportsCost() {
+    public ResponseDTO<Long> firmReportsCost(@RequestBody(required = false) FirmReportsQueryForm queryForm) {
-        return ResponseDTO.ok(firmReportsService.firmReportsCost());
+        Integer year = queryForm != null && queryForm.getDeclareYear() != null ? queryForm.getDeclareYear() : DateTimeUtil.getCurrentYear();
+        return ResponseDTO.ok(firmReportsService.firmReportsCost(year));
     }
     
     /**

yun-admin/src/main/java/net/lab1024/sa/admin/module/cost/dao/FirmReportsDao.java

@@ -70,4 +70,15 @@ public interface FirmReportsDao extends BaseMapper<FirmReportsEntity> {
     FirmReportsCountVO income(@Param("departmentId") Long departmentId, @Param("currentYear") Integer currentYear);
 
     Long firmReportsCost(@Param("departmentId") Long departmentId,@Param("currentYear") Integer currentYear);
+    
+    /**
+     * 根据律所ID、年份和季度查询成本管理表记录
+     * @param firmId 律所ID
+     * @param year 年份
+     * @param quarter 季度
+     * @return 成本管理表记录列表
+     */
+    List<FirmReportsEntity> selectByFirmIdYearAndQuarter(@Param("firmId") Integer firmId, 
+                                                       @Param("year") Integer year, 
+                                                       @Param("quarter") String quarter);
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/cost/domain/entity/FirmReportsEntity.java

@@ -70,6 +70,16 @@ public class FirmReportsEntity {
      */
     private BigDecimal costIncomeRatio;
 
+    /**
+     * 审核后实际公益成本支出（单位：万元）
+     */
+    private BigDecimal actualPublicWelfareCost;
+
+    /**
+     * 实际成本收入比（%）
+     */
+    private BigDecimal actualCostIncomeRatio;
+
     /**
      * 审批状态（存储当前审批人姓名，"-"表示待审批）
      */

yun-admin/src/main/java/net/lab1024/sa/admin/module/cost/domain/vo/FirmReportsVO.java

@@ -46,6 +46,12 @@ public class FirmReportsVO {
     @Schema(description = "成本收入比（%），计算公式：总成本/收入×100%")
     private BigDecimal costIncomeRatio;
 
+    @Schema(description = "审核后实际公益成本支出（单位：万元）")
+    private BigDecimal actualPublicWelfareCost;
+
+    @Schema(description = "实际成本收入比（%）")
+    private BigDecimal actualCostIncomeRatio;
+
     @Schema(description = "审批状态（存储当前审批人姓名，-表示待审批）")
     private Integer approvalStatus;
 

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

@@ -56,24 +56,23 @@ public class FirmReportsService {
     public PageResult<FirmReportsVO> queryPage(FirmReportsQueryForm queryForm) {
         Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
         
-        // 检查当前用户是否为CEO角色
         RequestEmployee requestUser = AdminRequestUtil.getRequestUser();
         List<RoleVO> roleIdList = roleEmployeeService.getRoleIdList(requestUser.getEmployeeId());
         String roleCode = AdminRequestUtil.getRoleCode(roleIdList);
 
         if (!UserTypeEnum.Admin.getDesc().equals(roleCode)) {
-            // 检查角色类型
             if (AdminRequestUtil.isAssociationRole(roleIdList)) {
-                // 如果是CEO角色，查询自己的数据和已经提交的数据（审批状态大于等于3的数据）
                 queryForm.setUserId(requestUser.getEmployeeId());
-                queryForm.setIncludeSubmitted(true); // 设置查询参数以包括已提交的数据
+                queryForm.setIncludeSubmitted(true);
-            }else {
+            } else if (AdminRequestUtil.isFirmRole(roleIdList)) {
+                queryForm.setFirmId(Math.toIntExact(requestUser.getDepartmentId()));
+                queryForm.setIncludeSubmitted(true);
+            } else {
                 queryForm.setUserId(requestUser.getEmployeeId());
             }
         }
         
         List<FirmReportsVO> list = firmReportsDao.queryPage(page, queryForm);
-        //查询字典值
 
         PageResult<FirmReportsVO> firmReportsVOPageResult = SmartPageUtil.convert2PageResult(page, list);
         firmReportsVOPageResult.getList().forEach(item -> {
@@ -235,19 +234,21 @@ public class FirmReportsService {
         return ResponseDTO.ok(canReport);
     }
 
-    public FirmReportsCountVO income() {
+    public FirmReportsCountVO income(Integer year) {
         // 获取当前用户
         RequestEmployee requestUser = AdminRequestUtil.getRequestUser();
-        //本年度
+        if (year == null) {
-        Integer currentYear = DateTimeUtil.getCurrentYear();
+            year = DateTimeUtil.getCurrentYear();
-        return firmReportsDao.income(requestUser.getDepartmentId(), currentYear);
+        }
+        return firmReportsDao.income(requestUser.getDepartmentId(), year);
     }
 
-    public Long firmReportsCost() {
+    public Long firmReportsCost(Integer year) {
         // 获取当前用户
         RequestEmployee requestUser = AdminRequestUtil.getRequestUser();
-        //本年度
+        if (year == null) {
-        Integer currentYear = DateTimeUtil.getCurrentYear();
+            year = DateTimeUtil.getCurrentYear();
-        return firmReportsDao.firmReportsCost(requestUser.getDepartmentId(), currentYear);
+        }
+        return firmReportsDao.firmReportsCost(requestUser.getDepartmentId(), year);
     }
 }

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

@@ -240,7 +240,7 @@ public class ServiceApplicationsController {
      */
     @Operation(summary = "导出活动明细 @author wzh")
     @PostMapping("/serviceApplications/export/activityDetail")
-    public void exportActivityDetail(HttpServletResponse response) {
+    public void exportActivityDetail(@RequestBody ServiceApplicationsQueryForm queryForm, HttpServletResponse response) {
-        serviceApplicationsService.exportActivityDetail( response);
+        serviceApplicationsService.exportActivityDetail(queryForm, response);
     }
 }

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

@@ -111,12 +111,12 @@ public interface ServiceApplicationsDao extends BaseMapper<ServiceApplicationsEn
     /**
      * 批量审核 - 律所审核
      */
-    void batchReviewAsFirm(@Param("fileKeyList") List<String> fileKeyList, @Param("value") Integer value, @Param("userId") Long userId, @Param("reviewTime") String reviewTime);
+    void batchReviewAsFirm(@Param("fileKeyList") List<String> fileKeyList, @Param("value") Integer value, @Param("userId") Long userId, @Param("reviewTime") String reviewTime, @Param("auditOpinion") String auditOpinion);
 
     /**
      * 批量审核 - 协会审核
      */
-    void batchReviewAsAssociation(@Param("fileKeyList") List<String> fileKeyList, @Param("value") Integer value, @Param("userId") Long userId, @Param("reviewTime") String reviewTime);
+    void batchReviewAsAssociation(@Param("fileKeyList") List<String> fileKeyList, @Param("value") Integer value, @Param("userId") Long userId, @Param("reviewTime") String reviewTime, @Param("auditOpinion") String auditOpinion);
 
     /**
      * 服务上报统计
@@ -218,4 +218,15 @@ public interface ServiceApplicationsDao extends BaseMapper<ServiceApplicationsEn
      * 判断律所是否有成本查看权限
      */
     Integer countFirmWithCostPermission(@Param("firmId") Long firmId);
+    
+    /**
+     * 根据律所ID和时间范围查询服务申请记录
+     * @param firmId 律所ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 服务申请记录列表
+     */
+    List<ServiceApplicationsVO> queryByFirmIdAndTimeRange(@Param("firmId") Long firmId, 
+                                                      @Param("startTime") String startTime, 
+                                                      @Param("endTime") String endTime);
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ActivityDetailExportForm.java

@@ -0,0 +1,54 @@
+package net.lab1024.sa.admin.module.service.domain.form;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 活动明细导出表单
+ *
+ * @Author wzh
+ * @Date 2025-12-22
+ * @Copyright 1.0
+ */
+@Data
+public class ActivityDetailExportForm {
+
+    @ExcelProperty("备案编号")
+    private String recordNo;
+
+    @ExcelProperty("律师姓名")
+    private String userName;
+
+    @ExcelProperty("律所名称")
+    private String departmentName;
+
+    @ExcelProperty("活动名称")
+    private String activityName;
+
+    @ExcelProperty("服务开始时间")
+    @ColumnWidth(value = 25)
+    private LocalDateTime serviceStart;
+
+    @ExcelProperty("服务结束时间")
+    @ColumnWidth(value = 25)
+    private LocalDateTime serviceEnd;
+
+    @ExcelProperty("服务时长(小时)")
+    private Double serviceDuration;
+
+    @ExcelProperty("受益人数")
+    private Integer beneficiaryCount;
+
+    @ExcelProperty("组织单位")
+    private String organizerName;
+
+    @ExcelProperty("负责人")
+    private String organizerContact;
+
+    @ExcelProperty("联系方式")
+    private String organizerPhone;
+}

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java

@@ -77,6 +77,8 @@ public class ServiceApplicationsUpdateForm{
     private String associationAuditOpinion;
     private String firmAuditOpinion;
     private Integer auditResult;
+    @Schema(description = "审核意见（非必填）")
+    private String auditRemark;
     /**
      * 职务id
      */

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

@@ -120,4 +120,13 @@ public class ServiceApplicationsVO {
     private Long positionId;
     private String positionName;
     private String associationAuditUserName;
+    
+    @Schema(description = "服务类型：TIME-时间类型，AMOUNT-金额类型")
+    private String serviceType;
+    
+    @Schema(description = "活动固定小时数（TIME类型时使用）")
+    private String activityPrice;
+    
+    @Schema(description = "服务金额")
+    private BigDecimal serviceAmount;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

@@ -262,6 +262,15 @@ public class LoginService implements StpInterface {
                         (menuVO.getMenuName() != null && menuVO.getMenuName().contains("无处罚"))).collect(Collectors.toList());
             }
         }
+        // 承诺书管理菜单只有超管(admin)和律协(CEO)角色可见
+        boolean isAdmin = roleList.stream().anyMatch(r -> UserTypeEnum.Admin.getDesc().equals(r.getRoleCode()));
+        boolean isCeo = roleList.stream().anyMatch(r -> UserTypeEnum.CEO.getDesc().equals(r.getRoleCode()));
+        if (!isAdmin && !isCeo) {
+            menuAndPointsList = menuAndPointsList.stream()
+                    .filter(menuVO ->
+                            (menuVO.getMenuName() == null || !menuVO.getMenuName().contains("承诺书")))
+                    .collect(Collectors.toList());
+        }
         //if (requestEmployee.getLoginName().equals("admin")){
             // 移除成本管理相关的菜单项
             //menuAndPointsList = menuAndPointsList.stream()

yun-admin/src/main/java/net/lab1024/sa/admin/util/AdminRequestUtil.java

@@ -30,7 +30,11 @@ public final class AdminRequestUtil {
         if (roles == null || roles.isEmpty()) {
             return false;
         }
-        return UserTypeEnum.CEO.getDesc().equals(roles.get(0).getRoleCode());
+        String roleCode = roles.get(0).getRoleCode();
+        if (roleCode == null) {
+            return false;
+        }
+        return UserTypeEnum.CEO.getDesc().equalsIgnoreCase(roleCode);
     }
 
     /**
@@ -40,7 +44,11 @@ public final class AdminRequestUtil {
         if (roles == null || roles.isEmpty()) {
             return false;
         }
-        return UserTypeEnum.CTO.getDesc().equals(roles.get(0).getRoleCode());
+        String roleCode = roles.get(0).getRoleCode();
+        if (roleCode == null) {
+            return false;
+        }
+        return UserTypeEnum.CTO.getDesc().equalsIgnoreCase(roleCode);
     }
 
     /**
@@ -50,7 +58,11 @@ public final class AdminRequestUtil {
         if (roles == null || roles.isEmpty()) {
             return false;
         }
-        return UserTypeEnum.STAFF.getDesc().equals(roles.get(0).getRoleCode());
+        String roleCode = roles.get(0).getRoleCode();
+        if (roleCode == null) {
+            return false;
+        }
+        return UserTypeEnum.STAFF.getDesc().equalsIgnoreCase(roleCode);
     }
 
     /**

yun-admin/src/main/resources/mapper/cost/FirmReportsMapper.xml

@@ -13,6 +13,8 @@
         t_firm_reports.total_cost as totalCost,
         t_firm_reports.public_welfare_cost as publicWelfareCost,
         t_firm_reports.cost_income_ratio as costIncomeRatio,
+        t_firm_reports.actual_public_welfare_cost as actualPublicWelfareCost,
+        t_firm_reports.actual_cost_income_ratio as actualCostIncomeRatio,
         t_firm_reports.approval_status as approvalStatus,
         t_firm_reports.submission_time as submissionTime,
         t_firm_reports.approver_id as approverId,
@@ -50,12 +52,13 @@
             <if test="queryForm.firmId != null and queryForm.firmId != ''">
                 AND t_firm_reports.firm_id = #{queryForm.firmId}
             </if>
-            <if test="queryForm.includeSubmitted != null and queryForm.includeSubmitted">
+            <if test="queryForm.includeSubmitted != null and queryForm.includeSubmitted and queryForm.userId != null">
-                <!-- 如果包含已提交的数据，则查询审批状态>=3的数据（已提交）或用户自己的数据，此时忽略queryForm.userId的单独筛选条件-->
                 AND (t_firm_reports.approval_status >= 3 OR t_firm_reports.user_id = #{queryForm.userId})
             </if>
+            <if test="queryForm.includeSubmitted != null and queryForm.includeSubmitted and (queryForm.userId == null or queryForm.userId == '')">
+                AND t_firm_reports.approval_status >= 0
+            </if>
             <if test="queryForm.userId != null and (queryForm.includeSubmitted == null or queryForm.includeSubmitted == false)">
-                <!-- 只有在未设置includeSubmitted时才使用userId作为过滤条件 -->
                 AND t_firm_reports.user_id = #{queryForm.userId}
             </if>
             <if test="queryForm.declareYear != null">
@@ -112,4 +115,17 @@
           AND firm_id = #{departmentId}
     </select>
     
+    <!-- 根据律所ID、年份和季度查询成本管理表记录 -->
+    <select id="selectByFirmIdYearAndQuarter" resultType="net.lab1024.sa.admin.module.cost.domain.entity.FirmReportsEntity">
+        SELECT 
+            *
+        FROM 
+            t_firm_reports
+        WHERE 
+            del_flag = 0
+            AND firm_id = #{firmId}
+            AND declare_year = #{year}
+            AND declare_quarter = #{quarter}
+    </select>
+
 </mapper>

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

@@ -167,8 +167,13 @@
                     )
                 </if>
         </where>
-        ORDER BY t_service_applications.association_audit_status Asc,
+        ORDER BY 
-        t_service_applications.firm_audit_status Asc
+        CASE 
+            WHEN t_service_applications.firm_audit_status = 1 OR t_service_applications.association_audit_status = 1 THEN 0 
+            ELSE 1 
+        END ASC,
+        t_service_applications.report_time DESC,
+        t_service_applications.application_id DESC
     </select>
     <update id="batchUpdateDeleted">
         update t_service_applications set deleted_flag = #{deletedFlag}
@@ -226,7 +231,8 @@
         update t_service_applications set 
             firm_audit_status = #{value},
             firm_audit_user = #{userId},
-            firm_audit_time = #{reviewTime}
+            firm_audit_time = #{reviewTime},
+            firm_audit_opinion = #{auditOpinion}
         where application_id in
         <foreach collection="fileKeyList" open="(" close=")" separator="," item="item">
             #{item}
@@ -238,7 +244,8 @@
         update t_service_applications set 
             association_audit_status = #{value},
             association_audit_user = #{userId},
-            association_audit_time = #{reviewTime}
+            association_audit_time = #{reviewTime},
+            association_audit_opinion = #{auditOpinion}
         where application_id in
         <foreach collection="fileKeyList" open="(" close=")" separator="," item="item">
             #{item}
@@ -808,6 +815,53 @@
         AND e.cost_visible_flag = 1
     </select>
     
+    <!-- 根据律所ID和时间范围查询服务申请记录（按服务上报时间过滤） -->
+    <select id="queryByFirmIdAndTimeRange" resultType="net.lab1024.sa.admin.module.service.domain.vo.ServiceApplicationsVO">
+        SELECT
+            tsa.application_id AS applicationId,
+            tsa.user_id AS userId,
+            te.actual_name AS userName,
+            tsa.firm_id AS firmId,
+            tsa.service_start AS serviceStart,
+            tsa.service_end AS serviceEnd,
+            tsa.service_duration AS serviceDuration,
+            tsa.beneficiary_count AS beneficiaryCount,
+            tsa.organizer_name AS organizerName,
+            tsa.organizer_contact AS organizerContact,
+            tsa.organizer_phone AS organizerPhone,
+            tsa.service_content AS serviceContent,
+            tsa.workload_score AS serviceAmount,
+            tsa.firm_audit_status AS firmAuditStatus,
+            tsa.firm_audit_opinion AS firmAuditOpinion,
+            tsa.firm_audit_user AS firmAuditUser,
+            tsa.firm_audit_time AS firmAuditTime,
+            tsa.association_audit_status AS associationAuditStatus,
+            tsa.association_audit_opinion AS associationAuditOpinion,
+            tsa.association_audit_user AS associationAuditUser,
+            tsa.association_audit_time AS associationAuditTime,
+            tsa.record_no AS recordNo,
+            tsa.record_status AS recordStatus,
+            tsa.record_time AS recordTime,
+            tsa.update_time AS updateTime,
+            tsa.create_time AS createTime,
+            tsa.deleted_flag AS deletedFlag,
+            tsa.certificate_number AS certificateNumber,
+            tsa.activity_category_id AS activityCategoryId,
+            tsa.activity_name_id AS activityNameId,
+            tsa.attachment_ids AS attachmentIds,
+            tsa.report_time AS reportTime,
+            tsa.position_id AS positionId,
+            tg.time_type AS serviceType,
+            tg.price AS activityPrice
+        FROM t_service_applications tsa
+        LEFT JOIN t_employee te ON tsa.user_id = te.employee_id
+        LEFT JOIN t_goods tg ON tsa.activity_name_id = tg.goods_id
+        WHERE tsa.deleted_flag = 0
+        AND tsa.firm_id = #{firmId}
+        AND tsa.report_time &gt;= #{startTime}
+        AND tsa.report_time &lt;= #{endTime}
+    </select>
+
     <!-- 查询律师列表（分页） -->
     <select id="getLawyerActivityCount" resultType="net.lab1024.sa.admin.module.service.domain.vo.LawyerActivityCountVO">
         SELECT DISTINCT
@@ -1104,6 +1158,9 @@
         <if test="queryForm.activityNameId != null and queryForm.activityNameId != ''">
             AND tsa.activity_name_id = #{queryForm.activityNameId}
         </if>
+        <if test="queryForm.positionId != null">
+            AND tsa.position_id = #{queryForm.positionId}
+        </if>
         ORDER BY tsa.create_time DESC
     </select>
 </mapper>

yun-admin/target/classes/log4j2-spring.xml

@@ -10,7 +10,8 @@
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
+            <PatternLayout pattern="[%blue{%d}][%highlight{%-5p}][%t][%cyan{%c{1.}:%L}] %m %n"
+                           disableAnsi="false" noConsoleNoAnsi="false"/>
         </Console>
         <RollingFile name="debug" fileName="${log-directory}/debug/debug.log"
                      filePattern="${log-directory}/debug/debug-%d{yyyy-MM-dd}-%i.log">
@@ -101,12 +102,10 @@
     </Appenders>
 
     <Loggers>
-
         <logger name="com.alibaba.druid.filter.stat.StatFilter" level="ERROR" additivity="false">
             <AppenderRef ref="druidSlowSqlLog"/>
         </logger>
-
+        <Root level="debug">
-        <Root level="warn">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="debug"/>
             <AppenderRef ref="info"/>

yun-admin/target/classes/mapper/business/oa/notice/NoticeMapper.xml

@@ -258,6 +258,21 @@
         from t_notice
         where notice_id = #{noticeId}
     </select>
+    <select id="queryAllBoolk" resultType="net.lab1024.sa.admin.module.letter.domain.vo.NoticeBookVO">
+        SELECT
+            notice_id as noticeId,
+            title as title,
+            document_number as documentNumber,
+            attachment as attachment
+        from t_notice
+        <where>
+            deleted_flag = 0
+            <if test="query == 'USER' ">
+                and document_number = '001'
+            </if>
+        </where>
+        ORDER BY document_number
+    </select>
     <insert id="insertViewRecord">
         insert into t_notice_view_record (notice_id, employee_id, first_ip, first_user_agent, page_view_count)
         values (#{noticeId}, #{employeeId}, #{ip}, #{userAgent}, #{pageViewCount})

yun-admin/target/classes/mapper/cost/FirmReportsMapper.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="net.lab1024.sa.admin.module.cost.dao.FirmReportsDao">
+
+    <!-- 查询结果列 -->
+    <sql id="base_columns">
+        t_firm_reports.id,
+        t_firm_reports.firm_id as firmId,
+        t_firm_reports.user_id as userId,
+        t_firm_reports.declare_year as declareYear,
+        t_firm_reports.declare_quarter as declareQuarter,
+        t_firm_reports.revenue as revenue,
+        t_firm_reports.total_cost as totalCost,
+        t_firm_reports.public_welfare_cost as publicWelfareCost,
+        t_firm_reports.cost_income_ratio as costIncomeRatio,
+        t_firm_reports.actual_public_welfare_cost as actualPublicWelfareCost,
+        t_firm_reports.actual_cost_income_ratio as actualCostIncomeRatio,
+        t_firm_reports.approval_status as approvalStatus,
+        t_firm_reports.submission_time as submissionTime,
+        t_firm_reports.approver_id as approverId,
+        t_firm_reports.create_time as createTime,
+        t_firm_reports.update_time as updateTime,
+        t_firm_reports.del_flag as delFlag,
+        t_firm_reports.declare_month as declareMonth
+    </sql>
+    <update id="commit">
+        UPDATE t_firm_reports
+        SET approval_status = 3
+        WHERE id IN
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </update>
+
+    <!-- 批量驳回 -->
+    <update id="reject">
+        UPDATE t_firm_reports
+        SET approval_status = 0
+        WHERE id IN
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </update>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultType="net.lab1024.sa.admin.module.cost.domain.vo.FirmReportsVO">
+        SELECT
+        <include refid="base_columns"/>
+        FROM t_firm_reports
+        <where>
+            del_flag = 0
+            <if test="queryForm.firmId != null and queryForm.firmId != ''">
+                AND t_firm_reports.firm_id = #{queryForm.firmId}
+            </if>
+            <if test="queryForm.includeSubmitted != null and queryForm.includeSubmitted and queryForm.userId != null">
+                AND (t_firm_reports.approval_status >= 3 OR t_firm_reports.user_id = #{queryForm.userId})
+            </if>
+            <if test="queryForm.includeSubmitted != null and queryForm.includeSubmitted and (queryForm.userId == null or queryForm.userId == '')">
+                AND t_firm_reports.approval_status >= 0
+            </if>
+            <if test="queryForm.userId != null and (queryForm.includeSubmitted == null or queryForm.includeSubmitted == false)">
+                AND t_firm_reports.user_id = #{queryForm.userId}
+            </if>
+            <if test="queryForm.declareYear != null">
+                AND t_firm_reports.declare_year = #{queryForm.declareYear}
+            </if>
+            <if test="queryForm.declareQuarter != null">
+                AND t_firm_reports.declare_quarter = #{queryForm.declareQuarter}
+            </if>
+            <if test="queryForm.declareMonth != null">
+                AND t_firm_reports.declare_month = #{queryForm.declareMonth}
+            </if>
+            <if test="queryForm.approvalStatus != null">
+                AND t_firm_reports.approval_status = #{queryForm.approvalStatus}
+            </if>
+        </where>
+        ORDER BY t_firm_reports.update_time DESC
+    </select>
+
+    <!-- 根据季度、年度和律所 ID 查询报表 -->
+    <select id="selectList" resultType="net.lab1024.sa.admin.module.cost.domain.entity.FirmReportsEntity">
+        SELECT *
+        FROM t_firm_reports
+        WHERE del_flag = 0
+          AND declare_quarter = #{declareQuarter}
+          AND declare_year = #{declareYear}
+          AND firm_id = #{firmId}
+        LIMIT 1
+    </select>
+    <select id="query" resultType="java.lang.Boolean">
+        SELECT
+        CASE WHEN EXISTS(
+        SELECT 1
+        FROM t_firm_reports
+        WHERE del_flag = 0 and approval_status = 3
+          AND declare_quarter = #{currentQuarter}
+          AND declare_year = #{currentYear}
+          AND firm_id = #{departmentId}
+        ) THEN true ELSE false END
+    </select>
+    <select id="firmReportsCost" resultType="java.lang.Long">
+        SELECT ifnull(SUM(total_cost),0)
+        FROM t_firm_reports
+        WHERE del_flag = 0 and approval_status = 3
+          AND declare_year = #{currentYear}
+          AND firm_id = #{departmentId}
+    </select>
+    <select id="income" resultType="net.lab1024.sa.admin.module.cost.domain.vo.FirmReportsCountVO">
+        SELECT
+        SUM(revenue) as revenue,
+        SUM(total_cost) as totalCost
+        FROM t_firm_reports
+        WHERE del_flag = 0 and approval_status = 3
+          AND declare_year = #{currentYear}
+          AND firm_id = #{departmentId}
+    </select>
+    
+    <!-- 根据律所ID、年份和季度查询成本管理表记录 -->
+    <select id="selectByFirmIdYearAndQuarter" resultType="net.lab1024.sa.admin.module.cost.domain.entity.FirmReportsEntity">
+        SELECT 
+            *
+        FROM 
+            t_firm_reports
+        WHERE 
+            del_flag = 0
+            AND firm_id = #{firmId}
+            AND declare_year = #{year}
+            AND declare_quarter = #{quarter}
+    </select>
+
+</mapper>

yun-admin/target/classes/mapper/letter/LetterMapper.xml

@@ -11,7 +11,10 @@
         t_letter.deleted_flag,
         t_letter.user_id,
         t_letter.update_time,
-        t_letter.create_time
+        t_letter.create_time,
+        t_letter.attachment_ids,
+        t_letter.letter_type,
+        t_letter.file_url
     </sql>
 
     <!-- 分页查询 -->
@@ -19,6 +22,13 @@
         SELECT
         <include refid="base_columns"/>
         FROM t_letter
+        WHERE t_letter.deleted_flag = 0
+        <if test="queryForm != null">
+            <if test="queryForm.userId != null">
+                AND t_letter.user_id = #{queryForm.userId}
+            </if>
+        </if>
+        order by t_letter.create_time desc
     </select>
     <select id="isLetter" resultType="java.lang.Integer">
         SELECT

yun-admin/target/classes/mapper/penaltyapply/PenaltyApplyMapper.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="net.lab1024.sa.admin.module.penalty.dao.PenaltyApplyDao">
+
+    <!-- 查询结果列 -->
+    <sql id="base_columns">
+        t_penalty_apply.id,
+        t_penalty_apply.user_id,
+        t_penalty_apply.apply_date,
+        t_penalty_apply.use_purpose,
+        t_penalty_apply.status,
+        t_penalty_apply.create_time,
+        t_penalty_apply.update_time,
+        t_penalty_apply.deleted_flag,
+        t_penalty_apply.department_id,
+        t_penalty_apply.audit_status,
+        t_penalty_apply.type,
+        t_penalty_apply.apply_type
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultType="net.lab1024.sa.admin.module.penalty.domain.vo.PenaltyApplyVO">
+        SELECT
+        tp_apply.id,
+        tp_apply.user_id as userId,
+        tp_apply.apply_date as applyDate,
+        tp_apply.use_purpose as usePurpose,
+        tp_apply.status as status,
+        tp_apply.create_time as createTime,
+        tp_apply.update_time as updateTime,
+        tp_apply.deleted_flag as deletedFlag,
+        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>
+            tp_apply.deleted_flag = 0
+            <if test="queryForm != null">
+                <if test="queryForm.userName != null and queryForm.userName != ''">
+                    AND te_employee.actual_name like concat('%',#{queryForm.userName},'%')
+                </if>
+                <if test="queryForm.status != null and queryForm.status != ''">
+                    AND tp_apply.status = #{queryForm.status}
+                </if>
+                <if test="queryForm.applyDateStart != null">
+                    AND tp_apply.apply_date &gt;= #{queryForm.applyDateStart}
+                </if>
+                <if test="queryForm.applyDateEnd != null">
+                    AND tp_apply.apply_date &lt;= #{queryForm.applyDateEnd}
+                </if>
+                <if test="queryForm.userId != null">
+                    AND tp_apply.user_id = #{queryForm.userId}
+                </if>
+                <if test="queryForm.departmentId != null">
+                    AND tp_apply.department_id = #{queryForm.departmentId}
+                </if>
+                <if test="queryForm.userType == 'ceo' ">
+                    AND tp_apply.audit_status > 0
+                </if>
+            </if>
+        </where>
+        ORDER BY tp_apply.status, tp_apply.create_time DESC
+    </select>
+
+    <update id="batchUpdateDeleted">
+        update t_penalty_apply set deleted_flag = #{deletedFlag}
+        where id in
+        <foreach collection="idList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateDeleted">
+        update t_penalty_apply set deleted_flag = #{deletedFlag}
+        where id = #{id}
+    </update>
+
+</mapper>

yun-admin/target/classes/mapper/penaltyapply/PenaltyLawyerMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="net.lab1024.sa.admin.module.penalty.dao.PenaltyLawyerDao">
+
+    <!-- 查询结果列 -->
+    <sql id="base_columns">
+        t_penalty_lawyer.id,
+        t_penalty_lawyer.name,
+        t_penalty_lawyer.principal,
+        t_penalty_lawyer.license_no,
+        t_penalty_lawyer.phone,
+        t_penalty_lawyer.address,
+        t_penalty_lawyer.unified_credit_code,
+        t_penalty_lawyer.governing_body,
+        t_penalty_lawyer.organizational_form,
+        t_penalty_lawyer.branch_form,
+        t_penalty_lawyer.party_member_count,
+        t_penalty_lawyer.party_organization_name,
+        t_penalty_lawyer.party_organization_form,
+        t_penalty_lawyer.party_branch_principal,
+        t_penalty_lawyer.city,
+        t_penalty_lawyer.district,
+        t_penalty_lawyer.created_at,
+        t_penalty_lawyer.updated_at
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultType="net.lab1024.sa.admin.module.penalty.domain.vo.PenaltyLawyerVO">
+        SELECT
+        <include refid="base_columns"/>
+        FROM t_penalty_lawyer
+    </select>
+    <select id="selectLawyerPunishList" resultType="com.alibaba.fastjson.JSONObject">
+        select *
+        from t_lawyer_punish_people
+        where name = #{licenseNo} and punish_time >= DATE_SUB(CURDATE(), INTERVAL 5 YEAR)
+    </select>
+    <select id="queryNoName" resultType="com.alibaba.fastjson.JSONObject">
+        select *
+        from t_lawyer_punish_people
+        where name is null  and  dept_name = #{departmentName} and punish_time >= DATE_SUB(CURDATE(), INTERVAL 5 YEAR)
+    </select>
+
+
+</mapper>

yun-admin/target/classes/mapper/system/PositionMapper.xml

@@ -21,5 +21,6 @@
         SELECT *
         FROM t_position
         where deleted_flag = #{deletedFlag}
+        order by sort
     </select>
 </mapper>

yun-admin/target/classes/mapper/system/department/DepartmentMapper.xml

@@ -29,6 +29,12 @@
                  left join t_department parent_department on t_department.parent_id = parent_department.department_id
         where t_department.department_id = #{departmentId}
     </select>
+    <select id="selectCreditCodeById"
+            resultType="net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO">
+        SELECT t.unified_credit_code as creditCode
+        FROM t_institutions_punish t
+        where t.name = #{departmentName}
+    </select>
 
 
 </mapper>

yun-admin/target/classes/mapper/system/employee/EmployeeMapper.xml

@@ -70,6 +70,7 @@
                 AND deleted_flag = #{deletedFlag}
             </if>
         </where>
+        limit 1
     </select>
 
     <select id="getByEmail" resultType="net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity">
@@ -81,6 +82,7 @@
                 AND deleted_flag = #{deletedFlag}
             </if>
         </where>
+        limit 1
     </select>
 
     <select id="listAll" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
@@ -188,6 +190,9 @@
             <if test="deletedFlag != null">
                 AND t_employee.deleted_flag = #{deletedFlag}
             </if>
+            <if test="departmentId != null and departmentId != ''">
+                AND t_employee.department_id = #{departmentId}
+            </if>
         </where>
     </select>
 

yun-admin/target/classes/mapper/system/role/RoleDataScopeMapper.xml

@@ -14,6 +14,12 @@
             #{item}
         </foreach>
     </select>
+    <select id="getOneByRoleId" resultType="java.lang.Integer">
+        SELECT view_type
+        FROM t_role_data_scope
+        WHERE role_id = #{roleId}
+        LIMIT 1
+    </select>
 
     <delete id="deleteByRoleId">
         DELETE FROM t_role_data_scope