diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 8ab291b3b..2e8ee854b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -44,6 +44,7 @@ import com.elink.esua.epdc.user.dto.epdc.result.*; import com.elink.esua.epdc.user.enums.*; import com.elink.esua.epdc.utils.UserTagUtils; import com.elink.esua.epdc.utils.WxMaServiceUtils; +import com.google.gson.JsonSyntaxException; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; @@ -1429,6 +1430,10 @@ public class AppUserServiceImpl implements AppUserService { } catch (WxErrorException e) { e.printStackTrace(); log.error(e.getError().getErrorMsg()); + return new Result().error("解析用户手机号失败"); + } catch (Exception e) { + log.error(e.getMessage()); + return new Result().error("解析用户手机号失败，请重新获取"); } return new Result().error("解析用户手机号失败"); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java index 04b067dd1..99e95263b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java @@ -10,34 +10,34 @@ public interface ImageConstant { /** * 图片类型-事件 */ - public final static String TYPE_IMAGE_BIZ_EVENTS = "events"; + String TYPE_IMAGE_BIZ_EVENTS = "events"; /** * 图片类型-项目 */ - public final static String TYPE_IMAGE_BIZ_ITEMS = "items"; + String TYPE_IMAGE_BIZ_ITEMS = "items"; /** * 图片类型-事件 */ - public final static String TYPE_VOICE_BIZ_EVENTS = "eventsVoice"; + String TYPE_VOICE_BIZ_EVENTS = "eventsVoice"; /** * 图片类型-头像 */ - public final static String TYPE_IMAGE_BIZ_FACE = "face"; + String TYPE_IMAGE_BIZ_FACE = "face"; /** * 图片类型-事件拒绝 */ - public final static String TYPE_IMAGE_BIZ_EVENTS_REJECT = "eventsReject"; + String TYPE_IMAGE_BIZ_EVENTS_REJECT = "eventsReject"; /** * 图片类型-议题处理 */ - public final static String TYPE_IMAGE_BIZ_ISSUE_HANDLE = "issueHandle"; + String TYPE_IMAGE_BIZ_ISSUE_HANDLE = "issueHandle"; - public final static String TYPE_IMAGE_ITEM_HANDLE = "itemHandle"; + String TYPE_IMAGE_ITEM_HANDLE = "itemHandle"; - public final static String TYPE_IMAGE_ITEM_OUT_HANDLE = "itemOutHandle"; + String TYPE_IMAGE_ITEM_OUT_HANDLE = "itemOutHandle"; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java index 6c964433d..9d167666b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java @@ -8,10 +8,10 @@ package com.elink.esua.epdc.constant; */ public interface ItemEvaluationLevel { - String levaluationLevelBad = "0"; + int LEVALUATION_LEVEL_BAD = 0; - String levaluationLevelBetter = "1"; + int LEVALUATION_LEVEL_BETTER = 1; - String levaluationLevelBest = "2"; + int LEVALUATION_LEVEL_BEST = 2; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ItemFusingDelayRecordDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ItemFusingDelayRecordDTO.java index a9ad07edd..945f81577 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ItemFusingDelayRecordDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ItemFusingDelayRecordDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/MetaSysDeptDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/MetaSysDeptDTO.java index eebcfeaea..2946727dc 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/MetaSysDeptDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/MetaSysDeptDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryDTO.java index f6077609c..b0d5151c2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryDTO.java @@ -17,9 +17,6 @@ package com.elink.esua.epdc.dto.category; -import java.io.Serializable; -import java.util.Date; - import com.elink.esua.epdc.commons.tools.utils.TreeNode; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; @@ -31,6 +28,7 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Null; +import java.io.Serializable; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java index 3cd2158d1..3d834a142 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.category; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java index 67c925899..4e89d4a3f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java @@ -17,10 +17,10 @@ package com.elink.esua.epdc.dto.comment; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import java.io.Serializable; + @Data public class CommentStatementFormDTO implements Serializable { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeDTO.java index ee50c1501..be11ca291 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.comment; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java index 1fcc34f1b..a62f35ba1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java @@ -10,8 +10,6 @@ package com.elink.esua.epdc.dto.comment.form; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; import java.io.Serializable; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java index 8941ea46d..8003331f4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.events; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java index 69ffe7b21..a15a8cf92 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.events; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/PushToCityGridCaseClosedDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/PushToCityGridCaseClosedDTO.java index 63d360317..77caf18ae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/PushToCityGridCaseClosedDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/PushToCityGridCaseClosedDTO.java @@ -1,6 +1,5 @@ package com.elink.esua.epdc.dto.events; -import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java index 8fc8c086b..8ae31e67c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.events.form; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventDeleteCommentsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventDeleteCommentsFormDTO.java index fbd4f194b..7f6c8d32a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventDeleteCommentsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventDeleteCommentsFormDTO.java @@ -2,10 +2,7 @@ package com.elink.esua.epdc.dto.events.form; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.List; /** * @Author LC diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java index 6e9e4e960..a4b77eb00 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java @@ -31,12 +31,4 @@ public class ItemDailyStatisFormDTO implements Serializable { * 日维度 yyyy-MM-dd */ private String statDate; - /** - * 月维度 yyyy-MM - */ - private String statMonth; - /** - * 年维度 yyyy - */ - private String statYear; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/InterfaceLogDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/InterfaceLogDTO.java index 0889cd6df..730356932 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/InterfaceLogDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/InterfaceLogDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.interfacelog; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/EventUserAttitudeDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/EventUserAttitudeDTO.java index 7b7ba8530..75afd3e75 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/EventUserAttitudeDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/EventUserAttitudeDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.issue; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java index 0b203bc7a..5b8a92d02 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.issue; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java index edd51062e..a03914aac 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java @@ -2,7 +2,6 @@ package com.elink.esua.epdc.dto.issue.form; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuesAndEventsOfMineFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuesAndEventsOfMineFormDTO.java index 817bac971..6db3090a1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuesAndEventsOfMineFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuesAndEventsOfMineFormDTO.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.issue.form; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java index 7b3afc4f7..c896f31ff 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java @@ -4,10 +4,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Date; -import java.util.List; @Data public class WorkEventCommentListFormDTO implements Serializable { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java index 58d693437..6d550f116 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java @@ -4,9 +4,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Date; import java.util.List; @Data diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueListResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueListResultDTO.java index 238003c20..378ea0b79 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueListResultDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -import java.util.List; /** * 移动端-议题最新最热列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/GridPlatformHandleLogDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/GridPlatformHandleLogDTO.java index 9503ce77f..242b90cfb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/GridPlatformHandleLogDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/GridPlatformHandleLogDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.item; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java index c96667587..a895929ef 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java @@ -17,12 +17,10 @@ package com.elink.esua.epdc.dto.item; -import java.io.Serializable; -import java.util.Date; - import lombok.Data; -import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; /** * 项目表 项目表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDeptDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDeptDTO.java index dc92629b3..dc4ef860b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDeptDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDeptDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.item; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java index ca0a0df1d..b89243856 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.item; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemReportInterfaceLogDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemReportInterfaceLogDTO.java index a654f1974..3b5ae51ec 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemReportInterfaceLogDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemReportInterfaceLogDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.item; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyFormDTO.java index 54508c12f..9d207dc79 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyFormDTO.java @@ -3,9 +3,7 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.List; /** * @program: esua-epdc diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyOutFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyOutFormDTO.java index cf150f34d..78120c9dc 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyOutFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptItemDifficultyOutFormDTO.java @@ -2,7 +2,6 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java index 9af025d67..dde314d5f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * @program: esua-epdc diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java index baa9d2b8a..6d50ccdb8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java @@ -34,23 +34,4 @@ public class ItemAppealPageDTO implements Serializable { */ private String serialNum; -// /** -// * 诉求类型 0民生 1发展 2执法 -// */ -// private String appealType; -// -// /** -// * 上报开始时间：年月日 -// */ -// private String startTime; -// -// /** -// * 上报结束时间：年月日 -// */ -// private String endTime; -// -// /** -// * 项目内容 -// */ -// private String itemContent; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java index e8a885290..b4cd971be 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java @@ -5,7 +5,6 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.util.List; /** * @Author wgf diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java index 751e0fe50..def97a486 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java @@ -4,9 +4,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Date; import java.util.List; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java index fab0ff268..0408e9a3f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java index e229b167c..893be15a7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java @@ -2,8 +2,6 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java index cbc84742a..f3fc111fb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java @@ -2,7 +2,6 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java index d009b5b43..a6c867a47 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java @@ -36,8 +36,6 @@ public class SubmitItemFormDTO implements Serializable { */ private String mobile; -// private String smsCode; - /** * 党员标识 0：否，1：是 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealDispatchResultDto.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealDispatchResultDto.java index 0f304632e..c81112bde 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealDispatchResultDto.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealDispatchResultDto.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; import java.util.List; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java index c8cd90d04..85a560678 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; import java.util.List; @NoArgsConstructor diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java index a1af1b6de..d1b499682 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - @NoArgsConstructor @Data public class AppealReportResultDTO { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayApplyResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayApplyResultDTO.java index 7d2c074c6..46e5ab8d3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayApplyResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayApplyResultDTO.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * 退件审核 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayAuditResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayAuditResultDTO.java index a0ac37aa2..689568cf1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayAuditResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayAuditResultDTO.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * 退件审核 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DeptInfoWorkDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DeptInfoWorkDetailResultDTO.java index 88f81f440..852ab07df 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DeptInfoWorkDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DeptInfoWorkDetailResultDTO.java @@ -3,8 +3,6 @@ package com.elink.esua.epdc.dto.item.result; import lombok.Data; import java.io.Serializable; -import java.util.Date; -import java.util.List; /** * 部门信息 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java index 9e7b99543..a0988a1b7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - @NoArgsConstructor @Data public class DispatchAuditResultDto { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionApplyResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionApplyResultDTO.java index cfc2a9f58..5d3cbe420 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionApplyResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionApplyResultDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * @Description diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionResultDTO.java index 0ac0fd02e..77dd30e8a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionResultDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * @Description diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EndInspectionResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EndInspectionResultDTO.java index 8944029d5..d4892b678 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EndInspectionResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EndInspectionResultDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * @Description diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java index 0ca87f50a..7b0f97f91 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * @Description diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java index b29e494ce..5d7f499e2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java @@ -5,7 +5,6 @@ import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemInformationResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemInformationResultDTO.java index 8c9fc86ad..0a249ea75 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemInformationResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemInformationResultDTO.java @@ -3,8 +3,6 @@ package com.elink.esua.epdc.dto.item.result; import lombok.Data; import java.io.Serializable; -import java.util.Date; -import java.util.List; /** * 项目消息列表DTO diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java index 06a000cab..78a368f63 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.item.result; import lombok.Data; import java.io.Serializable; -import java.util.Date; @Data public class ItemListByAddressResultDTO implements Serializable { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutAuditResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutAuditResultDTO.java index da3f53911..0a1e01d0d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutAuditResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutAuditResultDTO.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * 退件审核 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutResultDTO.java index 1fccc9fcd..772f1f8e7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutResultDTO.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * 诉求退件 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java index 2c1bb8ef9..47bf89163 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - @NoArgsConstructor @Data public class ReportRejectionResultDTO { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java index ceb52fe3d..9f0d9db80 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.screen; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java index fb5d48e81..92fdc4ff4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.screen; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/ShareEnterpriseDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/ShareEnterpriseDTO.java index 63eea1315..25542ae53 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/ShareEnterpriseDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/ShareEnterpriseDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto.share; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java index 5aa782e39..306523a24 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java @@ -21,7 +21,6 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.util.Date; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/result/ShareEnterpriseResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/result/ShareEnterpriseResultDTO.java index 8432fa990..4d67d08da 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/result/ShareEnterpriseResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/result/ShareEnterpriseResultDTO.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.share.result; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java index 97ae56aed..9f1597338 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java @@ -42,11 +42,7 @@ public enum ItemHandleCategoryEnum { ItemHandleResultDTO dto = new ItemHandleResultDTO(); dto.setProcessResult(e.value); dto.setProcessName(e.name); - if (selected && ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.value == e.value) { - dto.setSelect(true); - } else { - dto.setSelect(false); - } + dto.setSelect(selected && ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.value == e.value); handleResultDTOS.add(dto); } } @@ -56,13 +52,6 @@ public enum ItemHandleCategoryEnum { public static List getHandleCategoriesForGirdNew() { List handleResultDTOS = new ArrayList<>(); - // 不予受理 -// ItemHandleResultDTO dto1 = new ItemHandleResultDTO(); -// dto1.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue()); -// dto1.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSE.getName()); -// dto1.setSelect(false); // 暂时默认不流转 -// handleResultDTOS.add(dto1); - // 响应拟办 ItemHandleResultDTO dto2 = new ItemHandleResultDTO(); dto2.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue()); @@ -70,20 +59,6 @@ public enum ItemHandleCategoryEnum { dto2.setSelect(false); // 暂时默认不流转 handleResultDTOS.add(dto2); - // 结案申请 -// ItemHandleResultDTO dto3 = new ItemHandleResultDTO(); -// dto3.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); -// dto3.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getName()); -// dto3.setSelect(false); // 暂时默认不流转 -// handleResultDTOS.add(dto3); - - // 吹哨 -// ItemHandleResultDTO dto4 = new ItemHandleResultDTO(); -// dto4.setProcessResult(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue()); -// dto4.setProcessName(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getName()); -// dto4.setSelect(false); // 暂时默认不流转 -// handleResultDTOS.add(dto4); - return handleResultDTOS; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java index 528ba7936..b0b7ae654 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java @@ -24,8 +24,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; +import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; @@ -48,7 +48,6 @@ import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.producer.CategoryModifyProducer; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -89,7 +88,7 @@ public class CategoryServiceImpl extends BaseServiceImpl list(Map params) { @@ -245,7 +244,7 @@ public class CategoryServiceImpl extends BaseServiceImpl 1) { throw new RenException(ErrorCode.DEPT_SUB_DELETE_ERROR); } - baseDao.deleteBatchIds(Arrays.asList(new Long[]{id})); + baseDao.deleteBatchIds(Arrays.asList(id)); // 逻辑删除（@TableLogic 注解） //logicDelete(new Long[]{id}, CategoryEntity.class); @@ -295,9 +294,7 @@ public class CategoryServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper(categoryEntity); List categoryEntityList = baseDao.selectList(wrapper); int numm = categoryEntityList.size(); - if(numm >= 0){ - numm -= 1; - } + numm -= 1; //一级分类 String firstClassName = "领域1"; Long firstClassId = 0L; @@ -399,7 +396,7 @@ public class CategoryServiceImpl extends BaseServiceImpl parentNameList = Lists.newArrayList(); String[] pidList = entity.getPids().split(StrConstant.COMMA); - if (null != pidList && pidList.length > NumConstant.ZERO) { + if (pidList.length > NumConstant.ZERO) { CategoryEntity parentEntity; - for (int i = 0; i < pidList.length; i++) { - parentEntity = baseDao.getById(Long.valueOf(pidList[i])); - if (null != parentEntity) { - parentNameList.add(parentEntity.getCategoryName()); - } - } + for (String s : pidList) { + parentEntity = baseDao.getById(Long.valueOf(s)); + if (null != parentEntity) { + parentNameList.add(parentEntity.getCategoryName()); + } + } } categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); if (CollUtil.isNotEmpty(parentNameList)) { @@ -605,7 +581,7 @@ public class CategoryServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(eventId), "EVENT_ID", eventId); List list = issueDao.selectList(wrapper); - if (null == list || list.size() == 0) { - return false; - } - return true; + return null != list && list.size() != 0; } /** @@ -697,9 +690,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl list = baseDao.statEventReportAmount(eventReportAmountFormDto, issueLimitHour); - - return list; + return baseDao.statEventReportAmount(eventReportAmountFormDto, issueLimitHour); } @Override @@ -751,27 +742,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl parentDeptIds = Arrays.asList(events.getParentDeptIds().split(",")); -// List parentDeptNames = Arrays.asList(events.getParentDeptNames().split("-")); -// int index = parentDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && parentDeptNames.size() > index) { -// parentDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(events.getId()); -// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); -// } -// } -// -// if (StringUtils.isNotEmpty(events.getAllDeptIds()) && StringUtils.isNotEmpty(events.getAllDeptNames())) { -// List allDeptIds = Arrays.asList(events.getAllDeptIds().split(",")); -// List allDeptNames = Arrays.asList(events.getAllDeptNames().split("-")); -// int index = allDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && allDeptNames.size() > index) { -// allDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(events.getId()); -// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); -// } -// } entities.add(entity); } @@ -841,8 +811,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl rejectEventsExportList(Map params) { - List list = baseDao.selectListOfRejectEvents(params); - return list; + return baseDao.selectListOfRejectEvents(params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java index a0fc5ffac..e0b9daa4e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java @@ -20,10 +20,10 @@ package com.elink.esua.epdc.modules.issue.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.constant.EventsNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.issue.EventUserAttitudeDTO; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index bcfaff473..23f1d9181 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -315,10 +315,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(issueId), "ISSUE_ID", issueId); List list = itemDao.selectList(wrapper); - if (null == list || list.size() == 0) { - return false; - } - return true; + return null != list && list.size() != 0; } @Override @@ -617,27 +614,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp entity.setParentDeptNames(dto.getAllDeptNames()); } -// if (StringUtils.isNotEmpty(issue.getParentDeptIds()) && StringUtils.isNotEmpty(issue.getParentDeptNames())) { -// List parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(",")); -// List parentDeptNames = Arrays.asList(issue.getParentDeptNames().split("-")); -// int index = parentDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && parentDeptNames.size() > index) { -// parentDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(issue.getId()); -// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); -// } -// } -// -// if (StringUtils.isNotEmpty(issue.getAllDeptIds()) && StringUtils.isNotEmpty(issue.getAllDeptNames())) { -// List allDeptIds = Arrays.asList(issue.getAllDeptIds().split(",")); -// List allDeptNames = Arrays.asList(issue.getAllDeptNames().split("-")); -// int index = allDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && allDeptNames.size() > index) { -// allDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(issue.getId()); -// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); -// } -// } entities.add(entity); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java index aad309997..e437ad990 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java @@ -33,28 +33,6 @@ import java.util.List; @Mapper public interface GridPlatformHandleLogDao extends BaseDao { - /** - * - * 根据网格化平台项目关系表ID获取历史处理记录 - * - * @params [itemGridPlatformId] - * @return java.util.List - * @author liuchuang - * @since 2019/12/25 19:17 - */ - List selectListOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId); - - /** - * - * 根据网格化平台项目关系表ID清空处理记录 - * - * @params [itemGridPlatformId] - * @return void - * @author liuchuang - * @since 2019/12/25 18:58 - */ - void deleteHandleProcessByItemGridPlatFormId(String itemGridPlatformId); - /** * * 获取网格化平台最新处理情况 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index ccce9b84f..452f73284 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -236,16 +236,6 @@ public interface ItemDao extends BaseDao { */ ItemContentForPCEndResultDTO selectItemContentForPCEnd(String itemId); - /** - * 项目处理发送菜单消息 - * - * @return int - * @params [deptId, state] - * @author liuchuang - * @since 2019/10/30 13:28 - */ - int selectCountOfItemDeptNotice(@Param("deptId") Long deptId, @Param("state") int state); - /** * 根据吹哨部门ID统计吹哨部门待处理项目数量 * @@ -329,16 +319,6 @@ public interface ItemDao extends BaseDao { List selectListItemCloseAmount(@Param("timeLimitList") List kpiItemTimeLimitByDeptList, @Param("metaDataCode") String metaDataCode); - /** - * 删除项目处理进度表历史记录 - * - * @return void - * @params [ids] - * @author liuchuang - * @since 2019/12/25 19:23 - */ - void deleteBatchItemHandleIds(@Param("ids") List ids); - /** * @Description: 根据项目id，查询当前登录人所在部门，以外的该项目关联的所有部门id * @Param: [itemId] 项目id @@ -409,15 +389,6 @@ public interface ItemDao extends BaseDao { */ void rejectItemSatisfactionInfo(@Param("id") String id); - /** - * @return java.lang.Integer - * @describe: 通过项目id查询项目所在的二级分类 - * @author wangtong - * @date 2020/12/16 18:26 - * @params [id] - */ - String selectSecondCateByItemId(@Param("id") String id); - /** * @return java.util.List * @describe: 北尚诉求列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java index 6a05f3abd..e01f3a881 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java @@ -37,16 +37,6 @@ import java.util.List; @Mapper public interface ItemHandleProcessDao extends BaseDao { - /** - * 保存处理进度 - * - * @return void - * @params [dto] - * @author liuchuang - * @since 2019/12/26 19:12 - */ - void insertItemHandleProcess(ItemHandleProcessDTO dto); - /** * 更新操作人部门名称 * @@ -76,16 +66,6 @@ public interface ItemHandleProcessDao extends BaseDao { */ ItemHandleProcessCaseClosedToCityDTO getHandler(@Param("id") String id); - - /** - * 诉求派遣 - * - * @param state - * @return - */ - List getProcessListByState(@Param("state") String state); - - /** * 根据流程编号和日期获取流程数据 * @@ -96,16 +76,6 @@ public interface ItemHandleProcessDao extends BaseDao { */ List listProcessByStateAndDate(@Param("state") String state, @Param("date") String date); - /** - * 派遣审核 - * - * @param state - * @return java.util.List - * @author LZN - * @date 2022/9/19 10:25 - */ - List getDispatchAudit(@Param("state") String state); - /** * 诉求上报 * @@ -118,6 +88,7 @@ public interface ItemHandleProcessDao extends BaseDao { /** * 上报驳回 + * * @param id * @return */ @@ -125,10 +96,11 @@ public interface ItemHandleProcessDao extends BaseDao { /** * 诉求处理 + * * @param id * @return */ - AppealHandlingToCityResultDTO getAppealHandling(@Param("id") String id,@Param("itemId") String itemId); + AppealHandlingToCityResultDTO getAppealHandling(@Param("id") String id, @Param("itemId") String itemId); List getURL(String itemId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java index ae2526a26..f9b0529ae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java @@ -93,26 +93,6 @@ public interface GridPlatformHandleLogService extends BaseService - * @params [itemGridPlatformId] - * @author liuchuang - * @since 2019/12/25 19:17 - */ - List listOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId); - - /** - * 根据网格化平台项目关系表ID清空处理记录 - * - * @return void - * @params [itemGridPlatformId] - * @author liuchuang - * @since 2019/12/25 18:56 - */ - void removeHandleProcessByItemGridPlatFormId(String itemGridPlatformId); - /** * 获取网格化平台最新处理情况 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java index 23cf8b022..708909937 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java @@ -20,16 +20,14 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO; import com.elink.esua.epdc.modules.item.dao.GridPlatformHandleLogDao; import com.elink.esua.epdc.modules.item.entity.GridPlatformHandleLogEntity; -import com.elink.esua.epdc.modules.item.redis.GridPlatformHandleLogRedis; import com.elink.esua.epdc.modules.item.service.GridPlatformHandleLogService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,9 +44,6 @@ import java.util.Map; @Service public class GridPlatformHandleLogServiceImpl extends BaseServiceImpl implements GridPlatformHandleLogService { - @Autowired - private GridPlatformHandleLogRedis gridPlatformHandleLogRedis; - @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -101,17 +96,6 @@ public class GridPlatformHandleLogServiceImpl extends BaseServiceImpl listOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId) { - return baseDao.selectListOfHandleProcessLogByItemGridPlatFormId(itemGridPlatformId); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void removeHandleProcessByItemGridPlatFormId(String itemGridPlatformId) { - baseDao.deleteHandleProcessByItemGridPlatFormId(itemGridPlatformId); - } - @Override public GridPlatformHandleLogDTO getLastHandleProcess(String itemGridPlatformId) { return baseDao.selectOneOfLastProcessLog(itemGridPlatformId); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index e99c0e137..6dfd4e324 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -125,7 +125,7 @@ import java.util.stream.Collectors; @Service public class ItemServiceImpl extends BaseServiceImpl implements ItemService { - private Logger logger = LogManager.getLogger(ItemServiceImpl.class); + private final Logger logger = LogManager.getLogger(ItemServiceImpl.class); @Autowired private EpdcEventsService epdcEventsService; @@ -662,7 +662,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId()); log.info("执法照片imageList：" + imageList); //诉求照片 - StringBuffer sqzp = new StringBuffer(""); + StringBuffer sqzp = new StringBuffer(); imageList.forEach(img -> { sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); @@ -1063,6 +1063,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem for (ItemDeptDTO dto : itemDeptDTOS) { if (dto.getDeptId().equals(completeDeptDTO.getCommunityId())) { communitySelected = true; + break; } } } @@ -2308,11 +2309,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (null == thirdCate || StringUtils.isBlank(thirdCate.getEventCategoryCode())) { sendDto.setSJLYU("21"); sendDto.setSJDL("2199"); - return; } else { sendDto.setSJLYU(thirdCate.getEventCategoryCode().substring(0, 2)); sendDto.setSJDL(thirdCate.getEventCategoryCode()); - return; } } @@ -3252,7 +3251,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem wrapper.eq("REFERENCE_ID", entity.getEventId() == null ? entity.getId() : entity.getEventId()); List imageList = imgDao.selectList(wrapper); //诉求照片 - StringBuffer sqzp = new StringBuffer(""); + StringBuffer sqzp = new StringBuffer(); imageList.forEach(img -> { sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); @@ -3327,7 +3326,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId()); log.info("发展照片imageList：" + imageList); //诉求照片 - StringBuffer sqzp = new StringBuffer(""); + StringBuffer sqzp = new StringBuffer(); imageList.forEach(img -> { sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); @@ -3753,7 +3752,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridPartyname("结案"); itemHandleProcessDto.setGridTaskcnname("区中心"); item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); - // 可以进行评价了 + // 可以进行评价了，默认评分-满意 + item.setEvaluationScore(ItemEvaluationLevel.LEVALUATION_LEVEL_BETTER); item.setEvaluationState(NumConstant.ONE_STR); updateById(item); } else if ("1".equals(formDto.getState())) { @@ -3921,9 +3921,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //入参集合为空或者集合里时间参数都为空时 if (params.isEmpty() || ( (!params.containsKey("startTime") || StringUtils.isEmpty(params.get("startTime").toString())) - && (!params.containsKey("endTime") || StringUtils.isEmpty(params.get("endTime").toString())) - && (!params.containsKey("statMonth") || StringUtils.isEmpty(params.get("statMonth").toString())) - && (!params.containsKey("statYear") || StringUtils.isEmpty(params.get("statYear").toString()))) + && (!params.containsKey("endTime") || StringUtils.isEmpty(params.get("endTime").toString()))) ) { DateTime dateTime = new DateTime(new Date()); Date d = dateTime.plusDays(-1).toDate(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index a2032d1e6..34344a5c4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -74,7 +74,7 @@ import java.util.List; @Service public class PushToCityGridServiceImpl implements PushToCityGridService { - private Logger logger = LogManager.getLogger(PushToCityGridServiceImpl.class); + private final Logger logger = LogManager.getLogger(PushToCityGridServiceImpl.class); @Resource private ItemHandleProcessDao itemHandleProcessDao; @@ -240,7 +240,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR)); //所属部门id czr.setSsbmbm(item.getGridUnitid()); - ; // 所属部门名称 czr.setSsbm(item.getGridUnitname()); @@ -556,7 +555,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setSsjg(item.getGridUnitname()); // 所属部门id dto.setSsbmbm(item.getGridUnitid()); - ; // 所属部门名称 dto.setSsbm(item.getGridUnitname()); @@ -838,7 +836,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { //延期时限 诉求处理的最后时限 如：2022-09-01 18:23:00前完成 long hour = 0; if (StringUtils.isNotBlank(item.getGridDelayhour())) { - hour = 3600 * 1000 * Integer.parseInt(item.getGridDelayhour()); + hour = 3600L * 1000 * Integer.parseInt(item.getGridDelayhour()); } dto.setYqsx(DateUtils.format(new Date(item.getCreatedTime().getTime() + hour), DateUtils.DATE_TIME_PATTERN)); dto.setSqsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN)); @@ -887,7 +885,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { //延期时间(创建时间加小时数) 审核通过的才能加延期时限 long hour = 0; if (StringUtils.isNotBlank(item.getGridDelayresult()) && "1".equals(item.getGridDelayresult()) && StringUtils.isNotBlank(item.getGridDelayhour())) { - hour = 3600 * 1000 * Integer.parseInt(item.getGridDelayhour()); + hour = 3600L * 1000 * Integer.parseInt(item.getGridDelayhour()); } dto.setYqsj(DateUtils.format(new Date(item.getCreatedTime().getTime() + hour), DateUtils.DATE_TIME_PATTERN)); dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN)); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java index ad63bf9f7..a7f2f5183 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java @@ -79,7 +79,7 @@ public interface ScreenDeptEventEfficiencyDao extends BaseDao getScreenDataByInterval(EventStatisticsFormDTO formDTO); - void deleteData(@Param("statDate") String statDate); + void deleteData(@Param("statDate") String statDate, @Param("level") String level); /** * 柱状图 @@ -89,4 +89,41 @@ public interface ScreenDeptEventEfficiencyDao extends BaseDao getEventBar(EventStatisticsFormDTO formDTO); + + + /** + * 区直部门日统计 + * @Param statDate + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2022/10/11 15:50 + */ + List getDeptEventEfficiencyDaily(@Param("statDate") String statDate); + + /** + * 区直部门月统计 + * @Param statDate + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2022/10/11 15:50 + */ + List getDeptEventEfficiencyMonthly(@Param("statDate") String statDate); + + /** + * 区直部门年统计 + * @Param statDate + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2022/10/11 15:50 + */ + List getDeptEventEfficiencyYearly(@Param("statDate") String statDate); + + /** + * 获取区直部门大屏数据-自定义时间区间 + * @Param formDTO + * @Return {@link List< EfficiencyEvaluationResultDTO>} + * @Author zhaoqifeng + * @Date 2022/10/12 14:40 + */ + List getDeptScreenDataByInterval(EventStatisticsFormDTO formDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/CalenderServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/CalenderServiceImpl.java index e755da2d6..15615e556 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/CalenderServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/CalenderServiceImpl.java @@ -36,8 +36,8 @@ import java.util.List; @Slf4j public class CalenderServiceImpl extends BaseServiceImpl implements CalenderService { - private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); @Override public void initWorkDay(String currentDate) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java index 8a9af0d41..9aa781f2b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java @@ -68,65 +68,13 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl list = baseDao.getEventEfficiencyDaily(statDate); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setStatDate(statDate); - if (item.getEventCount() != NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); - BigDecimal eventCount = new BigDecimal(item.getEventCount()); - BigDecimal closedCount = new BigDecimal(item.getClosedCount()); - BigDecimal responseCount = new BigDecimal(item.getResponseCount()); - BigDecimal satisfiedCount = new BigDecimal(item.getSatisfiedCount()); - item.setClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - item.setResponseRatio(responseCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - if (item.getClosedCount() != NumConstant.ZERO) { - item.setSatisfiedRatio(satisfiedCount.multiply(hundred).divide(closedCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - } - } - - if (item.getLivelihoodCount() != NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); - BigDecimal eventCount = new BigDecimal(item.getLivelihoodCount()); - BigDecimal closedCount = new BigDecimal(item.getLivelihoodClosedCount()); - BigDecimal responseCount = new BigDecimal(item.getLivelihoodResponseCount()); - BigDecimal satisfiedCount = new BigDecimal(item.getLivelihoodSatisfiedCount()); - item.setLivelihoodClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - item.setLivelihoodResponseRatio(responseCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - if (item.getLivelihoodClosedCount() != NumConstant.ZERO) { - item.setLivelihoodSatisfiedRatio(satisfiedCount.multiply(hundred).divide(closedCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - } - } - - if (item.getDevelopCount() != NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); - BigDecimal eventCount = new BigDecimal(item.getDevelopCount()); - BigDecimal closedCount = new BigDecimal(item.getDevelopClosedCount()); - BigDecimal responseCount = new BigDecimal(item.getDevelopResponseCount()); - BigDecimal satisfiedCount = new BigDecimal(item.getDevelopSatisfiedCount()); - item.setDevelopClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - item.setDevelopResponseRatio(responseCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - if (item.getDevelopClosedCount() != NumConstant.ZERO) { - item.setDevelopSatisfiedRatio(satisfiedCount.multiply(hundred).divide(closedCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - } - } + getData(statDate, list); - if (item.getLawCount() != NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); - BigDecimal eventCount = new BigDecimal(item.getLawCount()); - BigDecimal closedCount = new BigDecimal(item.getLawClosedCount()); - BigDecimal responseCount = new BigDecimal(item.getLawResponseCount()); - BigDecimal satisfiedCount = new BigDecimal(item.getLawSatisfiedCount()); - item.setLawClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - item.setLawResponseRatio(responseCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - if (item.getLawClosedCount() != NumConstant.ZERO) { - item.setLawSatisfiedRatio(satisfiedCount.multiply(hundred).divide(closedCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - } - } - }); - baseDao.deleteData(statDate); - insertBatch(list); - } + //区直部门统计 + List deptList = baseDao.getDeptEventEfficiencyDaily(statDate); + getDeptData(statDate, deptList); } /** @@ -147,25 +95,11 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl list = baseDao.getEventEfficiencyMonthly(statDate); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setStatDate(statDate); - if (item.getEventCount() != NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); - BigDecimal eventCount = new BigDecimal(item.getEventCount()); - BigDecimal closedCount = new BigDecimal(item.getClosedCount()); - BigDecimal responseCount = new BigDecimal(item.getResponseCount()); - BigDecimal satisfiedCount = new BigDecimal(item.getSatisfiedCount()); - item.setClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - item.setResponseRatio(responseCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - if (item.getClosedCount() != NumConstant.ZERO) { - item.setSatisfiedRatio(satisfiedCount.multiply(hundred).divide(closedCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); - } - } - }); - baseDao.deleteData(statDate); - insertBatch(list); - } + getData(statDate, list); + + //区直部门统计 + List deptList = baseDao.getDeptEventEfficiencyMonthly(statDate); + getDeptData(statDate, deptList); } /** @@ -186,6 +120,51 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl list = baseDao.getEventEfficiencyYearly(statDate); + getData(statDate, list); + + //区直部门统计 + List deptList = baseDao.getDeptEventEfficiencyYearly(statDate); + getDeptData(statDate, deptList); + } + + private void getDeptData(String statDate, List deptList) { + if (CollectionUtils.isNotEmpty(deptList)) { + deptList.forEach(item -> { + item.setStatDate(statDate); + if (item.getEventCount() != NumConstant.ZERO) { + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + BigDecimal eventCount = new BigDecimal(item.getEventCount()); + BigDecimal closedCount = new BigDecimal(item.getClosedCount()); + item.setClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); + } + + if (item.getLivelihoodCount() != NumConstant.ZERO) { + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + BigDecimal eventCount = new BigDecimal(item.getLivelihoodCount()); + BigDecimal closedCount = new BigDecimal(item.getLivelihoodClosedCount()); + item.setLivelihoodClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); + } + + if (item.getDevelopCount() != NumConstant.ZERO) { + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + BigDecimal eventCount = new BigDecimal(item.getDevelopCount()); + BigDecimal closedCount = new BigDecimal(item.getDevelopClosedCount()); + item.setDevelopClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); + } + + if (item.getLawCount() != NumConstant.ZERO) { + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + BigDecimal eventCount = new BigDecimal(item.getLawCount()); + BigDecimal closedCount = new BigDecimal(item.getLawClosedCount()); + item.setLawClosedRatio(closedCount.multiply(hundred).divide(eventCount, NumConstant.SIX, RoundingMode.HALF_UP).stripTrailingZeros()); + } + }); + baseDao.deleteData(statDate, NumConstant.TWO_STR); + insertBatch(deptList); + } + } + + private void getData(String statDate, List list) { if (CollectionUtils.isNotEmpty(list)) { list.forEach(item -> { item.setStatDate(statDate); @@ -201,8 +180,47 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl list = baseDao.getScreenDataByInterval(formDTO); + List list; + if (NumConstant.ONE_STR.equals(formDTO.getType())) { + list = baseDao.getScreenDataByInterval(formDTO); + } else { + list = baseDao.getDeptScreenDataByInterval(formDTO); + } if (CollectionUtils.isNotEmpty(list)) { list.forEach(item -> { if ("grid_party".equals(item.getDeptLevel())) { @@ -243,17 +266,19 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl - - - - DELETE FROM epdc_grid_platform_handle_log WHERE ITEM_GRID_PLATFORM_ID = #{itemGridPlatformId} - - - - - - DELETE FROM epdc_item_handle_process WHERE ID IN - - #{id} - - - - SELECT - case - when c3.category_code is null then c1.category_code - when c4.category_code is null then c2.category_code - when c5.category_code is null then c3.category_code - when c6.category_code is null then c4.category_code - when c7.category_code is null then c5.category_code - when c8.category_code is null then c6.category_code - end as category - FROM epdc_item t - left join `epdc_category` c1 on t.CATEGORY_CODE=c1.category_code and c1.enable_flag='1' and c1.del_flag='0' - left join epdc_category c2 on c1.pid=c2.id and c2.enable_flag='1' and c2.del_flag='0' - left join epdc_category c3 on c2.pid=c3.id and c3.enable_flag='1' and c3.del_flag='0' - left join epdc_category c4 on c3.pid=c4.id and c4.enable_flag='1' and c4.del_flag='0' - left join epdc_category c5 on c4.pid=c5.id and c5.enable_flag='1' and c5.del_flag='0' - left join epdc_category c6 on c5.pid=c6.id and c6.enable_flag='1' and c6.del_flag='0' - left join epdc_category c7 on c6.pid=c7.id and c7.enable_flag='1' and c7.del_flag='0' - left join epdc_category c8 on c7.pid=c8.id and c8.enable_flag='1' and c8.del_flag='0' - where - t.id=#{id} - and t.FIRST_CATEGORY_CODE!=t.category_code - + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml index c37448c46..e8dd59e40 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml @@ -2,10 +2,6 @@ - - INSERT INTO epdc_item_handle_process ( ID, ITEM_ID, STATE, HANDLE_ADVICE, OUT_HANDLE_ADVICE, HANDLER_DEPT, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DEL_FLAG , GRID_PARTYID , GRID_PARTYNAME , GRID_UNITID , GRID_UNITNAME , GRID_NEXTPARTID , GRID_NEXTPARTNAME , GRID_NEXTUNITID , GRID_NEXTUNITNAME , GRID_TASKCNNAME) - VALUES (#{id}, #{itemId}, #{state}, #{handleAdvice}, #{outHandleAdvice}, #{handlerDept}, 0, '网格化平台', #{createdTime}, '网格化平台', #{updatedTime}, '0',#{gridPartyid} ,#{gridPartyname} , #{gridNextunitid}, #{gridNextunitname}, #{gridNextpartid},#{gridNextpartname} , #{gridNextunitid}, #{gridNextunitname}, #{gridTaskcnname}) - UPDATE epdc_item_handle_process SET HANDLER_DEPT = #{newDeptName}, UPDATED_TIME = NOW() WHERE HANDLER_DEPT_ID = #{deptId} @@ -21,17 +17,6 @@ limit 1 - - - - - SELECT a.id AS deptId, @@ -107,6 +114,8 @@ GROUP BY ALL_DEPT_IDS ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%') WHERE a.del_flag = '0' + AND a.type_key != 'street_dept' + AND a.type_key != 'district_dept' GROUP BY a.id + + + + + + \ No newline at end of file