From fb03cf98a739b4f9360e72b9fffc32223481d45f Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 31 May 2023 11:49:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F=EF=BC=8C?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E3=80=81=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E3=80=81=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8F=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/param/SalaryAcctEmployeeQueryParam.java | 2 ++ .../salaryacct/param/SalaryAcctResultQueryParam.java | 2 ++ .../salaryarchive/param/SalaryArchiveQueryParam.java | 1 + .../siaccount/param/InsuranceAccountDetailParam.java | 2 ++ .../engine/salary/mapper/archive/SalaryArchiveMapper.xml | 9 +++++++++ .../mapper/salaryacct/SalaryAcctEmployeeMapper.xml | 9 +++++++++ .../mapper/siaccount/InsuranceAccountDetailMapper.xml | 9 +++++++++ .../salary/service/impl/ColumnBuildServiceImpl.java | 1 + .../salary/service/impl/RecordsBuildServiceImpl.java | 1 + 9 files changed, 36 insertions(+) diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java index f3832a537..8320ff6bf 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java @@ -56,4 +56,6 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam { //薪资核算人员列表主键id") private Collection ids; + + private String workcode; } diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java index dd49ccb6c..21221a4b3 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java @@ -55,4 +55,6 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam { //列表主键id private Collection ids; + + private String workcode; } diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index 80f8d6368..c975e8283 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -80,4 +80,5 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { //列表类型：PENDING:待定薪;FIXED:发薪;SUSPEND:待停薪;STOP:停薪" private SalaryArchiveListTypeEnum listType; + private String workcode; } diff --git a/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java b/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java index 747f6455b..2492513cd 100644 --- a/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java +++ b/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java @@ -40,4 +40,6 @@ public class InsuranceAccountDetailParam extends BaseQueryParam { * 核算创建人 */ private Long creator; + + private String workcode; } diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 4a9208e7a..35524924f 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -126,6 +126,9 @@ AND e.lastname like CONCAT('%',#{param.username},'%') + + AND e.workcode like CONCAT('%',#{param.workcode},'%') + AND c.id IN @@ -200,6 +203,9 @@ AND e.lastname like '%'||#{param.username}||'%' + + AND e.workcode like '%'||#{param.workcode}||'%' + AND c.id IN @@ -273,6 +279,9 @@ AND e.lastname like '%'+#{param.username}+'%' + + AND e.workcode like '%'+#{param.workcode}+'%' + AND c.id IN diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index 19febf3b5..cc1ad66c2 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -496,6 +496,9 @@ AND em.lastname LIKE CONCAT('%',#{param.employeeName},'%') + + AND em.workcode like CONCAT('%',#{param.workcode},'%') + -- 分部 AND em.subcompanyid1 IN @@ -576,6 +579,9 @@ AND em.lastname LIKE '%'||#{param.employeeName}||'%' + + AND em.workcode like '%'||#{param.workcode}||'%' + AND em.departmentid IN @@ -648,6 +654,9 @@ AND em.lastname LIKE '%'+#{param.employeeName}+'%' + + AND em.workcode like '%'+#{param.workcode}+'%' + AND em.departmentid IN diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 6ec6e1bb1..7b3378480 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -173,6 +173,9 @@ e.lastname like CONCAT('%',#{param.userName},'%') ) + + AND e.workcode like CONCAT('%',#{param.workcode},'%') + AND t.employee_id IN @@ -199,6 +202,9 @@ e.lastname like '%'||#{param.userName}||'%' ) + + AND e.workcode like '%'||#{param.workcode}||'%' + AND t.employee_id IN @@ -225,6 +231,9 @@ e.lastname like '%'+#{param.userName}+'%' ) + + AND e.workcode like '%'+#{param.workcode}+'%' + AND t.employee_id IN diff --git a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java index 5e868d42b..34a3d99f6 100644 --- a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java @@ -53,6 +53,7 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 86185, "部门"), "department")); list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 86186, "手机号"), "mobile")); list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 86187, "员工状态"), "employeeStatus")); + list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 1933, "工号"), "workcode")); list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 100377, "数据来源"), "sourceFrom")); if (paymentStatus.equals(PaymentStatusEnum.REPAIR.getValue())) { list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 100379, "补缴月份"), "supplementaryMonth")); diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index bdea7d744..c8d71f2bd 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -83,6 +83,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ record.put("mobile", simpleEmployee.getMobile()); record.put("employeeStatus", simpleEmployee.getStatus() != null ? UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(simpleEmployee.getStatus())) : ""); ResourceFromEnum from = SalaryEnumUtil.enumMatchByValue(item.getResourceFrom(), ResourceFromEnum.values(), ResourceFromEnum.class); + record.put("workcode", StringUtils.isBlank(simpleEmployee.getWorkcode()) ? "" : simpleEmployee.getWorkcode()); record.put("sourceFrom", SalaryI18nUtil.getI18nLabel(from.getLabelId(), from.getDefaultLabel())); record.put("socialPayOrg", paymentMap.get(item.getSocialPayOrg()) == null ? "" : paymentMap.get(item.getSocialPayOrg()).getName()); record.put("socialAccount", item.getSocialAccount());