瀏覽代碼

feat:

1. 信创测评列表不展示非建设类标项;
tags/24122501
WendyYang 3 週之前
父節點
當前提交
3f6314ec17
共有 2 個檔案被更改,包括 5 行新增4 行删除
  1. +1
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java
  2. +4
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java

+ 1
- 2
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);
}



+ 4
- 2
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<PurchaseMapper, Purchase>
.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())) {


Loading…
取消
儲存