diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
index cffa5d8eaf..22a0bfc441 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-hall-server:
container_name: resi-hall-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.20
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.21
ports:
- "8100:8100"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index b83cc8aad1..beb8ba5879 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.20
+ 0.3.21
resi-hall
com.epmet
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index d86a754f6c..a20d0e61bc 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -131,8 +131,8 @@ public class IssueController {
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result evaluate(@LoginUser TokenDto tokenDto,@RequestBody EvaluateFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
- issueService.evaluate(tokenDto,formDTO);
- return new Result();
+ return issueService.evaluate(tokenDto,formDTO);
+
}
/**
@@ -144,8 +144,8 @@ public class IssueController {
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result projectEvaluate(@LoginUser TokenDto tokenDto,@RequestBody ProjectEvaluateFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
- issueService.projectEvaluate(tokenDto,formDTO);
- return new Result();
+ return issueService.projectEvaluate(tokenDto,formDTO);
+
}
/**
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
index 36dbe70b15..d71c3e4b03 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
@@ -2,6 +2,7 @@ package com.epmet.service;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import org.springframework.web.bind.annotation.RequestBody;
@@ -72,14 +73,14 @@ public interface IssueService {
* @param evaluateFormDTO
* @author zxc
*/
- void evaluate(TokenDto tokenDto,EvaluateFormDTO evaluateFormDTO);
+ Result evaluate(TokenDto tokenDto,EvaluateFormDTO evaluateFormDTO);
/**
* @Description 提交满意度评价——已转项目
* @param projectEvaluateFormDTO
* @author zxc
*/
- void projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO);
+ Result projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO);
/**
* @Description 满意度评价列表——已关闭
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 854eb51aea..0551eb8423 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -201,9 +201,9 @@ public class IssueServiceImpl implements IssueService {
* @author zxc
*/
@Override
- public void evaluate(TokenDto tokenDto, EvaluateFormDTO evaluateFormDTO) {
+ public Result evaluate(TokenDto tokenDto, EvaluateFormDTO evaluateFormDTO) {
evaluateFormDTO.setUserId(tokenDto.getUserId());
- govIssueFeignClient.evaluate(evaluateFormDTO);
+ return govIssueFeignClient.evaluate(evaluateFormDTO);
}
/**
@@ -212,9 +212,9 @@ public class IssueServiceImpl implements IssueService {
* @author zxc
*/
@Override
- public void projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO) {
+ public Result projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO) {
projectEvaluateFormDTO.setUserId(tokenDto.getUserId());
- govProjectFeignClient.projectEvaluate(projectEvaluateFormDTO);
+ return govProjectFeignClient.projectEvaluate(projectEvaluateFormDTO);
}
/**