diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java index 7ea807f..d96d523 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java @@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.io.UnsupportedEncodingException; import java.util.List; /** @@ -170,7 +169,7 @@ public class PurchaseController { @GetMapping("/exportXcfhFile/{code}") @ApiOperation("直接导出信创文件") - public void exportXcfhFile(@PathVariable String code, HttpServletResponse response) throws UnsupportedEncodingException { + public void exportXcfhFile(@PathVariable String code, HttpServletResponse response) { purchaseManage.exportXcfhFile(code, response); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java index 3c70f61..711d600 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java @@ -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.model.entity.Contract; 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.vo.XcfhxApplyListVO; import com.hz.pm.api.projectdeclared.service.IContractService; @@ -65,8 +66,9 @@ public class PurchaseServiceImpl extends ServiceImpl .ge(req.getCreateOnMin() != null, Purchase::getCreateOn, req.getCreateOnMin()) .eq(req.getStatus() != null, Purchase::getXcfhxApplyStatus, req.getStatus()) .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); if (Boolean.TRUE.equals(req.getFinished())) {