diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java index 7d2e9b552..bf827761f 100644 --- a/src/com/engine/salary/biz/AddUpDeductionBiz.java +++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java @@ -31,7 +31,8 @@ public class AddUpDeductionBiz extends BaseBean { try { AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class); List list = mapper.list(param); - return AddUpDeductionStrDTOEncrypt.decryptAddUpDeductionList(list); + AddUpDeductionStrDTOEncrypt.decryptAddUpDeductionList(list); + return list; } finally { sqlSession.close(); } diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java index e3ac30ef5..163ec4b03 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java @@ -3,9 +3,7 @@ package com.engine.salary.encrypt.datacollection; import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; -import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * hrsa_add_up_deduction: 数据加解密 @@ -17,9 +15,9 @@ import java.util.stream.Collectors; * add_up_support_elderly */ public class AddUpDeductionStrDTOEncrypt { - public static List decryptAddUpDeductionList(List list) { - if(list == null || list.size() == 0) { - return new ArrayList<>(); + public static void decryptAddUpDeductionList(List list) { + if (list == null || list.size() == 0) { + return; } list.forEach(item -> { item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); @@ -30,27 +28,6 @@ public class AddUpDeductionStrDTOEncrypt { item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); }); - return list.stream().map(item -> { - return AddUpDeductionDTO.builder() - .id(item.getId()) - .employeeId(item.getEmployeeId()) - .username(item.getUsername()) - .taxAgentName(item.getTaxAgentName()) - .departmentName(item.getDepartmentName()) - .mobile(item.getMobile()) - .jobNum(item.getJobNum()) - .idNo(item.getIdNo()) - .hiredate(item.getHiredate()) - .addUpChildEducation(item.getAddUpChildEducation()) - .addUpContinuingEducation(item.getAddUpContinuingEducation()) - .addUpHousingLoanInterest(item.getAddUpHousingLoanInterest()) - .addUpHousingRent(item.getAddUpHousingRent()) - .addUpSupportElderly(item.getAddUpSupportElderly()) - .addUpIllnessMedical(item.getAddUpIllnessMedical()) - .addUpInfantCare(item.getAddUpInfantCare()) - .operate(item.getOperate()) - .build(); - }).collect(Collectors.toList()); } diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 3aee39f9f..7801b7b8b 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -432,7 +432,8 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getAddUpDeductionMapper().list(queryParam); - return new PageInfo<>(AddUpDeductionStrDTOEncrypt.decryptAddUpDeductionList(list), AddUpDeductionDTO.class); + AddUpDeductionStrDTOEncrypt.decryptAddUpDeductionList(list); + return new PageInfo<>(list, AddUpDeductionDTO.class); } @Override @@ -450,7 +451,8 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getAddUpDeductionMapper().recordList(queryParam); - return new PageInfo<>(AddUpDeductionRecordStrDTOEncrypt.decryptAddUpDeductionRecordDTO(list), AddUpDeductionRecordDTO.class); + AddUpDeductionRecordStrDTOEncrypt.decryptAddUpDeductionRecordDTO(list); + return new PageInfo<>(list, AddUpDeductionRecordDTO.class); } diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index 3203cf8b2..d8d958788 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -419,7 +419,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa // AttendQuoteDataBO.buildAttendDataFromRemote("day", attendResult.getData(), attendQuoteFields, attendQuoteSyncData); } } catch (Exception e) { - log.error("获取考勤数据错误失败:{}", String.format("参数:%s,错误信息:%s", JSONObject.toJSONString(attend4Salary), e.getMessage()),e); + log.error("获取考勤数据错误失败:{}", String.format("参数:%s,错误信息:%s", JSONObject.toJSONString(attend4Salary), e.getMessage()), e); return attendQuoteSyncData; } log.info("同步的考勤数据:{}", JSONUtils.toJSONString(attendQuoteSyncData)); @@ -579,13 +579,26 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa // 表头 List headers = ExcelSupport.getSheetHeader(sheet, 0); - boolean isValidHeader = checkHeaders(headers, attendQuoteFields); - // 错误sheet数据 List> errorData = new ArrayList<>(); // 错误提示 List> excelComments = new ArrayList<>(); + //验证字段是否缺失 + String isValidHeader = checkHeaders(headers, attendQuoteFields); + if (StringUtils.isNotBlank(isValidHeader)) { + Map apidatas = new HashMap(); + apidatas.put("successCount", successCount); + apidatas.put("errorCount", errorCount); + + Map errorMessageMap = Maps.newHashMap(); + errorMessageMap.put("message", isValidHeader); + excelComments.add(errorMessageMap); + apidatas.put("errorData", excelComments); + return apidatas; + } + + // 处理数值 List> data = ExcelParseHelper.parse2Map(sheet, 1); total = data.size(); @@ -813,7 +826,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa * * @return */ - private boolean checkHeaders(List headerList, List attendQuoteFields) { + private String checkHeaders(List headerList, List attendQuoteFields) { boolean isValid = true; String userNameI18n = SalaryI18nUtil.getI18nLabel(85429, "姓名"); @@ -830,9 +843,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa } else if (CollectionUtils.isNotEmpty(lackHeaders)) { errorMsg = checkHeaderI18n + Joiner.on(",").join((Iterable) lackHeaders); } - if (StringUtils.isNotEmpty(errorMsg)) { - throw new SalaryRunTimeException(errorMsg); - } - return isValid; + + return errorMsg; } } diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index 8ed805d6f..e5df22177 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -384,6 +384,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额"); List list = getOtherDeductionMapper().list(param); + OtherDeductionListDTOEncrypt.decryptOtherDeductionListDTOList(list); // 开启分权并且不是薪酬模块总管理员 if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) { List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); @@ -476,6 +477,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); //查询详细信息 List list = getOtherDeductionMapper().recordList(param); + OtherDeductionRecordDTOEncrypt.decryptOtherDeductionRecordDTOList(list); final List> dataRowList = Optional.ofNullable(list) .map(List::stream) .map(operatorStream -> operatorStream.map(dto -> { diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 739cae899..fc73175e5 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -237,7 +237,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { map.put("departmentId", item.getDepartmentId()); map.put("jobNum", item.getJobNum()); map.put("mobile", item.getTelephone()); - map.put("status", item.getUserStatusEnum() == null ? "" : item.getUserStatusEnum().getDescription()); + map.put("status", item.getUserStatus() == null ? "" : UserStatusEnum.getDefaultLabelByValue(item.getUserStatus())); if (socialItem != null) { map.put("socialName", getSiSchemeService().querySchemeName(socialItem.getSocialSchemeId())); Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { diff --git a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java index 2fcc81ff5..cddf53e18 100644 --- a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java +++ b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java @@ -71,8 +71,10 @@ public class AttendQuoteDataWrapper extends Service { // 获取最终结果 List> listMaps = getAttendQuoteDataService(user).getListMaps(attendQuoteDataBases); - PageInfo> listPage = new PageInfo<>(); - listPage.setList(listMaps); + PageInfo> listPage = new PageInfo<>(listMaps); + listPage.setPageNum(page.getPageNum()); + listPage.setPageSize(page.getPageSize()); + listPage.setTotal(page.getTotal()); // 表格表头 @@ -117,7 +119,7 @@ public class AttendQuoteDataWrapper extends Service { } /** - * 到处考勤引用数据 + * 导出考勤引用数据 * * @param queryParam * @return