From b27d06b8f0b805efd16e28fd80a57a0ed8a053ce Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:31:31 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java
index 9e7d246..239a2e2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java
@@ -17,6 +17,9 @@
import com.zt.life.modules.contractReview.service.ContractReviewService;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderService;
+import com.zt.life.modules.project.service.ProjectService;
+import com.zt.life.sys.dto.OssDto;
+import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -47,7 +50,13 @@
private ContractReviewService contractReviewService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -56,10 +65,9 @@
@ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "reviewPhase", value = "璇勫闃舵", dataType = Constant.QT.STRING, format = "a.review_phase^EQ"),
- @ApiImplicitParam(name = "softwareName", value = "鐗╁搧鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^EQ"),
- @ApiImplicitParam(name = "softwareIdentity", value = "鐗╁搧缂栧彿", dataType = Constant.QT.STRING, format = "p.software_identity^EQ")
- })
+ @ApiImplicitParam(name = "reviewType", value = "璇勫闃舵", dataType = Constant.QT.STRING, format = "a.review_type^EQ"),
+ @ApiImplicitParam(name = "orderCode", value = "濮旀墭鍗曠紪鍙�", dataType = Constant.QT.STRING, format = "s.code^EQ"),
+ })
public PageResult<ContractReview> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
return PageResult.ok(contractReviewService.page(queryFilter));
}
@@ -68,6 +76,12 @@
@ApiOperation("淇℃伅")
public Result<ContractReviewDto> getDto(Long projectId, Long reviewId) {
ContractReviewDto data = contractReviewService.getDto(projectId, reviewId);
+ if (reviewId!=null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(reviewId, "contract_review");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@@ -104,15 +118,16 @@
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
contractReviewService.delete(ids);
+ projectService.deleteItem(ids,"contract_review_item","review_id");
return Result.ok();
}
-/* @GetMapping("exportReview")
+ @GetMapping("exportReview")
@ApiOperation("鎵撳嵃鍚堝悓璇勫鍗�")
@LogOperation("鎵撳嵃鍚堝悓璇勫鍗�")
public void exportReview(Long id, HttpServletRequest request, HttpServletResponse response) {
contractReviewService.exportReview(id, request, response);
- }*/
+ }
}
--
Gitblit v1.9.1