bug修复
This commit is contained in:
@@ -2,10 +2,17 @@ package com.ccag.controller;
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ccag.common.SdmResponse;
|
||||
import com.ccag.common.api.vo.Result;
|
||||
import com.ccag.config.shiro.IgnoreAuth;
|
||||
import com.ccag.entity.bo.task.ProjectUserLoadcasePlanInfo;
|
||||
import com.ccag.entity.bo.task.UserTaskIsFinishedCountInfo;
|
||||
import com.ccag.entity.pojo.project.Material;
|
||||
import com.ccag.entity.pojo.project.ProjectFile;
|
||||
import com.ccag.entity.pojo.project.ProjectPhaseBean;
|
||||
import com.ccag.entity.pojo.project.ProjectPlanRecord;
|
||||
import com.ccag.entity.req.system.QueryByProjectIdAndNodeReq;
|
||||
import com.ccag.entity.req.task.*;
|
||||
import com.ccag.performance.entity.PerfDevelopPlanDetailEntity;
|
||||
import com.ccag.service.ProjectService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -13,6 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@RestController
|
||||
@Tag(name = "项目相关接口")
|
||||
@@ -30,7 +40,7 @@ public class ProjectController {
|
||||
*/
|
||||
// @IgnoreAuth
|
||||
@PostMapping("/addProjectPhase")
|
||||
public SdmResponse addProjectPhase(@RequestBody @Validated AddProjectPhaseReq req) {
|
||||
public SdmResponse<Void> addProjectPhase(@RequestBody @Validated AddProjectPhaseReq req) {
|
||||
return projectService.addProjectPhase(req);
|
||||
}
|
||||
|
||||
@@ -41,7 +51,7 @@ public class ProjectController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/delProjectPhase")
|
||||
public SdmResponse delProjectPhase(@RequestBody @Validated DelProjectPhaseReq req) {
|
||||
public SdmResponse<Void> delProjectPhase(@RequestBody @Validated DelProjectPhaseReq req) {
|
||||
return projectService.delProjectPhase(req);
|
||||
}
|
||||
|
||||
@@ -53,7 +63,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "删除项目")
|
||||
@PostMapping("/delProject")
|
||||
public SdmResponse delProject(@RequestBody @Validated DelProjectReq req) {
|
||||
public SdmResponse<Void> delProject(@RequestBody @Validated DelProjectReq req) {
|
||||
return projectService.delProject(req);
|
||||
}
|
||||
|
||||
@@ -65,7 +75,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目loadcase详细信息")
|
||||
@PostMapping("/queryProjectLoadcaseDetail")
|
||||
public SdmResponse queryProjectLoadcaseDetail(@RequestBody @Validated QueryProjectLoadcaseDetailReq req) {
|
||||
public SdmResponse<JSONObject> queryProjectLoadcaseDetail(@RequestBody @Validated QueryProjectLoadcaseDetailReq req) {
|
||||
return projectService.queryProjectLoadcaseDetail(req);
|
||||
}
|
||||
|
||||
@@ -77,7 +87,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "更新项目阶段信息")
|
||||
@PostMapping("/updateProjectPhase")
|
||||
public SdmResponse updateProjectPhase(@RequestBody @Validated UpdateProjectPhaseReq req) {
|
||||
public SdmResponse<Void> updateProjectPhase(@RequestBody @Validated UpdateProjectPhaseReq req) {
|
||||
return projectService.updateProjectPhase(req);
|
||||
}
|
||||
|
||||
@@ -87,7 +97,7 @@ public class ProjectController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/executePython")
|
||||
public SdmResponse executePython(@RequestBody @Validated ExecutePythonReq req) {
|
||||
public SdmResponse<List<String>> executePython(@RequestBody @Validated ExecutePythonReq req) {
|
||||
return projectService.executePython(req);
|
||||
}
|
||||
|
||||
@@ -97,7 +107,7 @@ public class ProjectController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getUserTaskCountIsFinished")
|
||||
public SdmResponse getUserTaskCountIsFinished(@RequestBody @Validated GetUserTaskCountIsFinishedReq req) {
|
||||
public SdmResponse<List<UserTaskIsFinishedCountInfo>> getUserTaskCountIsFinished(@RequestBody @Validated GetUserTaskCountIsFinishedReq req) {
|
||||
return projectService.getUserTaskCountIsFinished(req);
|
||||
}
|
||||
|
||||
@@ -108,7 +118,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取进行中项目完成未完成的分析项数量")
|
||||
@PostMapping("/getTaskCountIsFinished")
|
||||
public SdmResponse getTaskCountIsFinished(@RequestBody @Validated GetTaskCountIsFinishedReq req) {
|
||||
public SdmResponse<JSONObject> getTaskCountIsFinished(@RequestBody @Validated GetTaskCountIsFinishedReq req) {
|
||||
return projectService.getTaskCountIsFinished(req);
|
||||
}
|
||||
|
||||
@@ -119,7 +129,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取进行中项目完成未完成的指标数量")
|
||||
@PostMapping("/getPerformanceCountIsFinished")
|
||||
public SdmResponse getPerformanceCountIsFinished(@RequestBody @Validated GetTaskCountIsFinishedReq req) {
|
||||
public SdmResponse<JSONObject> getPerformanceCountIsFinished(@RequestBody @Validated GetTaskCountIsFinishedReq req) {
|
||||
return projectService.getPerformanceCountIsFinished(req);
|
||||
}
|
||||
|
||||
@@ -130,7 +140,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取所有项目完成未完成的分析项数量")
|
||||
@GetMapping("/getAllTaskCountIsFinished")
|
||||
public SdmResponse getAllTaskCountIsFinished() {
|
||||
public SdmResponse<JSONObject> getAllTaskCountIsFinished() {
|
||||
return projectService.getAllTaskCountIsFinished();
|
||||
}
|
||||
|
||||
@@ -141,7 +151,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目指标进展情况")
|
||||
@PostMapping("/getProjectPerformanceProcess")
|
||||
public SdmResponse getProjectPerformanceProcess(@RequestBody @Validated GetProjectPerformanceProcessReq req) {
|
||||
public SdmResponse<Map<String, JSONObject>> getProjectPerformanceProcess(@RequestBody @Validated GetProjectPerformanceProcessReq req) {
|
||||
return projectService.getProjectPerformanceProcess(req);
|
||||
}
|
||||
|
||||
@@ -152,7 +162,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目指标达成情况")
|
||||
@PostMapping("/getProjectPerformanceStatus")
|
||||
public SdmResponse getProjectPerformanceStatus(@RequestBody @Validated GetProjectPerformanceProcessReq req) {
|
||||
public SdmResponse<Map<String, JSONObject>> getProjectPerformanceStatus(@RequestBody @Validated GetProjectPerformanceProcessReq req) {
|
||||
return projectService.getProjectPerformanceStatus(req);
|
||||
}
|
||||
|
||||
@@ -163,7 +173,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "根据月或周获取新增和完成任务数量")
|
||||
@PostMapping("/getProjectLoadcaseByTime")
|
||||
public SdmResponse getProjectLoadcaseByTime(@RequestBody @Validated GetProjectLoadcaseByTimeReq req) {
|
||||
public SdmResponse<List<JSONObject>> getProjectLoadcaseByTime(@RequestBody @Validated GetProjectLoadcaseByTimeReq req) {
|
||||
return projectService.getProjectLoadcaseByTime(req);
|
||||
}
|
||||
|
||||
@@ -174,7 +184,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取分析项列表")
|
||||
@PostMapping("/getProjectLoadcaseList")
|
||||
public SdmResponse getProjectLoadcaseList(@RequestBody @Validated GetProjectLoadcaseListReq req) {
|
||||
public SdmResponse<JSONObject> getProjectLoadcaseList(@RequestBody @Validated GetProjectLoadcaseListReq req) {
|
||||
return projectService.getProjectLoadcaseList(req);
|
||||
}
|
||||
|
||||
@@ -185,7 +195,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取用户任务完成统计")
|
||||
@PostMapping("/getProjectUserLoadcaseExeStatus")
|
||||
public SdmResponse getProjectUserLoadcaseExeStatus(@RequestBody @Validated GetUserLoadcaseExeStatusReq req) {
|
||||
public SdmResponse<List<JSONObject>> getProjectUserLoadcaseExeStatus(@RequestBody @Validated GetUserLoadcaseExeStatusReq req) {
|
||||
return projectService.getProjectUserLoadcaseExeStatus(req);
|
||||
}
|
||||
|
||||
@@ -196,7 +206,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取用户任务达成统计")
|
||||
@PostMapping("/getProjectUserLoadcaseStatus")
|
||||
public SdmResponse getProjectUserLoadcaseStatus(@RequestBody @Validated GetUserLoadcaseExeStatusReq req) {
|
||||
public SdmResponse<List<JSONObject>> getProjectUserLoadcaseStatus(@RequestBody @Validated GetUserLoadcaseExeStatusReq req) {
|
||||
return projectService.getProjectUserLoadcaseStatus(req);
|
||||
}
|
||||
|
||||
@@ -207,7 +217,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "查询人员工作安排")
|
||||
@PostMapping("/getProjectUserLoadcasePlan")
|
||||
public SdmResponse getProjectUserLoadcasePlan(@RequestBody @Validated GetUserLoadcasePlanReq req) {
|
||||
public SdmResponse<List<ProjectUserLoadcasePlanInfo>>getProjectUserLoadcasePlan(@RequestBody @Validated GetUserLoadcasePlanReq req) {
|
||||
return projectService.getProjectUserLoadcasePlan(req);
|
||||
}
|
||||
|
||||
@@ -217,7 +227,7 @@ public class ProjectController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/updateLoadcaseNoticeStatus")
|
||||
public SdmResponse updateLoadcaseNoticeStatus(@RequestBody @Validated UpdateLoadcaseNoticeStatusReq req) {
|
||||
public SdmResponse<Void> updateLoadcaseNoticeStatus(@RequestBody @Validated UpdateLoadcaseNoticeStatusReq req) {
|
||||
return projectService.updateLoadcaseNoticeStatus(req);
|
||||
}
|
||||
|
||||
@@ -228,7 +238,7 @@ public class ProjectController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getProjectRemainLoadcaseCount")
|
||||
public SdmResponse getProjectRemainLoadcaseCount(@RequestBody @Validated GetProjectRemainLoadcaseCountReq req) {
|
||||
public SdmResponse<List<JSONObject>> getProjectRemainLoadcaseCount(@RequestBody @Validated GetProjectRemainLoadcaseCountReq req) {
|
||||
return projectService.getProjectRemainLoadcaseCount(req);
|
||||
}
|
||||
|
||||
@@ -239,7 +249,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取指定分析项下的指标列表")
|
||||
@PostMapping("/getLoadcasePerformance")
|
||||
public SdmResponse getLoadcasePerformance(@RequestBody @Validated GetLoadcasePerformanceReq req) {
|
||||
public SdmResponse<JSONObject> getLoadcasePerformance(@RequestBody @Validated GetLoadcasePerformanceReq req) {
|
||||
return projectService.getLoadcasePerformance(req);
|
||||
}
|
||||
|
||||
@@ -250,7 +260,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "批量获取分析项下的指标列表")
|
||||
@PostMapping("/getLoadcasePerformanceBatch")
|
||||
public SdmResponse getLoadcasePerformanceBatch(@RequestBody @Validated GetLoadcasePerformanceBatchReq req) {
|
||||
public SdmResponse<List<JSONObject>> getLoadcasePerformanceBatch(@RequestBody @Validated GetLoadcasePerformanceBatchReq req) {
|
||||
return projectService.getLoadcasePerformanceBatch(req);
|
||||
}
|
||||
|
||||
@@ -261,7 +271,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取分析项报告")
|
||||
@PostMapping("/getLoadcaseReport")
|
||||
public SdmResponse getLoadcaseReport(@RequestBody @Validated GetLoadcaseReportReq req) {
|
||||
public SdmResponse<JSONObject> getLoadcaseReport(@RequestBody @Validated GetLoadcaseReportReq req) {
|
||||
return projectService.getLoadcaseReport(req);
|
||||
}
|
||||
|
||||
@@ -272,7 +282,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "批量获取分析项报告")
|
||||
@PostMapping("/getLoadcaseReportBatch")
|
||||
public SdmResponse getLoadcaseReportBatch(@RequestBody @Validated GetLoadcaseReportBatchReq req) {
|
||||
public SdmResponse<List<JSONObject>> getLoadcaseReportBatch(@RequestBody @Validated GetLoadcaseReportBatchReq req) {
|
||||
return projectService.getLoadcaseReportBatch(req);
|
||||
}
|
||||
|
||||
@@ -283,7 +293,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目节点列表")
|
||||
@GetMapping("/getProjectPhaseList")
|
||||
public SdmResponse getProjectPhaseList(@RequestParam("projectId") String projectId) {
|
||||
public SdmResponse<List<ProjectPhaseBean>> getProjectPhaseList(@RequestParam("projectId") String projectId) {
|
||||
return projectService.getProjectPhaseList(projectId);
|
||||
}
|
||||
|
||||
@@ -294,7 +304,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目最大审批版本")
|
||||
@GetMapping("/getMaxApproveVersion")
|
||||
public SdmResponse getMaxApproveVersion(@RequestParam("projectId") String projectId) {
|
||||
public SdmResponse<Integer> getMaxApproveVersion(@RequestParam("projectId") String projectId) {
|
||||
return projectService.getMaxApproveVersion(projectId);
|
||||
}
|
||||
|
||||
@@ -305,7 +315,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "新增总成")
|
||||
@PostMapping("/addComponent")
|
||||
public SdmResponse addComponent(@RequestBody @Validated AddComponentReq req) {
|
||||
public SdmResponse<Void> addComponent(@RequestBody @Validated AddComponentReq req) {
|
||||
return projectService.addComponent(req);
|
||||
}
|
||||
|
||||
@@ -316,7 +326,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "新增学科")
|
||||
@PostMapping("/addDiscipline")
|
||||
public SdmResponse addDiscipline(@RequestBody @Validated AddDisciplineReq req) {
|
||||
public SdmResponse<Void> addDiscipline(@RequestBody @Validated AddDisciplineReq req) {
|
||||
return projectService.addDiscipline(req);
|
||||
}
|
||||
|
||||
@@ -327,7 +337,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "新增仿真任务")
|
||||
@PostMapping("/addLoadcase")
|
||||
public SdmResponse addLoadcase(@RequestBody @Validated AddLoadcaseReq req) {
|
||||
public SdmResponse<Void> addLoadcase(@RequestBody @Validated AddLoadcaseReq req) {
|
||||
return projectService.addLoadcase(req);
|
||||
}
|
||||
|
||||
@@ -338,7 +348,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "新增仿真任务指标")
|
||||
@PostMapping("/addPerformance")
|
||||
public SdmResponse addPerformance(@RequestBody @Validated AddPerformanceReq req) {
|
||||
public SdmResponse<Void> addPerformance(@RequestBody @Validated AddPerformanceReq req) {
|
||||
return projectService.addPerformance(req);
|
||||
}
|
||||
|
||||
@@ -349,7 +359,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "查询项目详情")
|
||||
@PostMapping("/getProjectDetail")
|
||||
public SdmResponse getProjectDetail(@RequestBody @Validated GetProjectDetailReq req) {
|
||||
public SdmResponse<List<JSONObject>> getProjectDetail(@RequestBody @Validated GetProjectDetailReq req) {
|
||||
return projectService.getProjectDetail(req);
|
||||
}
|
||||
|
||||
@@ -361,7 +371,7 @@ public class ProjectController {
|
||||
// @IgnoreAuth
|
||||
@Operation(summary = "更新项目信息(升版)")
|
||||
@PostMapping("/updateProjectVersion")
|
||||
public SdmResponse updateProjectVersion(@RequestBody @Validated UpdateProjectVersionReq req) {
|
||||
public SdmResponse<Integer> updateProjectVersion(@RequestBody @Validated UpdateProjectVersionReq req) {
|
||||
return projectService.updateProjectVersion(req);
|
||||
}
|
||||
|
||||
@@ -372,7 +382,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "更新项目信息(不升版)")
|
||||
@PostMapping("/updateProjectInfo")
|
||||
public SdmResponse updateProjectInfo(@RequestBody @Validated UpdateProjectInfoReq req) {
|
||||
public SdmResponse<Void> updateProjectInfo(@RequestBody @Validated UpdateProjectInfoReq req) {
|
||||
return projectService.updateProjectInfo(req);
|
||||
}
|
||||
|
||||
@@ -384,7 +394,7 @@ public class ProjectController {
|
||||
@Operation(summary = "新增输入表单")
|
||||
// @IgnoreAuth
|
||||
@PostMapping("/addInputForm")
|
||||
public SdmResponse addInputForm(@RequestBody @Validated AddInputFormReq req) {
|
||||
public SdmResponse<Long> addInputForm(@RequestBody @Validated AddInputFormReq req) {
|
||||
return projectService.addInputForm(req);
|
||||
}
|
||||
|
||||
@@ -395,7 +405,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "更新输入表单类型")
|
||||
@PostMapping("/updateInputFormType")
|
||||
public SdmResponse updateInputFormType(@RequestBody @Validated UpdateInputFormTypeReq req) {
|
||||
public SdmResponse<Void> updateInputFormType(@RequestBody @Validated UpdateInputFormTypeReq req) {
|
||||
return projectService.updateInputFormType(req);
|
||||
}
|
||||
|
||||
@@ -406,7 +416,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取输入表单列表")
|
||||
@PostMapping("/getInputFormList")
|
||||
public SdmResponse getInputFormList(@RequestBody @Validated GetInputFormListReq req) {
|
||||
public SdmResponse<JSONObject> getInputFormList(@RequestBody @Validated GetInputFormListReq req) {
|
||||
return projectService.getInputFormList(req);
|
||||
}
|
||||
|
||||
@@ -417,7 +427,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取历史输入表单列表")
|
||||
@PostMapping("/getHistoryInputFormList")
|
||||
public SdmResponse getHistoryInputFormList(@RequestBody @Validated GetHistoryInputFormListReq req) {
|
||||
public SdmResponse<List<Map<String, Object>>> getHistoryInputFormList(@RequestBody @Validated GetHistoryInputFormListReq req) {
|
||||
return projectService.getHistoryInputFormList(req);
|
||||
}
|
||||
|
||||
@@ -429,7 +439,7 @@ public class ProjectController {
|
||||
@Operation(summary = "接收产品需求")
|
||||
@IgnoreAuth
|
||||
@PostMapping("/acceptProductDemand")
|
||||
public SdmResponse acceptProductDemand(@RequestBody @Validated AcceptProductDemandReq req) {
|
||||
public SdmResponse<List<JSONObject>> acceptProductDemand(@RequestBody @Validated AcceptProductDemandReq req) {
|
||||
return projectService.acceptProductDemand(req);
|
||||
}
|
||||
|
||||
@@ -441,7 +451,7 @@ public class ProjectController {
|
||||
@Operation(summary = "接收设计数据")
|
||||
@IgnoreAuth
|
||||
@PostMapping("/acceptDesignData")
|
||||
public SdmResponse acceptDesignData(@RequestBody @Validated AcceptDesignDataReq req) {
|
||||
public SdmResponse<Void> acceptDesignData(@RequestBody @Validated AcceptDesignDataReq req) {
|
||||
return projectService.acceptDesignData(req);
|
||||
}
|
||||
|
||||
@@ -453,7 +463,7 @@ public class ProjectController {
|
||||
@Operation(summary = "接收BOM数据")
|
||||
@IgnoreAuth
|
||||
@PostMapping("/acceptEBOM")
|
||||
public SdmResponse acceptBom(@RequestBody @Validated AcceptBomReq req) {
|
||||
public SdmResponse<Void> acceptBom(@RequestBody @Validated AcceptBomReq req) {
|
||||
return projectService.acceptBom(req);
|
||||
}
|
||||
|
||||
@@ -464,7 +474,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "查询BOM数据")
|
||||
@GetMapping("/getBomList")
|
||||
public SdmResponse getBomList(@RequestParam("projectId") String projectId) {
|
||||
public SdmResponse<List<JSONObject>> getBomList(@RequestParam("projectId") String projectId) {
|
||||
return projectService.getBomList(projectId);
|
||||
}
|
||||
|
||||
@@ -476,7 +486,7 @@ public class ProjectController {
|
||||
@Operation(summary = "接收物料信息")
|
||||
@IgnoreAuth
|
||||
@PostMapping("/acceptMaterial")
|
||||
public SdmResponse acceptMaterial(@RequestBody @Validated AcceptMaterialReq req) {
|
||||
public SdmResponse<Void> acceptMaterial(@RequestBody @Validated AcceptMaterialReq req) {
|
||||
return projectService.acceptMaterial(req);
|
||||
}
|
||||
|
||||
@@ -487,7 +497,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "查询物料信息")
|
||||
@GetMapping("/getMaterial")
|
||||
public SdmResponse getMaterial(@RequestParam("ptNbr") String ptNbr) {
|
||||
public SdmResponse<Material> getMaterial(@RequestParam("ptNbr") String ptNbr) {
|
||||
return projectService.getMaterial(ptNbr);
|
||||
}
|
||||
|
||||
@@ -498,7 +508,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目策划记录")
|
||||
@GetMapping("/getProjectPlanRecord")
|
||||
public SdmResponse getProjectPlanRecord(@RequestParam("projectId") String projectId) {
|
||||
public SdmResponse<List<ProjectPlanRecord>> getProjectPlanRecord(@RequestParam("projectId") String projectId) {
|
||||
return projectService.getProjectPlanRecord(projectId);
|
||||
}
|
||||
|
||||
@@ -509,7 +519,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目节点下各个学科任务进度数量")
|
||||
@GetMapping("/getDisciplineLoadcaseExeStatus")
|
||||
public SdmResponse getDisciplineLoadcaseExeStatus(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
public SdmResponse<List<JSONObject>> getDisciplineLoadcaseExeStatus(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
return projectService.getDisciplineLoadcaseExeStatus(projectId, phaseName);
|
||||
}
|
||||
|
||||
@@ -520,7 +530,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目节点下各个指标状态数量")
|
||||
@GetMapping("/getDisciplinePerformanceStatus")
|
||||
public SdmResponse getDisciplinePerformanceStatus(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
public SdmResponse<List<Map<String, Object>>> getDisciplinePerformanceStatus(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
return projectService.getDisciplinePerformanceStatus(projectId, phaseName);
|
||||
}
|
||||
|
||||
@@ -531,7 +541,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目节点下各个成员任务状态数量")
|
||||
@GetMapping("/getUserLoadcaseExeStatus")
|
||||
public SdmResponse getUserLoadcaseExeStatus(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
public SdmResponse<List<JSONObject>> getUserLoadcaseExeStatus(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
return projectService.getUserLoadcaseExeStatus(projectId, phaseName);
|
||||
}
|
||||
|
||||
@@ -542,7 +552,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目节点下各个成员工时")
|
||||
@GetMapping("/getWorkTimeByUser")
|
||||
public SdmResponse getWorkTimeByUser(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
public SdmResponse<List<Map<String, Object>>> getWorkTimeByUser(@RequestParam("projectId") String projectId, String phaseName) {
|
||||
return projectService.getWorkTimeByUser(projectId, phaseName);
|
||||
}
|
||||
|
||||
@@ -553,7 +563,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "新增项目文件")
|
||||
@PostMapping("/addProjectFile")
|
||||
public SdmResponse addProjectFile(@RequestBody @Validated ProjectFile projectFile) {
|
||||
public SdmResponse<Void> addProjectFile(@RequestBody @Validated ProjectFile projectFile) {
|
||||
return projectService.addProjectFile(projectFile);
|
||||
}
|
||||
|
||||
@@ -564,7 +574,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "更新项目文件")
|
||||
@PostMapping("/updateProjectFile")
|
||||
public SdmResponse updateProjectFile(@RequestBody @Validated ProjectFile projectFile) {
|
||||
public SdmResponse<Void> updateProjectFile(@RequestBody @Validated ProjectFile projectFile) {
|
||||
return projectService.updateProjectFile(projectFile);
|
||||
}
|
||||
|
||||
@@ -575,7 +585,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "删除项目文件")
|
||||
@PostMapping("/delProjectFile")
|
||||
public SdmResponse delProjectFile(@RequestBody @Validated JSONObject json) {
|
||||
public SdmResponse<Void> delProjectFile(@RequestBody @Validated JSONObject json) {
|
||||
return projectService.delProjectFile(json.getLong("id"));
|
||||
}
|
||||
|
||||
@@ -586,7 +596,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取项目文件")
|
||||
@PostMapping("/getProjectFile")
|
||||
public SdmResponse getProjectFile(@RequestBody @Validated GetProjectFileReq req) {
|
||||
public SdmResponse<JSONObject> getProjectFile(@RequestBody @Validated GetProjectFileReq req) {
|
||||
return projectService.getProjectFile(req);
|
||||
}
|
||||
|
||||
@@ -597,7 +607,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "根据文件名查询项目文件")
|
||||
@PostMapping("/getProjectFileByName")
|
||||
public SdmResponse getProjectFileByName(@RequestBody @Validated GetProjectFileByNameReq req) {
|
||||
public SdmResponse<ProjectFile> getProjectFileByName(@RequestBody @Validated GetProjectFileByNameReq req) {
|
||||
return projectService.getProjectFileByName(req);
|
||||
}
|
||||
|
||||
@@ -609,7 +619,7 @@ public class ProjectController {
|
||||
@IgnoreAuth
|
||||
@Operation(summary = "更新仿真任务时间")
|
||||
@PostMapping("/updateProjectLoadcase")
|
||||
public SdmResponse updateProjectLoadcase(@RequestBody @Validated UpdateProjectLoadcaseReq req) {
|
||||
public SdmResponse<Void> updateProjectLoadcase(@RequestBody @Validated UpdateProjectLoadcaseReq req) {
|
||||
return projectService.updateProjectLoadcase(req);
|
||||
}
|
||||
|
||||
@@ -621,7 +631,7 @@ public class ProjectController {
|
||||
@IgnoreAuth
|
||||
@Operation(summary = "回退输入表单")
|
||||
@PostMapping("/rejectInputForm")
|
||||
public SdmResponse rejectInputForm(@RequestBody @Validated RejectInputFormReq req) {
|
||||
public SdmResponse<Void> rejectInputForm(@RequestBody @Validated RejectInputFormReq req) {
|
||||
return projectService.rejectInputForm(req);
|
||||
}
|
||||
|
||||
@@ -633,7 +643,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "查询产品需求列表")
|
||||
@PostMapping("/queryProductDemandList")
|
||||
public SdmResponse queryProductDemandList(@RequestBody @Validated QueryProductDemandListReq req) {
|
||||
public SdmResponse<JSONObject> queryProductDemandList(@RequestBody @Validated QueryProductDemandListReq req) {
|
||||
return projectService.queryProductDemandList(req);
|
||||
}
|
||||
|
||||
@@ -645,7 +655,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "合并报告")
|
||||
@PostMapping("/mergeReport")
|
||||
public SdmResponse mergeReport(@RequestBody @Validated MergeReportReq req) {
|
||||
public SdmResponse<Void> mergeReport(@RequestBody @Validated MergeReportReq req) {
|
||||
return projectService.mergeReport(req);
|
||||
}
|
||||
|
||||
@@ -657,7 +667,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取第二级开发计划列表")
|
||||
@PostMapping("/queryByProjectIdAndNode")
|
||||
public SdmResponse queryByProjectIdAndNode(@RequestBody @Validated QueryByProjectIdAndNodeReq req) {
|
||||
public SdmResponse<List<PerfDevelopPlanDetailEntity>> queryByProjectIdAndNode(@RequestBody @Validated QueryByProjectIdAndNodeReq req) {
|
||||
return projectService.queryByProjectIdAndNode(req);
|
||||
}
|
||||
|
||||
@@ -681,7 +691,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "同步核验结果给TVS")
|
||||
@PostMapping("/syncAnalysis")
|
||||
public SdmResponse syncAnalysis(@RequestBody @Validated SyncAnalysisReq req) {
|
||||
public SdmResponse<Result> syncAnalysis(@RequestBody @Validated SyncAnalysisReq req) {
|
||||
return projectService.syncAnalysis(req);
|
||||
}
|
||||
|
||||
@@ -693,7 +703,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取关联数量")
|
||||
@PostMapping("/getRelateCount")
|
||||
public SdmResponse getRelateCount(@RequestBody @Validated GetRelateCountReq req) {
|
||||
public SdmResponse<JSONObject> getRelateCount(@RequestBody @Validated GetRelateCountReq req) {
|
||||
return projectService.getRelateCount(req);
|
||||
}
|
||||
|
||||
@@ -705,7 +715,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "获取关联数量")
|
||||
@GetMapping("/getUserSummary")
|
||||
public SdmResponse getUserSummary(@RequestParam("days") int days) {
|
||||
public SdmResponse<JSONObject> getUserSummary(@RequestParam("days") int days) {
|
||||
return projectService.getUserSummary(days);
|
||||
}
|
||||
|
||||
@@ -717,7 +727,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "测试事务")
|
||||
@GetMapping("/testTransaction")
|
||||
public SdmResponse testTransaction(Integer id) {
|
||||
public SdmResponse<JSONObject> testTransaction(Integer id) {
|
||||
return projectService.testTransaction(id);
|
||||
}
|
||||
|
||||
@@ -729,7 +739,7 @@ public class ProjectController {
|
||||
*/
|
||||
// @IgnoreAuth
|
||||
@PostMapping("/addDraft")
|
||||
public SdmResponse addDraft(@RequestBody @Validated AddDraftReq req) {
|
||||
public SdmResponse<Void> addDraft(@RequestBody @Validated AddDraftReq req) {
|
||||
return projectService.addDraft(req);
|
||||
}
|
||||
|
||||
@@ -740,7 +750,7 @@ public class ProjectController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/delDraft")
|
||||
public SdmResponse delDraft(@RequestBody @Validated DelDraftReq req) {
|
||||
public SdmResponse<Void> delDraft(@RequestBody @Validated DelDraftReq req) {
|
||||
return projectService.delDraft(req);
|
||||
}
|
||||
|
||||
@@ -752,7 +762,7 @@ public class ProjectController {
|
||||
*/
|
||||
@Operation(summary = "查询当前用户的草稿箱列表")
|
||||
@PostMapping("/queryDraftList")
|
||||
public SdmResponse queryDraftList(@RequestBody @Validated QueryDraftListReq req) {
|
||||
public SdmResponse<JSONObject> queryDraftList(@RequestBody @Validated QueryDraftListReq req) {
|
||||
return projectService.queryDraftList(req);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user