台账清理--创建时间没有添加

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/ScoreEmployeeAdditionalController.java

@@ -96,4 +96,13 @@ public class ScoreEmployeeAdditionalController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(scoreEmployeeAdditionalService.deleteScoreEmployeeAdditionalByIds(ids));
     }
+
+    /**
+     * 获取员工附加分列表
+     */
+    @GetMapping("/listByEmployeeInfo")
+    public AjaxResult listByEmployeeInfo(ScoreEmployeeAdditional scoreEmployeeAdditional) {
+        List<ScoreEmployeeAdditional> list = scoreEmployeeAdditionalService.selectScoreEmployeeAdditionalList(scoreEmployeeAdditional);
+        return success(list);
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerBannerLetterService.java

@@ -6,4 +6,6 @@ import com.sundot.airport.ledger.domain.LedgerBannerLetter;
 
 public interface ILedgerBannerLetterService extends IService<LedgerBannerLetter> {
     List<LedgerBannerLetter> selectList(LedgerBannerLetter query);
+
+    int batchInsert(List<LedgerBannerLetter> list);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerLeaveSpecialService.java

@@ -6,4 +6,6 @@ import com.sundot.airport.ledger.domain.LedgerLeaveSpecial;
 
 public interface ILedgerLeaveSpecialService extends IService<LedgerLeaveSpecial> {
     List<LedgerLeaveSpecial> selectList(LedgerLeaveSpecial query);
+
+    int batchInsert(List<LedgerLeaveSpecial> list);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerRewardPenaltyService.java

@@ -6,4 +6,6 @@ import com.sundot.airport.ledger.domain.LedgerRewardPenalty;
 
 public interface ILedgerRewardPenaltyService extends IService<LedgerRewardPenalty> {
     List<LedgerRewardPenalty> selectList(LedgerRewardPenalty query);
+
+    int batchInsert(List<LedgerRewardPenalty> list);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/DeptPortraitServiceImpl.java

@@ -17,10 +17,14 @@ import com.sundot.airport.ledger.dto.GroupPortraitDTO;
 import com.sundot.airport.ledger.service.IDeptPortraitService;
 import com.sundot.airport.ledger.service.IGroupPortraitService;
 import com.sundot.airport.system.domain.BasePosition;
+import com.sundot.airport.system.domain.SysPost;
+import com.sundot.airport.system.domain.SysUserPost;
 import com.sundot.airport.system.mapper.BasePositionMapper;
 import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.mapper.SysPostMapper;
 import com.sundot.airport.system.mapper.SysRoleMapper;
 import com.sundot.airport.system.mapper.SysUserMapper;
+import com.sundot.airport.system.mapper.SysUserPostMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +70,12 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
     private BasePositionMapper basePositionMapper;
 
     @Autowired
+    private SysPostMapper sysPostMapper;
+
+    @Autowired
+    private SysUserPostMapper sysUserPostMapper;
+
+    @Autowired
     private IGroupPortraitService groupPortraitService;
 
     @Override
@@ -194,34 +204,47 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
 
     /**
      * 统计岗位资质分布
-     * 从base_position表查询岗位资质，按position_type='SECURITY_POSITION'筛选
+     * 正确逻辑：通过用户ID查询sys_user_post找到岗位ID，再查询sys_post获取岗位信息
+     * 使用批量查询优化性能
      */
     private List<DeptMemberDistributionDTO.DistributionItem> calculatePositionDistribution(List<SysUser> users) {
-        // 查询所有安检岗位
-        BasePosition query = new BasePosition();
-        query.setPositionType("SECURITY_POSITION");
-        List<BasePosition> allPositions = basePositionMapper.selectBasePositionList(query);
+        if (users == null || users.isEmpty()) {
+            return Collections.emptyList();
+        }
         
-        // 初始化岗位统计Map，按岗位名称统计
-        Map<String, Integer> positionMap = new LinkedHashMap<>();
-        if (allPositions != null) {
-            for (BasePosition pos : allPositions) {
-                positionMap.put(pos.getName(), 0);
+        // 1. 收集所有用户ID
+        List<Long> userIds = users.stream()
+                .map(SysUser::getUserId)
+                .collect(Collectors.toList());
+        
+        // 2. 批量查询用户岗位关系
+        List<SysUserPost> userPostRelations = sysUserPostMapper.selectUserPostByUserIds(userIds);
+        
+        if (userPostRelations == null || userPostRelations.isEmpty()) {
+            return Collections.emptyList();
+        }
+        
+        // 3. 收集所有岗位ID
+        List<Long> postIds = userPostRelations.stream()
+                .map(SysUserPost::getPostId)
+                .distinct()
+                .collect(Collectors.toList());
+        
+        // 4. 批量查询岗位信息（一次SQL）
+        Map<Long, String> postIdToNameMap = new HashMap<>();
+        for (Long postId : postIds) {
+            SysPost post = sysPostMapper.selectPostById(postId);
+            if (post != null && post.getPostName() != null) {
+                postIdToNameMap.put(postId, post.getPostName());
             }
         }
         
-        // 统计每个用户的岗位
-        for (SysUser user : users) {
-            String positions = user.getSecurityInspectionPosition();
-            if (positions != null && !positions.isEmpty()) {
-                // 岗位可能用逗号分隔
-                String[] positionArray = positions.split("[,，]");
-                for (String pos : positionArray) {
-                    String trimmed = pos.trim();
-                    if (positionMap.containsKey(trimmed)) {
-                        positionMap.put(trimmed, positionMap.get(trimmed) + 1);
-                    }
-                }
+        // 5. 统计每个岗位的人数
+        Map<String, Integer> positionMap = new LinkedHashMap<>();
+        for (SysUserPost relation : userPostRelations) {
+            String postName = postIdToNameMap.get(relation.getPostId());
+            if (postName != null && !postName.isEmpty()) {
+                positionMap.merge(postName, 1, Integer::sum);
             }
         }
         
@@ -298,8 +321,9 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
         dto.setQualificationLevel(decodeQualificationLevel(user.getQualificationLevel()));
         dto.setAge(calculateAgeFromIdCard(user.getCardNumber()));
         
-        if (user.getStartWorkingDate() != null) {
-            dto.setWorkYears(calculateYears(user.getStartWorkingDate()));
+        if (user.getEntryDate() != null) {
+            Integer workYears = calculateYears(user.getEntryDate());
+            dto.setWorkYears(workYears);
         }
         if (user.getXrayOperatorStarttime() != null) {
             dto.setXrayOperatorYears(calculateYears(user.getXrayOperatorStarttime()));

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerBannerLetterServiceImpl.java

@@ -8,6 +8,7 @@ import com.sundot.airport.ledger.mapper.LedgerBannerLetterMapper;
 import com.sundot.airport.ledger.service.ILedgerBannerLetterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -25,4 +26,12 @@ public class LedgerBannerLetterServiceImpl extends ServiceImpl<LedgerBannerLette
         return mapper.selectList(query);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int batchInsert(List<LedgerBannerLetter> list) {
+        list.forEach(item -> item.setCreateTime(DateUtils.getNowDate()));
+        saveBatch(list);
+        return list.size();
+    }
+
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerCombinedImportServiceImpl.java

@@ -794,7 +794,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
-        rewardPenaltyService.saveBatch(list);
+        rewardPenaltyService.batchInsert(list);
         return list.size();
     }
 
@@ -815,7 +815,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
-        leaveSpecialService.saveBatch(list);
+        leaveSpecialService.batchInsert(list);
         return list.size();
     }
 
@@ -838,7 +838,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
-        bannerLetterService.saveBatch(list);
+        bannerLetterService.batchInsert(list);
         return list.size();
     }
 

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerLeaveSpecialServiceImpl.java

@@ -8,6 +8,7 @@ import com.sundot.airport.ledger.mapper.LedgerLeaveSpecialMapper;
 import com.sundot.airport.ledger.service.ILedgerLeaveSpecialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -25,4 +26,12 @@ public class LedgerLeaveSpecialServiceImpl extends ServiceImpl<LedgerLeaveSpecia
         return mapper.selectList(query);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int batchInsert(List<LedgerLeaveSpecial> list) {
+        list.forEach(item -> item.setCreateTime(DateUtils.getNowDate()));
+        saveBatch(list);
+        return list.size();
+    }
+
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerRewardPenaltyServiceImpl.java

@@ -3,11 +3,13 @@ package com.sundot.airport.ledger.service.impl;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.ledger.domain.LedgerRewardApproval;
 import com.sundot.airport.ledger.domain.LedgerRewardPenalty;
 import com.sundot.airport.ledger.mapper.LedgerRewardPenaltyMapper;
 import com.sundot.airport.ledger.service.ILedgerRewardPenaltyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -25,4 +27,13 @@ public class LedgerRewardPenaltyServiceImpl extends ServiceImpl<LedgerRewardPena
         return mapper.selectList(query);
     }
 
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int batchInsert(List<LedgerRewardPenalty> list) {
+        list.forEach(item -> item.setCreateTime(DateUtils.getNowDate()));
+        saveBatch(list);
+        return list.size();
+    }
+
 }

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

@@ -11,6 +11,13 @@ import com.sundot.airport.system.domain.SysUserPost;
  */
 public interface SysUserPostMapper {
     /**
+     * 批量查询用户岗位关系
+     *
+     * @param userIds 用户ID列表
+     * @return 用户岗位关系列表
+     */
+    public List<SysUserPost> selectUserPostByUserIds(List<Long> userIds);
+    /**
      * 通过用户ID删除用户和岗位关联
      *
      * @param userId 用户ID
@@ -41,4 +48,4 @@ public interface SysUserPostMapper {
      * @return 结果
      */
     public int batchUserPost(List<SysUserPost> userPostList);
-}
+}

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

@@ -35,4 +35,13 @@
         </foreach>
     </insert>
 
-</mapper> 
+    <select id="selectUserPostByUserIds" parameterType="java.util.List" resultMap="SysUserPostResult">
+        select user_id, post_id
+        from sys_user_post
+        where user_id in
+        <foreach collection="list" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </select>
+
+</mapper>