diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java index 527b6b3b2..b8fab6c7c 100644 --- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java +++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java @@ -38,6 +38,17 @@ public class SalaryArchiveItemBiz { } } + public List getCurrentEffectiveItemList4Wdl(SalaryArchiveItemQueryParam build) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); + List salaryArchiveItemPOS = mapper.listByParam4Wdl(build); + return encryptUtil.decryptList(salaryArchiveItemPOS, SalaryArchiveItemPO.class); + } finally { + sqlSession.close(); + } + } + public List listByParam(SalaryArchiveItemQueryParam build) { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { diff --git a/src/com/engine/salary/entity/salaryarchive/dto/WdlGzhssjtj.java b/src/com/engine/salary/entity/salaryarchive/dto/WdlGzhssjtj.java new file mode 100644 index 000000000..1da334781 --- /dev/null +++ b/src/com/engine/salary/entity/salaryarchive/dto/WdlGzhssjtj.java @@ -0,0 +1,56 @@ +package com.engine.salary.entity.salaryarchive.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.Map; + +/** + * @author Harryxzy + * @ClassName WdlGzhssjtj + * @date 2025/06/10 15:15 + * @description 万德隆 工资核算数据统计 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WdlGzhssjtj { + + private Long mainId; + + private Long id; + + // 姓名 + private Long xm; + + // 变化日期 + private Date bhrq; + + // 变化日期止 + private Date bhrqz; + + // 计薪天数 + private String jxts; + + // 漏打卡 + private Integer ldk; + + // 迟到次数 + private Integer cdcs; + + // 严重迟到次数 + private Integer yzcdcs; + + // 早退次数 + private Integer ztcs; + + // 旷工次数 + private Integer kgcs; + + // 薪资档案需要赋值到流程的 + Map archiveItemValueMap; +} diff --git a/src/com/engine/salary/entity/salaryarchive/param/WdlGzsqydtjParam.java b/src/com/engine/salary/entity/salaryarchive/param/WdlGzsqydtjParam.java new file mode 100644 index 000000000..482fdb3c1 --- /dev/null +++ b/src/com/engine/salary/entity/salaryarchive/param/WdlGzsqydtjParam.java @@ -0,0 +1,27 @@ +package com.engine.salary.entity.salaryarchive.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @ClassName WdlGzsqydtjParam + * @author Harryxzy + * @date 2025/6/11 14:56 + * @description 万德隆 工资核算数据月度统计 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WdlGzsqydtjParam { + + // 薪资所属月 + private Date salaryMonth; + + // 主表id + private Long mainId; +} diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.java b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.java index f3105e794..95773cda5 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.java +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.java @@ -84,6 +84,7 @@ public interface SalaryArchiveItemMapper { List listByParam(@Param("param")SalaryArchiveItemQueryParam build); + List listByParam4Wdl(@Param("param")SalaryArchiveItemQueryParam build); List getIneffectiveSalaryItems(@Param("param") SalaryArchiveItemQueryParam build); diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml index d0830bad3..f43fb41de 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml @@ -974,6 +974,36 @@ ORDER BY t.effective_time DESC + +