diff --git a/src/com/engine/salary/entity/datacollection/po/AttendQuote.java b/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java similarity index 97% rename from src/com/engine/salary/entity/datacollection/po/AttendQuote.java rename to src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java index 52a69872a..a2c5fe267 100644 --- a/src/com/engine/salary/entity/datacollection/po/AttendQuote.java +++ b/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java @@ -14,7 +14,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -public class AttendQuote { +public class AttendQuotePO { /** * 主键 */ diff --git a/src/com/engine/salary/entity/datacollection/po/SalarySob.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java similarity index 78% rename from src/com/engine/salary/entity/datacollection/po/SalarySob.java rename to src/com/engine/salary/entity/salarysob/po/SalarySobPO.java index 54bd63a76..f7f8d7af8 100644 --- a/src/com/engine/salary/entity/datacollection/po/SalarySob.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java @@ -1,4 +1,4 @@ -package com.engine.salary.entity.datacollection.po; +package com.engine.salary.entity.salarysob.po; import lombok.AllArgsConstructor; import lombok.Builder; @@ -14,7 +14,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -public class SalarySob { +public class SalarySobPO { /** * 主键id */ @@ -26,35 +26,35 @@ public class SalarySob { /** * 应税项目。1:正常工资薪金所得 */ - private Byte incomeCategory; + private Integer incomeCategory; /** * 薪资周期。1:上上月、2:上月、3:本月、4:下月 */ - private Byte salaryCycleType; + private Integer salaryCycleType; /** * 薪资周期的起始日期 */ - private Byte salaryCycleFromDay; + private Integer salaryCycleFromDay; /** * 税款所属期。1:上上月、2:上月、3:本月、4:下月 */ - private Byte taxCycleType; + private Integer taxCycleType; /** * 考勤周期。1:上上月、2:上月、3:本月、4:下月 */ - private Byte attendCycleType; + private Integer attendCycleType; /** * 考勤周期的起始日期 */ - private Byte attendCycleFromDay; + private Integer attendCycleFromDay; /** * 社保福利所属期。1:上上月、2:上月、3:本月、4:下月 */ - private Byte socialSecurityCycleType; + private Integer socialSecurityCycleType; /** * 是否禁用。0:正常使用、1:禁用 */ - private Byte disable; + private Integer disable; /** * 描述 */ diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index fa597bb80..eff67c450 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -17,7 +17,7 @@ from hrmresource e where e.status not in (7) - AND d.id IN + AND t.id IN #{id}