|
@@ -15,6 +15,7 @@ import com.hz.pm.api.datascope.utils.DataScopeUtil; |
|
|
import com.hz.pm.api.projectdeclared.mapper.PurchaseMapper; |
|
|
import com.hz.pm.api.projectdeclared.mapper.PurchaseMapper; |
|
|
import com.hz.pm.api.projectdeclared.model.entity.Contract; |
|
|
import com.hz.pm.api.projectdeclared.model.entity.Contract; |
|
|
import com.hz.pm.api.projectdeclared.model.entity.Purchase; |
|
|
import com.hz.pm.api.projectdeclared.model.entity.Purchase; |
|
|
|
|
|
import com.hz.pm.api.projectdeclared.model.enumerization.BidTypeEnum; |
|
|
import com.hz.pm.api.projectdeclared.model.req.XcfhxListReq; |
|
|
import com.hz.pm.api.projectdeclared.model.req.XcfhxListReq; |
|
|
import com.hz.pm.api.projectdeclared.model.vo.XcfhxApplyListVO; |
|
|
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; |
|
@@ -65,8 +66,9 @@ 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 |
|
|
|
|
|
+ " and np.stage = {0}", ProjectStatus.STOPPED.getCode()) |
|
|
|
|
|
|
|
|
.eq(Purchase::getBidType, BidTypeEnum.BUILD_APP.getCode()) |
|
|
|
|
|
.notExists(ExistsSqlConst.PURCHASE_EXISTS_PROJECT + " and np.stage in ({0},{1})", |
|
|
|
|
|
ProjectStatus.STOPPED.getCode(), ProjectStatus.CHANGE.getCode()) |
|
|
.orderByDesc(Purchase::getCreateOn); |
|
|
.orderByDesc(Purchase::getCreateOn); |
|
|
|
|
|
|
|
|
if (Boolean.TRUE.equals(req.getFinished())) { |
|
|
if (Boolean.TRUE.equals(req.getFinished())) { |
|
|