Merge branch 'release/3.0.2.2504.01' into custom/钱智

src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java

@@ -721,6 +721,7 @@ public class TaxDeclarationBO {
     private static String findStringValue(String fieldCode, Map<Long, List<SalaryAcctResultPO>> resultMap, Map<String, Long> salaryItemMap) {
         return resultMap.getOrDefault(salaryItemMap.getOrDefault(fieldCode, 0L), Collections.emptyList()).stream()
                 .map(SalaryAcctResultPO::getResultValue)
+                .filter(Objects::nonNull)
                 .findFirst().orElse("");
     }
 

src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java

@@ -525,7 +525,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
             throw new SalaryRunTimeException("该维度值中无数据！");
         }
         // 同一个人放在一起
-        listByDimensionValue = listByDimensionValue.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getEmployeeId)).collect(Collectors.toList());
+        listByDimensionValue = listByDimensionValue.stream().sorted((a,b)-> b.getSalaryMonth().compareTo(a.getSalaryMonth())).collect(Collectors.toList());
         List<SalaryAcctEmployeePO> salaryAcctEmployeePOList = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), listByDimensionValue);
 
         // 获取此分页的核算人员

src/com/engine/salary/service/auth/AuthRoleServiceImpl.java

@@ -1,6 +1,7 @@
 package com.engine.salary.service.auth;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
@@ -63,6 +64,12 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService {
     public PageInfo<AuthRoleDTO> roleList(AuthRoleListQueryParam param) {
 
         List<AuthRolePO> authRolePOS = getAuthRoleMapper().list(param);
+
+        String name = param.getName();
+        if(StrUtil.isNotBlank(name)){
+            authRolePOS = authRolePOS.stream().filter(po -> po.getName().contains(name)).collect(Collectors.toList());
+        }
+
         int total = authRolePOS.size();
 
         List<AuthRoleDTO> list = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), authRolePOS)

src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java

@@ -106,7 +106,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
         Map<Long, DataCollectionEmployee> collect = employeeByIds.stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, Function.identity()));
         list.forEach(item -> {
             Map<String, Object> record = new HashMap<>();
-            DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId());
+            DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId()) ==null?new DataCollectionEmployee():collect.get(item.getEmployeeId());
             record.put("id", item.getId());
             record.put("employeeId", item.getEmployeeId());
             record.put("billMonth", item.getBillMonth());

src/com/engine/salary/service/impl/SIRepairServiceImpl.java

@@ -485,8 +485,10 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                 socialMap = socialMap.entrySet().stream().filter(e -> "9002".equals(e.getKey()))
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                 Map<String, String> socialComMap = JSON.parseObject(socialSchemePO.getSocialPaymentComBaseString(), new HashMap<String, String>().getClass());
+                if(socialComMap !=null){
                     socialComMap = socialComMap.entrySet().stream().filter(e -> "9002".equals(e.getKey()))
                             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                }
                 List<String> socialIds = new ArrayList<>();
                 socialIds.addAll(socialMap == null ? Collections.emptyList() : socialMap.keySet());
                 socialIds.addAll(socialComMap == null ? Collections.emptyList() : socialComMap.keySet());

src/com/engine/salary/service/impl/SISchemeServiceImpl.java

@@ -2473,6 +2473,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
      * @param employeeId
      */
     public String update(InsuranceSchemeReqParam updateParam, long employeeId) {
+        log.info("福利方案更新参数:{}", updateParam);
         //查询是否存在福利方案
         InsuranceSchemePO insuranceSchemePO = getById(updateParam.getInsuranceScheme().getId());
         if (Objects.isNull(insuranceSchemePO)) {
@@ -2506,6 +2507,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
         //更新福利方案主表
         InsuranceSchemePO insuranceSchemePO1 = InsuranceSchemeBO.buildInsuranceSchemePO(insuranceSchemePO, updateParam.getInsuranceScheme());
         getInsuranceSchemeMapper().update(insuranceSchemePO1);
+        log.info("福利方案更新主表:{}", insuranceSchemePO1);
         //记录主表操作日志
         loggerContext.setNewValues(insuranceSchemePO1);
         SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext);
@@ -2529,6 +2531,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
         //更新福利方案明细表 先删后插
         getInsuranceSchemeDetailMapper().batchDeleteByPrimaryIds(Collections.singleton(updateParam.getInsuranceScheme().getId()));
         //更新明细表
+        log.info("福利方案更新明细表:{}", insuranceSchemeDetailPOS);
         encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class);
         insuranceSchemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::insert);