Merge branch 'master' into develop

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendancePostRecordController.java

@@ -1,5 +1,6 @@
 package com.sundot.airport.web.controller.attendance;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
@@ -288,8 +289,6 @@ public class AttendancePostRecordController extends BaseController {
     public AjaxResult add(@RequestBody AttendancePostRecord attendancePostRecord) {
         // 处理部门信息
         extracted(attendancePostRecord);
-        UserInfo userInfo = userCache.getUserInfo(attendancePostRecord.getUserId());
-        attendancePostRecord.setUserName(userInfo.getNickName());
         attendancePostRecord.setRevision(1L);
         attendancePostRecord.setWorkDuration((attendancePostRecord.getCheckOutTime().getTime() - attendancePostRecord.getCheckInTime().getTime()) / 1000 / 60);
         attendancePostRecord.setAttendanceDate(DateUtil.date(attendancePostRecord.getCheckInTime()));
@@ -301,8 +300,16 @@ public class AttendancePostRecordController extends BaseController {
         BasePosition positionParam = new BasePosition();
         List<BasePosition> basePositions = basePositionService.selectBasePositionList(positionParam);
         setChannel(attendancePostRecord, basePositions);
-
-        return toAjax(attendancePostRecordService.insertAttendancePostRecord(attendancePostRecord));
+        attendancePostRecord.setLocked(false);
+        attendancePostRecord.getUserIdList().forEach(userId -> {
+            AttendancePostRecord item = new AttendancePostRecord();
+            BeanUtil.copyProperties(attendancePostRecord, item);
+            UserInfo userInfo = userCache.getUserInfo(userId);
+            item.setUserId(userId);
+            item.setUserName(userInfo.getNickName());
+            attendancePostRecordService.insertAttendancePostRecord(item);
+        });
+        return success("操作成功");
     }
 
     private void extracted(AttendancePostRecord attendancePostRecord) {

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysHomeReportController.java

@@ -450,8 +450,14 @@ public class SysHomeReportController extends BaseController {
      */
     private List<SysHomeReportDetailDto> getAnswerList(List<SysHomePageDetailQueryParamDto> dtoList) {
         List<SysHomeReportDetailDto> result = new ArrayList<>();
-        for (SysHomePageDetailQueryParamDto item : dtoList) {
-            result.add(getAnswer(item));
+        // 批量调用前统一初始化部门缓存，避免每次 answerData 都重复查询数据库
+        accuracyStatisticsService.initDeptCache();
+        try {
+            for (SysHomePageDetailQueryParamDto item : dtoList) {
+                result.add(getAnswer(item));
+            }
+        } finally {
+            accuracyStatisticsService.clearDeptCache();
         }
         return result;
     }

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -20,6 +20,7 @@ import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
 import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenWorkingPortraitDto;
+import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.exam.domain.DailyTask;
 import com.sundot.airport.attendance.portrait.AttendanceModuleIndicatorResult;
@@ -150,6 +151,15 @@ public class SysUserController extends BaseController {
     }
 
     /**
+     * 查询用户列表
+     */
+    @PostMapping("/selectUserListByCondition")
+    public AjaxResult selectUserListByCondition(@RequestBody SysUserConditionDto dto) {
+        List<SysUser> result = userService.selectUserListByDeptIdAndRoleKeyListAndUserName(dto);
+        return success(result);
+    }
+
+    /**
      * 能力画像-协同配合
      */
     @Cacheable(

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendancePostRecord.java

@@ -1,6 +1,7 @@
 package com.sundot.airport.attendance.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -257,5 +258,8 @@ public class AttendancePostRecord extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
-
+    /**
+     * 用户ID列表
+     */
+    private List<Long> userIdList;
 }

airport-attendance/src/main/resources/mapper/attendance/AttendancePostRecordMapper.xml

@@ -191,6 +191,7 @@
             <if test="statusDesc != null and statusDesc != ''">status_desc,</if>
             <if test="positionCode != null">position_code,</if>
             <if test="positionName != null">position_name,</if>
+            <if test="locked != null">locked,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -229,6 +230,7 @@
             <if test="statusDesc != null and statusDesc != ''">#{statusDesc},</if>
             <if test="positionCode != null">#{positionCode},</if>
             <if test="positionName != null">#{positionName},</if>
+            <if test="locked != null">#{locked},</if>
         </trim>
     </insert>
 

airport-common/src/main/java/com/sundot/airport/common/dto/SysUserConditionDto.java

@@ -0,0 +1,31 @@
+package com.sundot.airport.common.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 查询用户列表参数
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/15 16:12
+ **/
+@Data
+public class SysUserConditionDto {
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 角色编码列表
+     */
+    private List<String> roleKeyList;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+}

airport-exam/src/main/java/com/sundot/airport/exam/service/IAccuracyStatisticsService.java

@@ -69,4 +69,14 @@ public interface IAccuracyStatisticsService {
      * @return 首页报表-抽问抽答正确率数据
      */
     com.sundot.airport.common.core.domain.SysHomeReportDetailDto answerData(BaseLargeScreenQueryParamDto dto);
+
+    /**
+     * 初始化部门缓存（批量调用 answerData 前调用，避免重复查询数据库）
+     */
+    void initDeptCache();
+
+    /**
+     * 清理部门缓存
+     */
+    void clearDeptCache();
 }

airport-exam/src/main/java/com/sundot/airport/exam/service/impl/AccuracyStatisticsServiceImpl.java

@@ -159,7 +159,8 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     /**
      * 初始化部门缓存
      */
-    private DeptCache initDeptCache() {
+    @Override
+    public void initDeptCache() {
         DeptCache cache = DEPT_CACHE.get();
         if (cache == null) {
             long start = System.currentTimeMillis();
@@ -168,13 +169,13 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             DEPT_CACHE.set(cache);
             log.info("initDeptCache: loaded {} depts in {}ms", allDepts.size(), System.currentTimeMillis() - start);
         }
-        return cache;
     }
 
     /**
      * 清理缓存
      */
-    private void clearDeptCache() {
+    @Override
+    public void clearDeptCache() {
         DEPT_CACHE.remove();
     }
 
@@ -1253,7 +1254,8 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             result.setName(sysUser.getNickName());
             result.setType(HomePageQueryEnum.USER.getCode());
         } else {
-            SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+            DeptCache cache = getDeptCache();
+            SysDept sysDept = cache != null ? cache.deptMap.get(dto.getDeptId()) : deptService.selectDeptById(dto.getDeptId());
             if (ObjectUtil.isNull(sysDept)) {
                 throw new ServiceException("【" + dto.getDeptId() + "】部门不存在");
             }
@@ -1332,12 +1334,13 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             }
         } else if (ObjectUtil.isNotNull(dto.getDeptId())) {
             // 部门维度：获取部门下所有用户的正确率
-            SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+            DeptCache cache = getDeptCache();
+            SysDept sysDept = cache != null ? cache.deptMap.get(dto.getDeptId()) : deptService.selectDeptById(dto.getDeptId());
             if (sysDept == null) {
                 return result;
             }
 
-            DeptHierarchy hierarchy = getDeptHierarchy(dto.getDeptId());
+            DeptHierarchy hierarchy = getDeptHierarchyCached(dto.getDeptId());
             List<Long> teamIds = getTeamIdsUnderDept(dto.getDeptId(), hierarchy);
 
             if (teamIds.isEmpty()) {

airport-system/src/main/java/com/sundot/airport/system/mapper/SysUserMapper.java

@@ -220,4 +220,14 @@ public interface SysUserMapper {
      * @return 首页-用户信息
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfo();
+
+    /**
+     * 根据组织ID和角色编码列表和用户昵称查询用户列表
+     *
+     * @param deptId   组织ID
+     * @param list     角色编码列表
+     * @param nickName 用户昵称
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(@Param("deptId") Long deptId, @Param("list") List<String> list, @Param("nickName") String nickName);
 }

airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java

@@ -7,6 +7,7 @@ import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
 import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
 
@@ -311,4 +312,12 @@ public interface ISysUserService {
      * @return 结果
      */
     public int resetUserPostByDept(ResetUserPostDto resetUserPostDto);
+
+    /**
+     * 查询用户列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(SysUserConditionDto dto);
 }

airport-system/src/main/java/com/sundot/airport/system/service/approval/impl/ApprovalEngineServiceImpl.java

@@ -12,8 +12,10 @@ import java.util.regex.Matcher;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.sundot.airport.common.utils.DateUtils;
@@ -72,6 +74,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
 
     @Autowired
     private ISysDeptService sysDeptService;
+    @Autowired
+    private ISysUserService iSysUserService;
 
 
     /**
@@ -114,6 +118,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
         instanceMapper.insertApprovalInstance(instance);
 
         // 3. 获取第一个节点
+        boolean isAutoPass = false;// 是否自动审批通过
         ApprovalNodeDefinition firstNode = nodeDefinitionMapper.selectFirstNodeByWorkflowId(workflow.getId());
         if (firstNode != null) {
             instance.setCurrentNodeId(firstNode.getId());
@@ -124,7 +129,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                 createTasksForNode(instance, firstNode, formData, null);
             } else {
                 // 开始节点，直接流转到下一个节点
-                moveToNextNode(instance, firstNode, submitterId, submitterName, "提交", formData, null);
+                isAutoPass = moveToNextNode(instance, firstNode, submitterId, submitterName, "提交", formData, null);
             }
         }
 
@@ -133,6 +138,14 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
 
         // 执行业务处理逻辑
         executeBusinessLogic(instance, "APPROVED");
+
+        // 自动审批通过
+        if (isAutoPass) {
+            firstNode.setSortOrder(firstNode.getSortOrder() + 1);
+            moveToNextNode(instance, firstNode, submitterId, submitterName, "自动审批通过", formData, null);
+            recordHistory(instance.getId(), null, null, null, "AUTO_APPROVE", submitterId, submitterName, "自动审批通过", formData);
+            executeBusinessLogic(instance, "APPROVED");
+        }
         return instance;
     }
 
@@ -735,8 +748,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
     /**
      * 流转到下一节点
      */
-    private void moveToNextNode(ApprovalInstance instance, ApprovalNodeDefinition currentNode,
-                                Long operatorId, String operatorName, String comment, Map<String, Object> formData, ApprovalTask currentTask) {
+    private boolean moveToNextNode(ApprovalInstance instance, ApprovalNodeDefinition currentNode,
+                                   Long operatorId, String operatorName, String comment, Map<String, Object> formData, ApprovalTask currentTask) {
         // 查找下一个节点
         ApprovalNodeDefinition nextNode = nodeDefinitionMapper.selectNextNodeByOrder(
                 instance.getWorkflowId(), currentNode.getSortOrder());
@@ -774,8 +787,17 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                     if (ObjectUtil.isNotEmpty(currentTask) && ObjectUtil.isNotEmpty(currentTask.getAssigneeId())) {
                         submitterId = currentTask.getAssigneeId();
                     }
-                    // 违禁品审批流程：根据提交人角色分配给其主管
-                    createTasksForNodeWithKeZhang(instance, nextNode, formData, null, submitterId);
+                    SysUser sysUser = iSysUserService.selectUserById(submitterId);
+                    List<String> roleKeyList = sysUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                    boolean isAutoPass = roleKeyList.contains(RoleTypeEnum.kezhang.getCode());
+                    if (isAutoPass) {
+                        // 违禁品审批流程：根据提交人角色为主管则自动审批通过
+                        createTasksForNodeWithKeZhangAutoPass(instance, nextNode, formData, null, submitterId);
+                        return true;
+                    } else {
+                        // 违禁品审批流程：根据提交人角色分配给其主管
+                        createTasksForNodeWithKeZhang(instance, nextNode, formData, null, submitterId);
+                    }
                 } else if (isSeizureReportWorkflow(instance) && ("GROUP_LEADER".equals(nextNode.getApproverType()) || "SECTION_LEADER".equals(nextNode.getApproverType()))) {
                     Long submitterId = instance.getSubmitterId();
                     if ("SECTION_LEADER".equals(nextNode.getApproverType()) && ObjectUtil.isNotEmpty(currentTask) && ObjectUtil.isNotEmpty(currentTask.getAssigneeId())) {
@@ -805,6 +827,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
             // 没有下一节点，完成流程
             completeProcess(instance, operatorId, operatorName);
         }
+        return false;
     }
 
     /**
@@ -1844,4 +1867,49 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
             logger.error("创建经理1审批任务失败", e);
         }
     }
+
+    /**
+     * 为违禁品审批节点创建任务（根据提交人角色为主管则自动审批通过）
+     */
+    private void createTasksForNodeWithKeZhangAutoPass(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark, Long submitterId) {
+        try {
+            SysUser user = sysUserMapper.selectUserById(submitterId);
+            if (user != null) {
+                ApprovalTask task = new ApprovalTask();
+                task.setTaskNo(taskMapper.generateTaskNo());
+                task.setInstanceId(instance.getId());
+                task.setNodeId(node.getId());
+                task.setTaskName(node.getNodeName());
+                task.setAssigneeId(user.getUserId());
+                task.setAssigneeName(user.getNickName());
+                task.setAssignTime(DateUtils.getNowDate());
+                task.setStatus("APPROVED");
+                task.setCompleteTime(DateUtils.getNowDate());
+
+                // 设置表单数据 - 如果formData为空，使用当前实例的formData
+                try {
+                    if (formData != null) {
+                        task.setFormData(objectMapper.writeValueAsString(formData));
+                    } else {
+                        task.setFormData(instance.getFormData());
+                    }
+                } catch (Exception e) {
+                    // 序列化失败时使用实例的formData
+                    task.setFormData(instance.getFormData());
+                }
+
+                // 设置超时时间
+                if (node.getTimeoutHours() != null && node.getTimeoutHours() > 0) {
+                    task.setTimeoutTime(DateUtils.addHours(DateUtils.getNowDate(), node.getTimeoutHours()));
+                }
+
+                task.setCreateBy(SecurityUtils.getUsername());
+                task.setCreateTime(DateUtils.getNowDate());
+
+                taskMapper.insertApprovalTask(task);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("创建违禁品审批任务失败：" + e.getMessage(), e);
+        }
+    }
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -23,6 +23,7 @@ import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
+import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.dto.UserInfo;
 import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.enums.RoleTypeEnum;
@@ -1174,4 +1175,15 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         return 1;
     }
+
+    /**
+     * 查询用户列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    @Override
+    public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(SysUserConditionDto dto) {
+        return userMapper.selectUserListByDeptIdAndRoleKeyListAndUserName(dto.getDeptId(), dto.getRoleKeyList(), dto.getNickName());
+    }
 }

airport-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -988,6 +988,22 @@
         </foreach>
     </select>
 
+    <select id="selectUserListByDeptIdAndRoleKeyListAndUserName" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where (u.dept_id = #{deptId} OR u.dept_id IN (
+        SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors)))
+        and u.del_flag = '0'
+        <if test="list != null and list.size() > 0">
+            and r.role_key in
+            <foreach collection="list" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="nickName != null and nickName != ''">
+            and u.nick_name like concat('%', #{nickName}, '%')
+        </if>
+    </select>
+
     <select id="homePageUserInfo" resultType="com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto">
         select su.user_id      userId,
                su.user_name    userName,