From 686bd303ddc68db338fe352c38392194217168a5 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 11 三月 2025 15:27:59 +0800
Subject: [PATCH] 修改业务逻辑增加项目编码
---
expert-admin/src/main/java/com/gkhy/web/controller/bussiness/ProjectManagementController.java | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/expert-admin/src/main/java/com/gkhy/web/controller/bussiness/ProjectManagementController.java b/expert-admin/src/main/java/com/gkhy/web/controller/bussiness/ProjectManagementController.java
index bd5341e..3428cb3 100644
--- a/expert-admin/src/main/java/com/gkhy/web/controller/bussiness/ProjectManagementController.java
+++ b/expert-admin/src/main/java/com/gkhy/web/controller/bussiness/ProjectManagementController.java
@@ -16,7 +16,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -40,7 +39,7 @@
* 查询项目管理列表
*/
@ApiOperation(value = "查询项目管理列表(分页)")
- @PreAuthorize("@ss.hasPermi('system:management:list')")
+ //@PreAuthorize("@ss.hasPermi('system:management:list')")
@GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
@@ -57,7 +56,7 @@
/**
* 获取项目管理详细信息
*/
- @PreAuthorize("@ss.hasPermi('system:management:query')")
+ // @PreAuthorize("@ss.hasPermi('system:management:query')")
@GetMapping(value = "/{id}")
@ApiOperation(value = "获取项目管理详细信息")
@ApiImplicitParams({
@@ -71,7 +70,7 @@
/**
* 新增项目管理
*/
- @PreAuthorize("@ss.hasPermi('system:management:add')")
+ // @PreAuthorize("@ss.hasPermi('system:management:add')")
@ApiOperation(value = "新增编辑项目管理")
@PostMapping("/saveProject")
@RepeatSubmit
@@ -83,7 +82,7 @@
/**
* 修改项目管理
*/
- @PreAuthorize("@ss.hasPermi('system:management:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:management:edit')")
@ApiOperation(value = "项目专家选取保存-修改")
@PostMapping("/projectExpert")
@RepeatSubmit
@@ -93,7 +92,7 @@
return R.ok();
}
- @PreAuthorize("@ss.hasPermi('system:management:info')")
+ //@PreAuthorize("@ss.hasPermi('system:management:info')")
@ApiOperation(value = "获取项目专家审批用(获取项目信息和专家数据)")
@GetMapping("/projectExpertCheckInfo")
@ApiImplicitParams({
@@ -104,7 +103,7 @@
return R.ok(projectManagementService.projectExpertCheckInfo(id));
}
- @PreAuthorize("@ss.hasPermi('system:management:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:management:edit')")
@ApiOperation(value = "项目专家审批")
@PostMapping("/projectCheck")
@RepeatSubmit
@@ -114,7 +113,7 @@
return R.ok();
}
- @PreAuthorize("@ss.hasPermi('system:management:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:management:edit')")
@ApiOperation(value = "项目归档")
@PostMapping("/projectArchive")
@RepeatSubmit
@@ -127,7 +126,7 @@
/**
* 删除项目管理
*/
- @PreAuthorize("@ss.hasPermi('system:management:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:management:remove')")
@DeleteMapping("/{ids}")
@ApiOperation(value = "删除项目管理")
@RepeatSubmit
@@ -141,7 +140,7 @@
* 事后考评列表
*/
@ApiOperation(value = "事后考评——事后考评(分页)")
- @PreAuthorize("@ss.hasPermi('system:management:list')")
+ //@PreAuthorize("@ss.hasPermi('system:management:list')")
@GetMapping("/projectExpertList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
@@ -155,7 +154,7 @@
}
@ApiOperation(value = "事后考评——项目专家考评列表(分页)")
- @PreAuthorize("@ss.hasPermi('system:management:list')")
+ //@PreAuthorize("@ss.hasPermi('system:management:list')")
@GetMapping("/projectExpertEvaluationList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
@@ -169,7 +168,7 @@
return getDataTable(projectExpertEvaluationResps);
}
- @PreAuthorize("@ss.hasPermi('system:management:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:management:edit')")
@ApiOperation(value = "事后考评——项目专家考评")
@PostMapping("/ProjectExpertDetailSave")
@RepeatSubmit
@@ -180,7 +179,7 @@
}
@ApiOperation(value = "专家考评记录——专家考评记录列表(分页)")
- @PreAuthorize("@ss.hasPermi('system:management:list')")
+ //@PreAuthorize("@ss.hasPermi('system:management:list')")
@GetMapping("/projectExpertEvaList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
@@ -194,7 +193,7 @@
}
@ApiOperation(value = "专家考评记录——专家考评记明细")
- @PreAuthorize("@ss.hasPermi('system:management:list')")
+ //@PreAuthorize("@ss.hasPermi('system:management:list')")
@GetMapping("/selectProjectExpertDetailList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "projectExpertId", dataType = "long", required = true, value = "项目专家id")
@@ -203,6 +202,18 @@
{
return R.ok(projectManagementService.selectProjectExpertDetailList(projectExpertId));
}
+
+ @ApiOperation(value = "专家考评记录——专家考评详情")
+ //@PreAuthorize("@ss.hasPermi('system:management:list')")
+ @GetMapping("/selectProjectExpertDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "projectExpertId", dataType = "long", required = true, value = "项目专家id")
+ })
+ public R<ProjectDetailResp> selectProjectExpertDetail(@RequestParam("projectExpertId") Long projectExpertId)
+ {
+ return R.ok(projectManagementService.selectProjectExpertDetail(projectExpertId));
+ }
+
@GetMapping("/selectProjectFileList")
@ApiImplicitParams({
@@ -220,4 +231,15 @@
return R.ok(projectManagementService.getProjectNum());
}
+ @ApiOperation(value = "项目管理----导出专家报销")
+ //@PreAuthorize("@ss.hasPermi('system:management:list')")
+ @GetMapping("/projectExpertExportList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "projectId", dataType = "long", required = true, value = "项目id")
+ })
+ public R<List<ProjectExpertExportInfoRes>> projectExpertExportList(@RequestParam("projectId") Long projectId)
+ {
+ return R.ok(projectManagementService.projectExpertExportList(projectId));
+ }
+
}
--
Gitblit v1.9.2