From 4a15c5614ba5561600250577ca78c241c8a5d322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 11 Mar 2022 13:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{AttendQuote.java => AttendQuotePO.java}  |  2 +-
 .../po/SalarySobPO.java}                      | 20 +++++++++----------
 .../mapper/datacollection/EmployMapper.xml    |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename src/com/engine/salary/entity/datacollection/po/{AttendQuote.java => AttendQuotePO.java} (97%)
 rename src/com/engine/salary/entity/{datacollection/po/SalarySob.java => salarysob/po/SalarySobPO.java} (78%)

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)
         <if test="collection != null and collection.size()>0">
-            AND d.id IN
+            AND t.id IN
             <foreach collection="collection" open="(" item="id" separator="," close=")">
                 #{id}
             </foreach>