diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java index 1815ecd434..699c6ada63 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java @@ -19,7 +19,7 @@ public class EventListFormDTO implements Serializable { public interface EventListForm{} /** - * 报事列表类型【已处理:processed 未处理:undisposed 已办结:transferred】 + * 报事列表类型【处理中:processed 待处理:undisposed 已办结:transferred】 */ @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class) private String eventType; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java new file mode 100644 index 0000000000..8a63bba97b --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java @@ -0,0 +1,17 @@ +package com.epmet.constant; + +/** + * @Author zxc + * @DateTime 2021/8/3 2:45 下午 + * @DESC + */ +public interface EventConstant { + + /** + * 【处理中:processed 待处理:undisposed 已办结:transferred】 + */ + String EVENT_PROCESSED = "processed"; + String EVENT_UN_DISPOSED = "undisposed"; + String EVENT_TRANSFERRED = "transferred"; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java index 062740b5d7..02f58c15ca 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java @@ -25,29 +25,6 @@ public class EventController { @Autowired private ResiEventService resiEventService; - /** - * @Description 群众直报(待处理、处理中、已办结)列表 - * @Param formDTO - * @author zxc - * @date 2021/8/3 10:53 上午 - */ - @PostMapping("eventlist") - public Result> eventList(@RequestBody EventListFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); - return new Result>().ok(resiEventService.eventList(formDTO)); - } - /** - * @Description 查看报事时,更新时间操作 - * @Param formDTO - * @author zxc - * @date 2021/8/3 11:01 上午 - */ - @PostMapping("updateviewtime") - public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class); - resiEventService.updateViewTime(formDTO); - return new Result(); - } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index c04c99145c..4622d74927 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -19,16 +19,13 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.EventDetailFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.EventDetailResultDTO; 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.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.ChooseResolveFormDTO; -import com.epmet.dto.form.MyReportedFormDTO; -import com.epmet.dto.form.ReCallEventFormDTO; -import com.epmet.dto.form.ResiEventFormDTO; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.dto.result.MyReportedResultDTO; import com.epmet.dto.result.ResiEventIdDTO; import com.epmet.service.ResiEventService; @@ -133,4 +130,29 @@ public class ResiEventController { ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class); return new Result>().ok(resiEventService.queryMyReported(formDTO)); } + + /** + * @Description 群众直报(待处理、处理中、已办结)列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + @PostMapping("eventlist") + public Result> eventList(@RequestBody EventListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); + return new Result>().ok(resiEventService.eventList(formDTO)); + } + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + @PostMapping("updateviewtime") + public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class); + resiEventService.updateViewTime(formDTO); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 2e55ca8228..321decec81 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -18,6 +18,7 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.constant.EventConstant; import com.epmet.dao.ResiEventDao; import com.epmet.dto.form.EventDetailFormDTO; import com.epmet.dto.form.EventListFormDTO; @@ -34,6 +35,7 @@ import com.epmet.entity.ResiEventEntity; import com.epmet.service.ResiEventService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -47,13 +49,26 @@ public class ResiEventServiceImpl extends BaseServiceImpl eventList(EventListFormDTO formDTO) { - return null; + // 处理中 + if (formDTO.getEventType().equals(EventConstant.EVENT_PROCESSED)){ + + // 待处理 + }else if (formDTO.getEventType().equals(EventConstant.EVENT_UN_DISPOSED)){ + + // 已办结 + }else if (formDTO.getEventType().equals(EventConstant.EVENT_TRANSFERRED)){ + + } + return new ArrayList<>(); } /**