From b9ee0fed3a64f0b0e184617796082b66e0605270 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 24 Sep 2019 14:34:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java | 3 ++- .../epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java | 4 ++-- .../elink/esua/epdc/dto/item/form/EvaluationFormDTO.java | 5 ++--- .../esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java | 5 +++-- .../epdc/modules/item/controller/EpdcAppItemController.java | 1 + .../src/main/resources/mapper/events/EpdcEventsDao.xml | 6 ++++++ .../src/main/resources/mapper/item/ItemDao.xml | 2 ++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java index 4d3876951..0aac98d74 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; /** @@ -32,6 +33,6 @@ public class EpdcEventsReviewFormDTO implements Serializable { /** * 处理意见 */ - @NotBlank(message = "处理意见不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String advice; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java index f0d8c71ae..7dd250191 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java @@ -2,8 +2,8 @@ package com.elink.esua.epdc.dto.issue.form; import lombok.Data; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; /** @@ -22,7 +22,7 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable { /** * 处理意见 */ - @NotBlank(message = "处理意见不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String advice; /** * 状态 1 添加处理意见，2 关闭，4 转项目 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java index ae39db883..c1d86798c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java @@ -2,10 +2,9 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.Date; /** * @Author LC @@ -21,7 +20,7 @@ public class EvaluationFormDTO implements Serializable { @NotBlank(message = "满意度评价得分不能为空") private int evaluationScore; - @NotBlank(message = "满意度评价内容不能为空") + @Size(min = 1, max = 100, message = "满意度评价内容在100字以内") private String evaluationContent; private String userId; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index 1e6561fd0..91290c199 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; import java.util.List; @@ -27,13 +28,13 @@ public class ItemHandleSubmitFormDTO implements Serializable { /** * 处理意见（内部） */ - @NotBlank(message = "处理意见（内部）不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String handleAdvice; /** * 处理意见（外部） */ - @NotBlank(message = "处理意见（外部）不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String outHandleAdvice; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java index 3f76d3002..20b8d53b1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -54,6 +54,7 @@ public class EpdcAppItemController { @PostMapping("evaluation") public Result evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) { + ValidatorUtils.validateEntity(evaluationFormDTO); return this.itemService.evaluation(evaluationFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 733313b1f..c89b3c223 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -73,6 +73,12 @@ AND temp.grid_id = #{gridId} + + AND temp.STREET_ID = #{streetId} + + + AND temp.COMMUNITY_ID = #{communityId} + AND temp.EVENT_STATE = 2 ORDER BY temp.CREATED_TIME DESC diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index d049cedd8..c513d5ab0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -301,6 +301,7 @@ OUT_HANDLE_ADVICE AS advice, + HANDLER_DEPT AS handlerDept, CASE WHEN STATE = 0 THEN '【处理中】' WHEN STATE = 5 THEN '【已关闭】' WHEN STATE = 10 THEN '【已结案】' ELSE '' END AS progressName FROM epdc_item_handle_process @@ -310,6 +311,7 @@ SELECT EVALUATION_TIME AS createdTime, EVALUATION_CONTENT AS advice, + NICK_NAME AS handlerDept, CASE EVALUATION_SCORE WHEN 0 THEN