From 1fc203f758ace853f4bfa900c422c2f741d09e79 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期二, 18 二月 2025 09:05:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java b/land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java
index bd4b7eb..d0e911b 100644
--- a/land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java
+++ b/land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java
@@ -70,7 +70,7 @@
public AjaxResult<StateProjectBO> getById(@PathVariable String id) {
return AjaxResult.success(stateProjectService.getProjectInfoById(id));
}
-
+ //获取当前项目的所有街道
@GetMapping(UrlConstants.STATE_PROJECT_GET_STREET_BY_ID)
public AjaxResult<String[]> getProjectBelongingStreetTownById(@PathVariable String id) {
return AjaxResult.success(stateProjectService.getProjectBelongingStreetTownById(id));
@@ -181,14 +181,12 @@
@PostMapping(UrlConstants.STATE_PROJECT_APP_SUCCESS)
@ApiOperation(value = "app将项目改为已完成", notes = "app将项目改为已完成")
public AjaxResult<Boolean> appSuccessProject(@RequestBody GetProjectPageBO getProjectPageBO) {
- //todo接workflow 并计算金额
return AjaxResult.success(stateProjectService.updateProjectAppStage(getProjectPageBO.getProjectId(), StateProjectStatusEnum.SUCCESS.getKey()));
}
@PostMapping(UrlConstants.STATE_PROJECT_NOTICE_SIMULATE)
@ApiOperation(value = "将项目改为模拟", notes = "将项目改为模拟")
public AjaxResult<Boolean> simulatedProject(@RequestBody GetProjectPageBO getProjectPageBO) {
- //todo接workflow 并计算金额
stateProjectService.updateProjectAppStage(getProjectPageBO.getProjectId(), StateProjectStatusEnum.SIMULATE.getKey());
return AjaxResult.success(stateProjectService.updateProjectStatus(getProjectPageBO.getProjectId(), StateProjectStatusEnum.SIMULATE.getKey()));
}
--
Gitblit v1.7.1