From 9c34fb9497409e820a761c965bed8b62c418a2a0 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 7 Jul 2023 11:47:43 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java | 1 + .../entity/salaryacct/param/SalaryAcctResultQueryParam.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java index 8320ff6bf..f713e07a4 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java @@ -50,6 +50,7 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam { */ private SalaryEmployeeStatusEnum status; + private Collection statusList; //离职日期") private LocalDateRange dismissDate; diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java index 21221a4b3..6edf7ab10 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java @@ -46,6 +46,7 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam { //状态 private SalaryEmployeeStatusEnum status; + private Collection statusList; //离职日期 private LocalDateRange dismissDate; From b92c7ff599bc60d1828cd765924da7288dcc3e31 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 7 Jul 2023 15:32:12 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E3=80=81=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E3=80=81=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BA=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryAcctEmployeeQueryParam.java | 3 ++- .../param/SalaryAcctResultQueryParam.java | 4 +++- .../param/SalaryArchiveQueryParam.java | 2 ++ .../salaryacct/SalaryAcctEmployeeMapper.xml | 18 ++++++++++++++++++ .../salary/web/SalaryAcctController.java | 4 ++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java index f713e07a4..cfe97aae9 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java @@ -50,7 +50,8 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam { */ private SalaryEmployeeStatusEnum status; - private Collection statusList; + //状态(多选) + private List statuses; //离职日期") private LocalDateRange dismissDate; diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java index 6edf7ab10..c82ebf8af 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Collection; +import java.util.List; /** * 薪资核算结果查询参数 @@ -46,7 +47,8 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam { //状态 private SalaryEmployeeStatusEnum status; - private Collection statusList; + //状态(多选) + private List statuses; //离职日期 private LocalDateRange dismissDate; diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index c975e8283..f52e8bee2 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -48,6 +48,8 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { //状态 private String userstatus; + //状态(多选) + private List statuses; //入职日期 private List hiredate; diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index f414ff60f..ea8fac029 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -528,6 +528,12 @@ #{positionId} + + AND em.status IN + + #{userStatus} + + -- 在职 AND em.status in (0,1,2,3) @@ -611,6 +617,12 @@ #{positionId} + + AND em.status IN + + #{userStatus} + + -- 在职 AND em.status in (0,1,2,3) @@ -694,6 +706,12 @@ #{positionId} + + AND em.status IN + + #{userStatus} + + -- 在职 AND em.status in (0,1,2,3) diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 6f06d003b..d66893e72 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -709,6 +709,10 @@ public class SalaryAcctController { if (StringUtils.isNotBlank(status)) { param.setStatus(SalaryEmployeeStatusEnum.parseByValue(Integer.parseInt(status))); } + String statuses = request.getParameter("statuses"); + if (StringUtils.isNotBlank(statuses)) { + param.setStatuses(Arrays.stream(statuses.split(",")).map(String::valueOf).collect(Collectors.toList())); + } //fixme 日期 request.getParameter("dismissDate"); String consolidatedTaxation = request.getParameter("consolidatedTaxation"); From b705161492e7ac54fa8f0e2e9432247ec807391e Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 10 Jul 2023 14:33:43 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E3=80=81=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E3=80=81=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 9 +++++++-- .../param/InsuranceArchivesListParam.java | 1 + .../mapper/archive/SalaryArchiveMapper.xml | 20 +++++++++++++++++-- .../salaryacct/SalaryAcctEmployeeMapper.xml | 7 +++++-- .../service/impl/SIArchivesServiceImpl.java | 5 ++++- .../service/impl/SIImportServiceImpl.java | 5 ++++- .../engine/salary/web/SISchemeController.java | 6 ++++++ .../salary/web/SalaryAcctController.java | 4 ++++ .../salary/web/SalaryArchiveController.java | 4 ++++ 9 files changed, 53 insertions(+), 8 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index dac9c3f20..51da1aa57 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -928,6 +928,10 @@ public class SIArchivesBiz { request.setPositions(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); } + if (StringUtils.isNotBlank(param.getStatusesStr())) { + request.setStatuses(Arrays.stream(param.getStatusesStr().split(",")).map(String::new).collect(Collectors.toList())); + } + request.setNeedAuth(param.getNeedAuth()); request.setTaxAgentEmployeeIds(param.getTaxAgentEmployeeIds()); request.setTaxAgentIds(param.getTaxAgentIds()); @@ -937,7 +941,7 @@ public class SIArchivesBiz { long startNum = (current - 1) * pageSize; param.setStartNum(startNum); param.setPageSize(pageSize); - request.setStatuses(param.getStatuses()); +// request.setStatuses(param.getStatuses()); request.setKeyword(param.getUserName()); request.setSiSchemeId(param.getSiSchemeId()); @@ -1393,8 +1397,9 @@ public class SIArchivesBiz { conditionItems.add(departmentIds); - SearchConditionItem statuses = conditionFactory.createCondition(ConditionType.SELECT, 502327, "statuses"); + SearchConditionItem statuses = conditionFactory.createCondition(ConditionType.SELECT, 502327, "statusesStr"); statuses.setInputType("select"); + statuses.setMultiple(true); statuses.setOptions(userStatusOptions); statuses.setColSpan(2); statuses.setFieldcol(16); diff --git a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java index ad05e9702..276fd82b3 100644 --- a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java +++ b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java @@ -38,6 +38,7 @@ public class InsuranceArchivesListParam extends BaseQueryParam { //状态(多线)") private List statuses; + private String statusesStr; //岗位(多选)") private List positions; diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index cc03c82f0..2ae1e016f 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -154,6 +154,12 @@ AND e.status = #{param.userstatus} + + AND e.status IN + + #{userstatus} + + AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) @@ -229,7 +235,12 @@ AND e.status = #{param.userstatus} - + + AND e.status IN + + #{userstatus} + + AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) @@ -305,7 +316,12 @@ AND e.status = #{param.userstatus} - + + AND e.status IN + + #{userstatus} + + AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index ea8fac029..c4a31854d 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -497,6 +497,7 @@ or (param.subcompanyIds != null and param.subcompanyIds.size()>0) or (param.departmentIds != null and param.departmentIds.size()>0) or (param.positionIds != null and param.positionIds.size()>0) + or (param.statuses != null and param.statuses.size()>0) or (param.status != null and param.status.toString != 'ALL')"> AND t.employee_id IN ( @@ -587,7 +588,8 @@ or (param.workcode != null and param.workcode != '') or (param.subcompanyIds != null and param.subcompanyIds.size()>0) or (param.departmentIds != null and param.departmentIds.size()>0) - or (param.positionIds != null and param.positionIds.size()>0) + or (param.positionIds != null and param.positionIds.size()>0) + or (param.statuses != null and param.statuses.size()>0) or (param.status != null and param.status.toString != 'ALL')"> AND t.employee_id IN ( @@ -676,7 +678,8 @@ or (param.workcode != null and param.workcode != '') or (param.subcompanyIds != null and param.subcompanyIds.size()>0) or (param.departmentIds != null and param.departmentIds.size()>0) - or (param.positionIds != null and param.positionIds.size()>0) + or (param.positionIds != null and param.positionIds.size()>0) + or (param.statuses != null and param.statuses.size()>0) or (param.status != null and param.status.toString != 'ALL')"> AND t.employee_id IN ( diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index fb00653d7..b2db613e3 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -488,7 +488,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService param.setDimissionDateEnd(param.getDimissionDate()[1]); } if (Objects.equals("fromQuickSearch", param.getDataSource())) { - request.setStatuses(param.getStatuses()); +// request.setStatuses(param.getStatuses()); + if (StringUtils.isNotBlank(param.getStatusesStr())) { + request.setStatuses(Arrays.stream(param.getStatusesStr().split(",")).map(String::new).collect(Collectors.toList())); + } request.setKeyword(param.getUserName()); } else { request = param; diff --git a/src/com/engine/salary/service/impl/SIImportServiceImpl.java b/src/com/engine/salary/service/impl/SIImportServiceImpl.java index ae235c3fc..ecd8f016a 100644 --- a/src/com/engine/salary/service/impl/SIImportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIImportServiceImpl.java @@ -31,6 +31,7 @@ import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.apache.ibatis.session.SqlSession; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.conn.mybatis.MyBatisFactory; @@ -103,7 +104,9 @@ public class SIImportServiceImpl extends Service implements SIImportService { param.setDimissionDateEnd(param.getDimissionDate()[1]); } if (Objects.equals("fromQuickSearch", param.getDataSource())) { - request.setStatuses(param.getStatuses()); + if (StringUtils.isNotBlank(param.getStatusesStr())) { + request.setStatuses(Arrays.stream(param.getStatusesStr().split(",")).map(String::new).collect(Collectors.toList())); + } request.setKeyword(param.getUserName()); request.setStartNum(param.getStartNum()); request.setPageSize(param.getPageSize()); diff --git a/src/com/engine/salary/web/SISchemeController.java b/src/com/engine/salary/web/SISchemeController.java index 4270508d1..9f16e9604 100644 --- a/src/com/engine/salary/web/SISchemeController.java +++ b/src/com/engine/salary/web/SISchemeController.java @@ -182,6 +182,12 @@ public class SISchemeController { if(StringUtils.isNotBlank(runStatuses)){ param.setRunStatuses( Arrays.stream(runStatuses.split(",")).map(String::valueOf).collect(Collectors.toList())); } + + String statusesStr = request.getParameter("statusesStr"); + if (StringUtils.isNotBlank(statusesStr)) { + param.setStatuses(Arrays.stream(statusesStr.split(",")).map(String::new).collect(Collectors.toList())); + } + User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getService(user).export(param); String fileName ; diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index d66893e72..c5990e729 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -297,6 +297,10 @@ public class SalaryAcctController { if (StringUtils.isNotBlank(status)) { param.setStatus(SalaryEmployeeStatusEnum.parseByValue(Integer.parseInt(status))); } + String statuses = request.getParameter("statuses"); + if (StringUtils.isNotBlank(statuses)) { + param.setStatuses(Arrays.stream(statuses.split(",")).map(String::valueOf).collect(Collectors.toList())); + } //fixme 日期 request.getParameter("dismissDate"); String ids = request.getParameter("ids"); diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java index 28e773578..af9aad165 100644 --- a/src/com/engine/salary/web/SalaryArchiveController.java +++ b/src/com/engine/salary/web/SalaryArchiveController.java @@ -458,6 +458,10 @@ public class SalaryArchiveController { if (StringUtils.isNotBlank(userstatus)) { param.setUserstatus(userstatus); } + String statuses = request.getParameter("statuses"); + if (StringUtils.isNotBlank(statuses)) { + param.setStatuses(Arrays.stream(statuses.split(",")).map(String::valueOf).collect(Collectors.toList())); + } String hiredate = request.getParameter("hiredate"); if (StringUtils.isNotBlank(hiredate)) { param.setHiredate(Arrays.asList(hiredate.split(","))); From e67530eb877786d9153032890294427221b700be Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 10 Jul 2023 17:20:04 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=A0=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/web/SISchemeController.java | 76 +++++++++++++++---- 1 file changed, 60 insertions(+), 16 deletions(-) diff --git a/src/com/engine/salary/web/SISchemeController.java b/src/com/engine/salary/web/SISchemeController.java index 9f16e9604..842c8b0eb 100644 --- a/src/com/engine/salary/web/SISchemeController.java +++ b/src/com/engine/salary/web/SISchemeController.java @@ -21,6 +21,7 @@ import com.engine.salary.wrapper.SISchemeWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.jetbrains.annotations.NotNull; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -32,6 +33,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; import java.net.URLEncoder; import java.time.LocalDate; import java.util.Arrays; @@ -172,22 +174,7 @@ public class SISchemeController { @Path("/export") @Produces(MediaType.APPLICATION_OCTET_STREAM) public Response export(@Context HttpServletRequest request, @Context HttpServletResponse response) { - InsuranceArchivesListParam param = new InsuranceArchivesListParam(); - String ids = request.getParameter("ids"); - if(StringUtils.isNotBlank(ids)){ - param.setIds( Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList())); - } - - String runStatuses = request.getParameter("runStatuses"); - if(StringUtils.isNotBlank(runStatuses)){ - param.setRunStatuses( Arrays.stream(runStatuses.split(",")).map(String::valueOf).collect(Collectors.toList())); - } - - String statusesStr = request.getParameter("statusesStr"); - if (StringUtils.isNotBlank(statusesStr)) { - param.setStatuses(Arrays.stream(statusesStr.split(",")).map(String::new).collect(Collectors.toList())); - } - + InsuranceArchivesListParam param = buildInsuranceArchivesListParam(request); User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getService(user).export(param); String fileName ; @@ -304,6 +291,63 @@ public class SISchemeController { .header("Cache-Control", "no-cache").build(); } + @NotNull + private InsuranceArchivesListParam buildInsuranceArchivesListParam(HttpServletRequest request) { + InsuranceArchivesListParam param = new InsuranceArchivesListParam(); + + String ids = request.getParameter("ids"); + if(StringUtils.isNotBlank(ids)){ + param.setIds( Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList())); + } + + String runStatuses = request.getParameter("runStatuses"); + if(StringUtils.isNotBlank(runStatuses)){ + param.setRunStatuses( Arrays.stream(runStatuses.split(",")).map(String::valueOf).collect(Collectors.toList())); + } + + String statusesStr = request.getParameter("statusesStr"); + if (StringUtils.isNotBlank(statusesStr)) { + param.setStatuses(Arrays.stream(statusesStr.split(",")).map(String::new).collect(Collectors.toList())); + } + String userName = request.getParameter("username"); + if (StringUtils.isNotBlank(userName)) { + param.setUserName(userName); + } + String jobNum = request.getParameter("jobNum"); + if (StringUtils.isNotBlank(jobNum)) { + param.setJobNum(jobNum); + } + String taxAgentId = request.getParameter("taxAgentId"); + if (StringUtils.isNotBlank(taxAgentId)) { + param.setTaxAgentId(Long.parseLong(taxAgentId)); + } + String departmentIds = request.getParameter("departmentIdsStr"); + if (StringUtils.isNotBlank(departmentIds)) { + param.setDepartmentIds(Arrays.stream(departmentIds.split(",")).map(BigDecimal::new).collect(Collectors.toList())); + } + String subcompanyIds = request.getParameter("subcompanyIdsStr"); + if (StringUtils.isNotBlank(subcompanyIds)) { + param.setSubcompanyIds(Arrays.stream(subcompanyIds.split(",")).map(BigDecimal::new).collect(Collectors.toList())); + } + String positions = request.getParameter("positionsStr"); + if (StringUtils.isNotBlank(positions)) { + param.setPositions(Arrays.stream(positions.split(",")).map(BigDecimal::new).collect(Collectors.toList())); + } + String siSchemeId = request.getParameter("siSchemeId"); + if (StringUtils.isNotBlank(siSchemeId)) { + param.setSiSchemeId(Long.valueOf(siSchemeId)); + } + String fundSchemeId = request.getParameter("fundSchemeId"); + if (StringUtils.isNotBlank(fundSchemeId)) { + param.setFundSchemeId(Long.valueOf(fundSchemeId)); + } + String otherSchemeId = request.getParameter("otherSchemeId"); + if (StringUtils.isNotBlank(otherSchemeId)) { + param.setOtherSchemeId(Long.valueOf(otherSchemeId)); + } + return param; + } + } From 7d9ad3d79eb242cec33684d70aa014d8f2c0ef1b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 11 Jul 2023 10:14:28 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryArchiveServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index c92a45063..b6c786fc4 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -313,9 +313,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe throw new SalaryRunTimeException("薪资档案参数为空!"); } SalarySysConfPO canDelete = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_ARCHIVE_DELETE); -// if(Objects.isNull(canDelete) || StringUtils.equals(canDelete.getConfValue(),"0") ){ -// throw new SalaryRunTimeException("不允许删除薪资档案，请先开启删除档案规则配置！"); -// } + if(Objects.isNull(canDelete) || StringUtils.equals(canDelete.getConfValue(),"0") ){ + throw new SalaryRunTimeException("不允许删除薪资档案，请先开启删除档案规则配置！"); + } List salaryArchiveList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(salaryArchiveIds).build()); //查询当前登录人员管理的个税扣缴义务人 From 287fcae68e73cb8ec628522f89499b4b1c4d474c Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 11 Jul 2023 10:22:14 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=8F=91=E9=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202307100103.sql | 16 ++++++++++++++++ resource/sqlupgrade/JC/sql202307100103.sql | 16 ++++++++++++++++ resource/sqlupgrade/Mysql/sql202307100103.sql | 5 +++++ resource/sqlupgrade/Oracle/sql202307100103.sql | 15 +++++++++++++++ .../sqlupgrade/SQLServer/sql202307100103.sql | 6 ++++++ 5 files changed, 58 insertions(+) create mode 100644 resource/sqlupgrade/DM/sql202307100103.sql create mode 100644 resource/sqlupgrade/JC/sql202307100103.sql create mode 100644 resource/sqlupgrade/Mysql/sql202307100103.sql create mode 100644 resource/sqlupgrade/Oracle/sql202307100103.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202307100103.sql diff --git a/resource/sqlupgrade/DM/sql202307100103.sql b/resource/sqlupgrade/DM/sql202307100103.sql new file mode 100644 index 000000000..ffdfcf84f --- /dev/null +++ b/resource/sqlupgrade/DM/sql202307100103.sql @@ -0,0 +1,16 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL; +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL; +/ + diff --git a/resource/sqlupgrade/JC/sql202307100103.sql b/resource/sqlupgrade/JC/sql202307100103.sql new file mode 100644 index 000000000..ffdfcf84f --- /dev/null +++ b/resource/sqlupgrade/JC/sql202307100103.sql @@ -0,0 +1,16 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL; +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202307100103.sql b/resource/sqlupgrade/Mysql/sql202307100103.sql new file mode 100644 index 000000000..d283335e1 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202307100103.sql @@ -0,0 +1,5 @@ +ALTER TABLE hrsa_salary_template +ADD COLUMN auto_send_status int NULL, +ADD COLUMN auto_send_cycle_type int NULL, +ADD COLUMN auto_send_day_of_month varchar(200) NULL, +ADD COLUMN auto_send_time_of_day varchar(50) NULL; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202307100103.sql b/resource/sqlupgrade/Oracle/sql202307100103.sql new file mode 100644 index 000000000..73836e82e --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202307100103.sql @@ -0,0 +1,15 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL +/ \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202307100103.sql b/resource/sqlupgrade/SQLServer/sql202307100103.sql new file mode 100644 index 000000000..bd867842c --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202307100103.sql @@ -0,0 +1,6 @@ +ALTER TABLE hrsa_salary_template +ADD auto_send_status int NULL, +auto_send_cycle_type int NULL, +auto_send_day_of_month varchar(200) NULL, +auto_send_time_of_day varchar(50) NULL +GO \ No newline at end of file From bb6cf386cb499ff67cfc27d0b033d608b960d956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 11 Jul 2023 11:05:35 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/biz/SysSalaryItemBiz.java | 10 +++++ .../salaryitem/SysSalaryItemMapper.java | 4 +- .../mapper/salaryitem/SysSalaryItemMapper.xml | 7 ++++ .../service/impl/SalaryItemServiceImpl.java | 38 +++++++++---------- 4 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/com/engine/salary/biz/SysSalaryItemBiz.java b/src/com/engine/salary/biz/SysSalaryItemBiz.java index 4ff63dac4..19ed10802 100644 --- a/src/com/engine/salary/biz/SysSalaryItemBiz.java +++ b/src/com/engine/salary/biz/SysSalaryItemBiz.java @@ -38,4 +38,14 @@ public class SysSalaryItemBiz { sqlSession.close(); } } + + public SysSalaryItemPO selectOneByName(String name) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SysSalaryItemMapper mapper = sqlSession.getMapper(SysSalaryItemMapper.class); + return mapper.selectOneByName(name); + } finally { + sqlSession.close(); + } + } } diff --git a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.java b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.java index f210fe344..baf9716cb 100644 --- a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.java +++ b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.java @@ -1,7 +1,6 @@ package com.engine.salary.mapper.salaryitem; import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -62,5 +61,6 @@ public interface SysSalaryItemMapper { * @return 返回影响行数 */ int delete(SysSalaryItemPO SysSalaryItemPO); - + + SysSalaryItemPO selectOneByName(String name); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml index ed5027616..f8faf9c90 100644 --- a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml @@ -609,5 +609,12 @@ AND delete_type = 0 + + \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 248ab4b6b..3c78cef40 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -140,27 +140,27 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService .sorted(new Comparator() { @Override public int compare(SalaryItemPO o1, SalaryItemPO o2) { - if(o1 == null) + if (o1 == null) return 1; - if(o2 == null) + if (o2 == null) return -1; - if(o1 == null && o2 == null) + if (o1 == null && o2 == null) return 0; - if(o1.getSortedIndex() == null && o2.getSortedIndex() == null){ - Integer systemType1=o1.getSystemType(); - Integer systemType2=o2.getSystemType(); - if(systemType1 == null) - systemType1=0; - if(systemType2 == null) - systemType2=0; + if (o1.getSortedIndex() == null && o2.getSortedIndex() == null) { + Integer systemType1 = o1.getSystemType(); + Integer systemType2 = o2.getSystemType(); + if (systemType1 == null) + systemType1 = 0; + if (systemType2 == null) + systemType2 = 0; return systemType1.compareTo(systemType2); - }else{ - Integer sortedIndex1=o1.getSortedIndex(); - Integer sortedIndex2=o2.getSortedIndex(); - if(sortedIndex1 == null) - sortedIndex1=0; - if(sortedIndex2 == null) - sortedIndex2=0; + } else { + Integer sortedIndex1 = o1.getSortedIndex(); + Integer sortedIndex2 = o2.getSortedIndex(); + if (sortedIndex1 == null) + sortedIndex1 = 0; + if (sortedIndex2 == null) + sortedIndex2 = 0; return sortedIndex2.compareTo(sortedIndex1); } } @@ -203,8 +203,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98326, "薪资项目名称已存在，请重新命名")); } // 名称不能和已有的系统薪资项目重名 - List sysSalaryItemPOS = sysSalaryItemBiz.listSome(SysSalaryItemPO.builder().name(saveParam.getName()).build()); - if (CollectionUtils.isNotEmpty(sysSalaryItemPOS)) { + SysSalaryItemPO sysSalaryItem = sysSalaryItemBiz.selectOneByName(saveParam.getName()); + if (sysSalaryItem != null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98328, "自定义薪资项目的名称不能和系统薪资项目的名称重名")); } SalaryItemPO salaryItemPO = SalaryItemBO.convert2SalaryItemPO(saveParam, (long) user.getUID()); From 83604ba5342d005b35755317a8b170b333bc83a4 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 11 Jul 2023 11:10:32 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=8A=B6=E6=80=81=E5=80=BC=E8=BF=94=E5=9B=9E=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/siaccount/bo/InsuranceAccountBO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java index cc31abebf..8aa28ab09 100644 --- a/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java +++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java @@ -54,8 +54,8 @@ public class InsuranceAccountBO { .id(e.getId()) .accountant(e.getAccountant()) .billMonth(e.getBillMonth()) - .billStatus(queryLabelId(e.getBillStatus()).getDefaultLabel()) -// .billStatus(e.getBillStatus().toString()) +// .billStatus(queryLabelId(e.getBillStatus()).getDefaultLabel()) + .billStatus(e.getBillStatus().toString()) .fundNum(e.getFundNum()) .fundPay(SalaryEntityUtil.thousandthConvert(e.getFundPay())) .lastTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(e.getUpdateTime())) From ad37ba9af02451f6240a0611cf78e9036d30586d Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 11 Jul 2023 11:30:57 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=EF=BC=8C=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=B7=A5=E5=8F=B7=E3=80=81=E5=88=86?= =?UTF-8?q?=E9=83=A8=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/web/SalaryArchiveController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java index af9aad165..a367bd940 100644 --- a/src/com/engine/salary/web/SalaryArchiveController.java +++ b/src/com/engine/salary/web/SalaryArchiveController.java @@ -442,6 +442,10 @@ public class SalaryArchiveController { if (StringUtils.isNotBlank(username)) { param.setUsername(username); } + String workcode = request.getParameter("workcode"); + if (StringUtils.isNotBlank(workcode)) { + param.setWorkcode(workcode); + } String taxAgentId = request.getParameter("taxAgentId"); if (StringUtils.isNotBlank(taxAgentId)) { param.setTaxAgentId(Long.valueOf(taxAgentId)); @@ -450,6 +454,10 @@ public class SalaryArchiveController { if (StringUtils.isNotBlank(departmentIds)) { param.setDepartmentIds(Arrays.stream(departmentIds.split(",")).map(Long::valueOf).collect(Collectors.toList())); } + String subcompanyIds = request.getParameter("subcompanyIds"); + if (StringUtils.isNotBlank(subcompanyIds)) { + param.setSubcompanyIds(Arrays.stream(subcompanyIds.split(",")).map(Long::valueOf).collect(Collectors.toList())); + } String positionIds = request.getParameter("positionIds"); if (StringUtils.isNotBlank(positionIds)) { param.setPositionIds(Arrays.stream(positionIds.split(",")).map(Long::valueOf).collect(Collectors.toList())); From fa950fb4dd45d336ed80e303516ae2dfaaae03a1 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 11 Jul 2023 13:23:07 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=AF=94=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryItemServiceImpl.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index c2c89f31b..99b2730ab 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -140,27 +140,13 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService .sorted(new Comparator() { @Override public int compare(SalaryItemPO o1, SalaryItemPO o2) { - if(o1 == null) - return 1; - if(o2 == null) - return -1; - if(o1 == null && o2 == null) - return 0; if(o1.getSortedIndex() == null && o2.getSortedIndex() == null){ - Integer systemType1=o1.getSystemType(); - Integer systemType2=o2.getSystemType(); - if(systemType1 == null) - systemType1=0; - if(systemType2 == null) - systemType2=0; + Integer systemType1=o1.getSystemType() == null ? 0 : o1.getSystemType(); + Integer systemType2=o2.getSystemType() == null ? 0 : o2.getSystemType(); return systemType1.compareTo(systemType2); }else{ - Integer sortedIndex1=o1.getSortedIndex(); - Integer sortedIndex2=o2.getSortedIndex(); - if(sortedIndex1 == null) - sortedIndex1=0; - if(sortedIndex2 == null) - sortedIndex2=0; + Integer sortedIndex1=o1.getSortedIndex() == null ? 0 : o1.getSortedIndex(); + Integer sortedIndex2=o2.getSortedIndex() == null ? 0 : o2.getSortedIndex(); return sortedIndex2.compareTo(sortedIndex1); } }