diff --git a/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java b/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java index c9df6d20e..112c86034 100644 --- a/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java +++ b/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java @@ -5,21 +5,22 @@ import com.engine.salary.enums.BaseEnum; import java.util.Arrays; /** - * @ClassName BillReadStatusEnum + * @ClassName BillConfimStatusEnum * @author Harryxzy - * @date 2023/7/10 17:13 + * @date 2023/7/10 17:03 * @description 工资单确认 */ public enum BillConfimStatusEnum implements BaseEnum { UNCONFIRMED(0, "未确认", 93286), - CONFIRMED(1, "已确认", 93212); + CONFIRMED(1, "已确认", 93212), + AUTOCONFIRMED(3, "自动确认", 93212); - private int value; + private final int value; - private String defaultLabel; + private final String defaultLabel; - private int labelId; + private final int labelId; BillConfimStatusEnum(int value, String defaultLabel, int labelId) { this.value = value; @@ -48,7 +49,7 @@ public enum BillConfimStatusEnum implements BaseEnum { } BillConfimStatusEnum[] enumAry = BillConfimStatusEnum.values(); for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { + if (enumAry[i].getValue().equals(value)) { return enumAry[i].getDefaultLabel(); } } @@ -61,7 +62,7 @@ public enum BillConfimStatusEnum implements BaseEnum { } BillConfimStatusEnum[] enumAry = BillConfimStatusEnum.values(); for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { + if (enumAry[i].getValue().equals(value)) { return enumAry[i].name(); } } diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.java b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.java index 140c47376..93f184d84 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.java +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.java @@ -101,4 +101,10 @@ public interface SalarySendInfoMapper { void deleteBySalaryAcctRecordIds(@Param("salaryAcctRecordId") Collection ids); List getNeedSendInfoList(@Param("salarySendIds") List salarySendIds); + + /** + * 自动确认工资单 + * @param needAutoIds + */ + void autoConfirmSalaryBill(@Param("ids") List needAutoIds); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index 0ef304bee..c3f5e23bd 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -687,6 +687,12 @@ AND tenant_key = #{tenantKey} + + AND bill_confirm_status = #{billConfirmStatus} + + + AND bill_read_status = #{billReadStatus} + ORDER BY id DESC