fix:修改问题

yun-admin/src/main/java/net/lab1024/sa/admin/module/cost/domain/form/FirmReportsUpdateForm.java

@@ -13,7 +13,7 @@ import lombok.Data;
  */
 
 @Data
-public class FirmReportsUpdateForm {
+public class FirmReportsUpdateForm extends FirmReportsAddForm{
 
     @Schema(description = "主键ID，唯一标识每条记录", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "主键ID，唯一标识每条记录 不能为空")

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

@@ -59,6 +59,7 @@ public class FirmReportsService {
         List<RoleVO> roleIdList = roleEmployeeService.getRoleIdList(requestUser.getEmployeeId());
         String roleCode = roleIdList.get(0).getRoleCode();
 
+        if (!UserTypeEnum.Admin.getDesc().equals(roleCode)) {
             // 检查角色类型
             boolean isCeo = UserTypeEnum.CEO.getDesc().equals(roleCode);
             if (isCeo) {
@@ -68,6 +69,7 @@ public class FirmReportsService {
             }else {
                 queryForm.setUserId(requestUser.getEmployeeId());
             }
+        }
         
         List<FirmReportsVO> list = firmReportsDao.queryPage(page, queryForm);
         //查询字典值

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

@@ -65,9 +65,12 @@ public class LetterService {
         //律师只看到自己，律所看到自己和律所下面的，管理员看全部
         String roleCode = getRoleCode();
         Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
-        if (!UserTypeEnum.CEO.getDesc().equals(roleCode)){
+
+        if (!UserTypeEnum.Admin.getDesc().equals(roleCode)) {
+            if (!UserTypeEnum.CEO.getDesc().equals(roleCode)) {
                 queryForm.setUserId(AdminRequestUtil.getRequestUser().getUserId());
             }
+        }
         List<LetterVO> list = letterDao.queryPage(page, queryForm);
         //查询用户名称
         list.forEach(item -> {

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

@@ -64,14 +64,15 @@ public class PenaltyApplyService {
         
         // 安全获取角色代码，避免NPE
         String roleCode = getUserRoleCode(requestUser);
+        if (!UserTypeEnum.Admin.getDesc().equals(roleCode)) {
             if (roleCode.equals(UserTypeEnum.CEO.getDesc())) {
                 queryForm.setUserType(roleCode);
-        }else if(roleCode.equals(UserTypeEnum.CTO.getDesc())){
+            } else if (roleCode.equals(UserTypeEnum.CTO.getDesc())) {
                 queryForm.setDepartmentId(requestUser.getDepartmentId());
-        }else {
+            } else {
                 queryForm.setUserId(requestUser.getUserId());
             }
-
+        }
         List<PenaltyApplyVO> list = penaltyApplyDao.queryPage(page, queryForm);
         return SmartPageUtil.convert2PageResult(page, list);
     }

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

@@ -182,7 +182,7 @@ public class ServiceApplicationsService {
         // 检查角色类型
         boolean isAssociationRole = UserTypeEnum.CEO.getDesc().equals(roleCode);
         boolean isFirmAdminRole = UserTypeEnum.CTO.getDesc().equals(roleCode); // 律所管理员
-        
+        if (!UserTypeEnum.Admin.getDesc().equals(roleCode)) {
             if (isAssociationRole) {
                 // 协会用户（CEO）：可以看到所有律所提交的数据，但只显示associationAuditStatus为待审核(1)、通过(3)和拒绝(4)的数据和自己创建的数据
                 // CEO作为最高权限用户，不需要限制在特定部门范围内，直接设置includeAssociationReviewed即可
@@ -229,7 +229,7 @@ public class ServiceApplicationsService {
                 queryForm.setNoStatusFilter(true);
             }
             queryForm.setCurrentUserId(requestUser.getUserId()); // 传递当前用户ID用于SQL中的特殊过滤
-        
+        }
         List<ServiceApplicationsVO> list = serviceApplicationsDao.queryPage(page, queryForm);
         if (!CollectionUtils.isEmpty(list)) {
             //翻译单位名称和用户名称
@@ -1440,6 +1440,7 @@ public class ServiceApplicationsService {
             for (LawyerStatisticsVO statisticsVO : lawyerStatisticsVOPageResult) {
                 // 创建新的查询表单对象以避免修改原始对象
                 LawyerStatisticsQueryForm queryForm = SmartBeanUtil.copy(originalQueryForm, LawyerStatisticsQueryForm.class);
+                queryForm.setFirmId(statisticsVO.getFirmId());
                 if (queryForm.getQuarter() == null) {
                     // 如果没有指定季度，使用上一季度的时间范围
                     TimeVo startQuarter = DateTimeUtil.getStartQuarter();

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java

@@ -103,4 +103,5 @@ public class EmployeeEntity {
      * 是否有成本查看权限
      */
     private Boolean costVisibleFlag;
+    private Boolean  penaltyFlag;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java

@@ -68,4 +68,6 @@ public class EmployeeAddForm {
      * 是否有成本查看权限
      */
     private Boolean costVisibleFlag;
+
+    private Boolean  penaltyFlag;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java

@@ -66,4 +66,5 @@ public class EmployeeVO {
      * 是否有成本查看权限
      */
     private Boolean costVisibleFlag;
+    private Boolean  penaltyFlag;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java

@@ -70,6 +70,8 @@ public class RequestEmployee implements RequestUser, Serializable {
      */
     private Boolean costVisibleFlag;
 
+    private  Boolean penaltyFlag;
+
     @Override
     public Long getUserId() {
         return employeeId;

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

@@ -249,13 +249,26 @@ public class LoginService implements StpInterface {
                        (menuVO.getMenuName() != null && !menuVO.getMenuName().contains("成本")))
                 .collect(Collectors.toList());
         }
-        if (requestEmployee.getLoginName().equals("admin")){
+        if (UserTypeEnum.CEO.getDesc().equals(roleList.get(0).getRoleCode())) {
-            // 移除成本管理相关的菜单项
+            if (null == requestEmployee.getPenaltyFlag() || !requestEmployee.getPenaltyFlag()){
+                // 移除无处罚管理相关的菜单项
                 menuAndPointsList = menuAndPointsList.stream()
                         .filter(menuVO ->
-                            (menuVO.getMenuName() != null && !menuVO.getMenuName().contains("服务申报")))
+                                (menuVO.getMenuName() != null && !menuVO.getMenuName().contains("无处罚")))
                         .collect(Collectors.toList());
+            }else {
+                //只要无处罚的菜单
+                menuAndPointsList = menuAndPointsList.stream().filter(menuVO ->
+                        (menuVO.getMenuName() != null && menuVO.getMenuName().contains("无处罚"))).collect(Collectors.toList());
+            }
         }
+        //if (requestEmployee.getLoginName().equals("admin")){
+            // 移除成本管理相关的菜单项
+            //menuAndPointsList = menuAndPointsList.stream()
+                   // .filter(menuVO ->
+                          //  (menuVO.getMenuName() != null && !menuVO.getMenuName().contains("服务申报")))
+                    //.collect(Collectors.toList());
+        //}
         loginResultVO.setMenuList(menuAndPointsList);
 
         // 上次登录信息

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

@@ -57,6 +57,7 @@
                 AND t_firm_reports.approval_status = #{queryForm.approvalStatus}
             </if>
         </where>
+        ORDER BY t_firm_reports.update_time DESC
     </select>
 
 </mapper>

yun-admin/src/main/resources/mapper/letter/LetterMapper.xml

@@ -28,6 +28,7 @@
                 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/src/main/resources/mapper/service/ServiceApplicationsMapper.xml

@@ -239,7 +239,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  <!-- PASS -->
+        AND tsa.association_audit_status = 3  <!-- PASS -->
         GROUP BY tsa.user_id, tsa.certificate_number, e.actual_name
         ORDER BY e.actual_name
     </select>
@@ -256,7 +256,7 @@
         LEFT JOIN t_department d ON tsa.firm_id = d.department_id
         <where>
             tsa.deleted_flag = 0
-            AND tsa.firm_audit_status = 3  <!-- PASS -->
+            AND tsa.association_audit_status = 3  <!-- PASS -->
             <if test="queryForm.startTime != null and queryForm.startTime != ''">
                 AND tsa.firm_audit_time &gt;= #{queryForm.startTime}
             </if>
@@ -291,7 +291,7 @@
         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.startTime != null and queryForm.startTime != ''">
                 AND tsa.firm_audit_time &gt;= #{queryForm.startTime}
             </if>
@@ -324,7 +324,7 @@
         LEFT JOIN t_employee e ON tsa.user_id = e.employee_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.firm_audit_time &gt;= #{queryForm.startTime}
             </if>
@@ -336,6 +336,7 @@
             </if>
         </where>
         GROUP BY tsa.user_id, tsa.certificate_number
+        LIMIT 1
     </select>
     <select id="getdepartmentStatistics"
             resultType="net.lab1024.sa.admin.module.service.domain.vo.LawyerStatisticsVO">
@@ -347,7 +348,7 @@
         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.startTime != null and queryForm.startTime != ''">
                 AND tsa.association_audit_time &gt;= #{queryForm.startTime}
             </if>
@@ -373,7 +374,7 @@
         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.startTime != null and queryForm.startTime != ''">
                 AND tsa.association_audit_time &gt;= #{queryForm.startTime}
             </if>
@@ -388,6 +389,7 @@
             </if>
         </where>
         GROUP BY d.department_id, d.department_name
+        LIMIT 1
     </select>
     <select id="getDepartmentStatisticsWithParam"
             resultType="net.lab1024.sa.admin.module.service.domain.form.ServiceDepartmentImportForm">
@@ -399,7 +401,7 @@
         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.startTime != null and queryForm.startTime != ''">
                 AND tsa.association_audit_time &gt;= #{queryForm.startTime}
             </if>
@@ -451,14 +453,14 @@
         d.department_id,
         d.department_name
         ORDER BY
-        approvedCount DESC,pendingCount DESC,lawyerCount DESC
+        pendingCount DESC,approvedCount DESC,lawyerCount DESC
     </select>
     <select id="getServiceApplicationsCost" resultType="java.lang.Long">
         SELECT
             SUM(tsa.service_duration) AS totalServiceCost
         FROM t_service_applications tsa
         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>
@@ -479,7 +481,7 @@
         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.startTime != null and queryForm.startTime != ''">
                 AND tsa.association_audit_time &gt;= #{queryForm.startTime}
             </if>

yun-base/src/main/java/net/lab1024/sa/base/common/enumeration/UserTypeEnum.java

@@ -4,6 +4,7 @@ package net.lab1024.sa.base.common.enumeration;
  * 用户类型
  */
 public enum UserTypeEnum implements BaseEnum {
+    Admin(1, "admin"),
     CEO(2, "ceo"),
     CTO(3, "cto"),
     USER(4, "user"),