|
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
import com.google.common.collect.Lists; |
|
|
import com.google.common.collect.Lists; |
|
|
import com.google.common.collect.Maps; |
|
|
import com.google.common.collect.Maps; |
|
|
import com.hz.pm.api.common.helper.UserInfoHelper; |
|
|
import com.hz.pm.api.common.helper.UserInfoHelper; |
|
|
|
|
|
import com.hz.pm.api.common.model.constant.ExistsSqlConst; |
|
|
import com.hz.pm.api.common.util.BizUtils; |
|
|
import com.hz.pm.api.common.util.BizUtils; |
|
|
import com.hz.pm.api.datascope.model.DataScopeDTO; |
|
|
import com.hz.pm.api.datascope.model.DataScopeDTO; |
|
|
import com.hz.pm.api.datascope.utils.DataScopeUtil; |
|
|
import com.hz.pm.api.datascope.utils.DataScopeUtil; |
|
@@ -19,6 +20,7 @@ import com.hz.pm.api.projectdeclared.model.vo.XcfhxApplyListVO; |
|
|
import com.hz.pm.api.projectdeclared.service.IContractService; |
|
|
import com.hz.pm.api.projectdeclared.service.IContractService; |
|
|
import com.hz.pm.api.projectdeclared.service.IPurchaseService; |
|
|
import com.hz.pm.api.projectdeclared.service.IPurchaseService; |
|
|
import com.hz.pm.api.projectlib.model.entity.Project; |
|
|
import com.hz.pm.api.projectlib.model.entity.Project; |
|
|
|
|
|
import com.hz.pm.api.projectlib.model.enumeration.status.ProjectStatus; |
|
|
import com.hz.pm.api.projectlib.model.enumeration.status.TenderXcfhxApplyStatus; |
|
|
import com.hz.pm.api.projectlib.model.enumeration.status.TenderXcfhxApplyStatus; |
|
|
import com.hz.pm.api.projectlib.service.IProjectService; |
|
|
import com.hz.pm.api.projectlib.service.IProjectService; |
|
|
import com.hz.pm.api.user.helper.MhUnitCache; |
|
|
import com.hz.pm.api.user.helper.MhUnitCache; |
|
@@ -63,6 +65,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> |
|
|
.ge(req.getCreateOnMin() != null, Purchase::getCreateOn, req.getCreateOnMin()) |
|
|
.ge(req.getCreateOnMin() != null, Purchase::getCreateOn, req.getCreateOnMin()) |
|
|
.eq(req.getStatus() != null, Purchase::getXcfhxApplyStatus, req.getStatus()) |
|
|
.eq(req.getStatus() != null, Purchase::getXcfhxApplyStatus, req.getStatus()) |
|
|
.eq(req.getSourceType() != null, Purchase::getSourceType, req.getSourceType()) |
|
|
.eq(req.getSourceType() != null, Purchase::getSourceType, req.getSourceType()) |
|
|
|
|
|
.notExists(ExistsSqlConst.PURCHASE_EXISTS_PROJECT |
|
|
|
|
|
+ " np.stage = {0}", ProjectStatus.STOPPED.getCode()) |
|
|
.orderByDesc(Purchase::getCreateOn); |
|
|
.orderByDesc(Purchase::getCreateOn); |
|
|
|
|
|
|
|
|
if (Boolean.TRUE.equals(req.getFinished())) { |
|
|
if (Boolean.TRUE.equals(req.getFinished())) { |
|
|