From 8fa59c2cf9aebf3baad068427116de3099bd88e6 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 17 Oct 2022 10:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=E7=BB=93=E6=9E=84=E6=94=B9=E9=80=A0?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=91=98=E3=80=81=E5=87=8F=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/SIArchivesService.java | 8 +-- .../service/impl/SIArchivesServiceImpl.java | 57 +++++++++++++------ .../salary/web/SIArchivesController.java | 8 +-- 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/src/com/engine/salary/service/SIArchivesService.java b/src/com/engine/salary/service/SIArchivesService.java index 599304a9a..96b5cda36 100644 --- a/src/com/engine/salary/service/SIArchivesService.java +++ b/src/com/engine/salary/service/SIArchivesService.java @@ -69,20 +69,20 @@ public interface SIArchivesService { /** * 批量减员 */ - String stayDelToStop(Collection ids); + Map stayDelToStop(Collection ids); /** * 全量减员 */ - String allStayDelToStop(); + Map allStayDelToStop(); /** * 全量增员 */ - String allStayAddToPay(); + Map allStayAddToPay(); /** * 批量增员 */ - String stayAddToPay(Collection ids); + Map stayAddToPay(Collection ids); } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 1ff5451a8..a41d5baf4 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -544,7 +544,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * 批量减员 */ @Override - public String stayDelToStop(Collection ids) { + public Map stayDelToStop(Collection ids) { if (CollectionUtils.isEmpty(ids)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); @@ -621,34 +621,46 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .employeeIds(toStopEmployeeIdList).runStatus(EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue()).build()); } + Map resultMap = new HashMap<>(2); + String resultMsg = "操作成功"; + String resultType = "success"; + // 批量设为定薪提示 + //输出结果，此处需区分单一减员和批量减员 if (baseInfoPOList.size() == toStopEmployeeIdList.size()) { //减员成功 if (baseInfoPOList.size() == 1) { - return "减员成功"; + resultMsg = "减员成功"; + } else { - return "批量减员成功"; + resultMsg = "批量减员成功"; + } } else { //减员失败 + resultType = "fail"; if (baseInfoPOList.size() == 1) { - return "减员失败，失败原因：数据未正常维护"; + resultMsg = "减员失败，失败原因：数据未正常维护"; + } else { - return "部分或全部失败：【共提交减员数据" + resultMsg = "部分或全部失败：【共提交减员数据" + employeeIds.size() +"条，成功" + toStopEmployeeIdList.size() +"条，失败" + noStopEmployeeIds.size() +"条，失败原因：数据未正常维护】"; + } } - + resultMap.put("type", resultType); + resultMap.put("msg", resultMsg); + return resultMap; } /** * 全量减员 */ @Override - public String allStayDelToStop() { + public Map allStayDelToStop() { List allBaseInfoList = getInsuranceBaseInfoMapper().listAll(); if (allBaseInfoList.size() > 0) { Collection stayDelIds = allBaseInfoList.stream().filter(f->f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())) @@ -656,10 +668,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (stayDelIds.size() > 0) { return stayDelToStop(stayDelIds); } else { - return "当前无待减员数据"; + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); } } else { - return "当前无待减员数据"; + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); } } @@ -667,7 +679,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * 批量增员 */ @Override - public String stayAddToPay(Collection ids) { + public Map stayAddToPay(Collection ids) { if (CollectionUtils.isEmpty(ids)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); } @@ -775,33 +787,44 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .employeeIds(toPayEmployeeIdList).runStatus(EmployeeStatusEnum.PAYING.getValue()).build()); } + Map resultMap = new HashMap<>(2); + String resultMsg = "操作成功"; + String resultType = "success"; + // 批量设为定薪提示 + //输出结果，此处需区分单一增员和批量增员 if (baseInfoPOList.size() == toPayEmployeeIdList.size()) { //增员成功 if (baseInfoPOList.size() == 1) { - return "增员成功"; + resultMsg = "增员成功"; + } else { - return "批量增员成功"; + resultMsg = "批量增员成功"; } } else { //增员失败 + resultType = "fail"; if (baseInfoPOList.size() == 1) { - return "增员失败，失败原因：数据未正常维护"; + resultMsg = "增员失败，失败原因：数据未正常维护"; } else { - return "部分或全部失败：【共提交增员数据" + resultMsg = "部分或全部失败：【共提交增员数据" + employeeIds.size() +"条，成功" + toPayEmployeeIdList.size() +"条，失败" + noPayEmployeeIds.size() +"条，失败原因：数据未正常维护】"; + } } + resultMap.put("type", resultType); + resultMap.put("msg", resultMsg); + return resultMap; } /** * 全量增员 */ @Override - public String allStayAddToPay() { + public Map allStayAddToPay() { List allBaseInfoList = getInsuranceBaseInfoMapper().listAll(); if (allBaseInfoList.size() > 0) { Collection stayAddIds = allBaseInfoList.stream().filter(f->f.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())) @@ -809,10 +832,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (stayAddIds.size() > 0) { return stayAddToPay(stayAddIds); } else { - return "当前无待增员数据"; + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); } } else { - return "当前无待增员数据"; + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); } } diff --git a/src/com/engine/salary/web/SIArchivesController.java b/src/com/engine/salary/web/SIArchivesController.java index 9b5628792..9a49a6dbc 100644 --- a/src/com/engine/salary/web/SIArchivesController.java +++ b/src/com/engine/salary/web/SIArchivesController.java @@ -178,7 +178,7 @@ public class SIArchivesController { @Produces(MediaType.APPLICATION_JSON) public String stayDelToStop(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody Collection ids) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult, String>(user).run(getService(user)::stayDelToStop, ids); + return new ResponseResult, Map>(user).run(getService(user)::stayDelToStop, ids); } /** @@ -189,7 +189,7 @@ public class SIArchivesController { @Produces(MediaType.APPLICATION_JSON) public String allStayDelToStop(@Context HttpServletRequest request, @Context HttpServletResponse response) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getService(user)::allStayDelToStop); + return new ResponseResult>(user).run(getService(user)::allStayDelToStop); } /** @@ -200,7 +200,7 @@ public class SIArchivesController { @Produces(MediaType.APPLICATION_JSON) public String stayAddToPay(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody Collection ids) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult, String>(user).run(getService(user)::stayAddToPay, ids); + return new ResponseResult, Map>(user).run(getService(user)::stayAddToPay, ids); } /** @@ -211,6 +211,6 @@ public class SIArchivesController { @Produces(MediaType.APPLICATION_JSON) public String allStayAddToPay(@Context HttpServletRequest request, @Context HttpServletResponse response) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getService(user)::allStayAddToPay); + return new ResponseResult>(user).run(getService(user)::allStayAddToPay); } }