Skip to content

Y
yifu-mvp
Commit 62a4368a authored by hongguangwu's avatar hongguangwu
Browse files
Options

MVP1.5.1-收入证明等

parent c1de8685
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SalaryProveController.java
View file @ 62a4368a
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.service.*; import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.archives.utils.NumberToCN; import com.yifu.cloud.plus.v1.yifu.archives.utils.NumberToCN;
...@@ -164,6 +165,8 @@ public class SalaryProveController { ...@@ -164,6 +165,8 @@ public class SalaryProveController {
.eq(TEmployeeContractInfo::getEmpId, em.getEmpId()) .eq(TEmployeeContractInfo::getEmpId, em.getEmpId())
.eq(TEmployeeContractInfo::getSettleDomain, em.getDeptId()) .eq(TEmployeeContractInfo::getSettleDomain, em.getDeptId())
.eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING) .eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING)
.ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[0])
.ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[6])
.isNotNull(TEmployeeContractInfo::getAuditTimeLast) .isNotNull(TEmployeeContractInfo::getAuditTimeLast)
.orderByDesc(TEmployeeContractInfo::getContractStart)); .orderByDesc(TEmployeeContractInfo::getContractStart));
if (Common.isNotNull(contractList)) { if (Common.isNotNull(contractList)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment