From 70f3239e983acf7323ff626e70034716f160a2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 7 Apr 2022 20:05:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/enums/UserStatusEnum.java | 29 ++++++++++++------- .../archive/SalaryArchiveItemMapper.xml | 2 +- .../salary/web/SalaryArchiveController.java | 14 +++++++-- .../wrapper/SalaryArchiveTaxAgentWrapper.java | 4 +++ .../salary/wrapper/SalaryArchiveWrapper.java | 17 +++++++++++ 5 files changed, 53 insertions(+), 13 deletions(-) diff --git a/src/com/engine/salary/enums/UserStatusEnum.java b/src/com/engine/salary/enums/UserStatusEnum.java index c5bd57f53..7a8da5590 100644 --- a/src/com/engine/salary/enums/UserStatusEnum.java +++ b/src/com/engine/salary/enums/UserStatusEnum.java @@ -1,7 +1,7 @@ package com.engine.salary.enums; -import java.util.Arrays; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; /** * @Author weaver_cl @@ -19,14 +19,14 @@ import java.util.Optional; **/ public enum UserStatusEnum { - TRIAL(0,"试用"), - FORMAL(1,"正式"), - TEMPORARY(2,"临时"), - DELAY(3,"试用延期"), - FIRE(4,"解雇"), - DEPARTURE(5,"离职"), - RETIRED(6,"退休"), - INVALID(7,"无效"); + TRIAL(0, "试用"), + FORMAL(1, "正式"), + TEMPORARY(2, "临时"), + DELAY(3, "试用延期"), + FIRE(4, "解雇"), + DEPARTURE(5, "离职"), + RETIRED(6, "退休"), + INVALID(7, "无效"); private Integer value; private String description; @@ -49,4 +49,13 @@ public enum UserStatusEnum { Optional optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst(); return optional.isPresent() ? optional.get().description : ""; } + + public static List> getList() { + return Arrays.stream(UserStatusEnum.values()).map(v -> { + Map m = new HashMap(); + m.put("id", v.value.toString()); + m.put("content", v.description); + return m; + }).collect(Collectors.toList()); + } } diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml index 8ed59dd0d..16269542e 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml @@ -916,7 +916,7 @@ FROM hrsa_salary_archive_item t WHERE delete_type = 0 - AND t.effective_time >= #{param.effectiveTime} + AND t.effective_time < #{param.effectiveTime} AND t.salary_item_id IN diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java index eab3543a6..3219d938d 100644 --- a/src/com/engine/salary/web/SalaryArchiveController.java +++ b/src/com/engine/salary/web/SalaryArchiveController.java @@ -248,10 +248,19 @@ public class SalaryArchiveController { return new ResponseResult>().run(getSalaryArchiveWrapper(user)::importSalaryArchive, importParam); } + //人员状态列表 + @GET + @Path("/searchCondition") + @Produces(MediaType.APPLICATION_JSON) + public String searchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>().run(getSalaryArchiveWrapper(user)::searchCondition); + } // ******** 薪资档案主表 end ***********************************************************************************************/ // ******** 薪资项目调整 start ***********************************************************************************************/ + /** * 获取薪资项目调整表单 * @@ -423,7 +432,6 @@ public class SalaryArchiveController { /** * 导出薪资项目调整记录列表 - * */ @GET @Path("/adjustRecord/exportSalaryItemList") @@ -567,7 +575,7 @@ public class SalaryArchiveController { User user = HrmUserVarify.getUser(request, response); - TaxAgentAdjustRecordQueryParam param =new TaxAgentAdjustRecordQueryParam(); + TaxAgentAdjustRecordQueryParam param = new TaxAgentAdjustRecordQueryParam(); XSSFWorkbook workbook = getSalaryArchiveTaxAgentWrapper(user).exportAdjustRecordList(param); @@ -589,5 +597,7 @@ public class SalaryArchiveController { return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build(); } + + /******** 个税扣缴义务人调整记录 end ***********************************************************************************************/ } diff --git a/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java index 685d0369d..c44a6ae57 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java @@ -11,6 +11,7 @@ import com.engine.salary.entity.salaryarchive.param.TaxAgentAdjustRecordQueryPar import com.engine.salary.entity.salaryarchive.po.SalaryArchiveTaxAgentPO; import com.engine.salary.entity.taxrate.TaxAgent; import com.engine.salary.enums.UserStatusEnum; +import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveTaxAgentAdjustReasonEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.SalaryArchiveTaxAgentService; @@ -20,6 +21,7 @@ import com.engine.salary.service.impl.TaxAgentServiceImpl; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; import weaver.hrm.User; @@ -241,4 +243,6 @@ public class SalaryArchiveTaxAgentWrapper extends Service { public XSSFWorkbook exportAdjustRecordList(TaxAgentAdjustRecordQueryParam queryParam) { return getSalaryArchiveTaxAgentService(user).exportAdjustRecordList(queryParam); } + + } diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index 134a8142c..21d12e6aa 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -20,7 +20,10 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import com.engine.salary.entity.salaryarchive.po.SalaryArchiveTaxAgentPO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.taxrate.TaxAgent; +import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveImportTypeEnum; +import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum; +import com.engine.salary.enums.salaryarchive.SalaryArchiveTaxAgentAdjustReasonEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.SalaryArchiveItemService; import com.engine.salary.service.SalaryArchiveService; @@ -32,6 +35,7 @@ import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.hrm.User; @@ -267,5 +271,18 @@ public class SalaryArchiveWrapper extends Service { return getSalaryArchiveService(user).exportList(queryParam); } + public Map searchCondition() { + List> userStatus = UserStatusEnum.getList(); + List> itemAdjustReasons = SalaryArchiveItemAdjustReasonEnum.getList(); + List> TaxAgentAdjustReason = SalaryArchiveTaxAgentAdjustReasonEnum.getList(); + Collection taxAgentList = getTaxAgentService(user).findAll(); + HashMap map = Maps.newHashMap(); + map.put("userStatus",userStatus); + map.put("itemAdjustReasons",itemAdjustReasons); + map.put("TaxAgentAdjustReason",TaxAgentAdjustReason); + map.put("taxAgentList",taxAgentList); + return map; + } + }