Merge remote-tracking branch 'origin/feature/bssb_screen' into feature/bssb_screen

# Conflicts:
#	esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryAnalysisPieResultDTO.java

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("解析用户手机号失败");
     }

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";
 }

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;
 
 }

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;
 
 
 /**

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;
 
 
 /**

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;
 
 
 /**

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;
 
 
 /**

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 {

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;
 
 
 /**

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;
 
 /**

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;
 

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;
 

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;

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;
 
 
 /**

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

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;
 }

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;
 
 
 /**

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;
 
 
 /**

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;
 
 
 /**

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;
 
 /**

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;
 
 /**

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 {

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

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;
 
 /**
  * 移动端-议题最新最热列表

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;
 
 
 /**

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;
 
 /**
  * 项目表 项目表

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;
 
 
 /**

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;
 
 
 /**

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;
 
 
 /**

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

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;
 

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

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;
 }

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

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;
 
 /**

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;
 
 /**

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;
 

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;
 

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：是
      */

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;
 
 /**

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

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 {

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;
-
 /**
  * 退件审核
  *

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;
-
 /**
  * 退件审核
  *

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;
 
 /**
  * 部门信息

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 {

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

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

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

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

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;
 

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

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 {

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;
-
 /**
  * 退件审核
  *

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;
-
 /**
  * 诉求退件
  *

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 {

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;
 
 
 /**

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;
 
 
 /**

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;
 
 
 /**

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;
 
 
 /**

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;
 
 
 /**

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<ItemHandleResultDTO> getHandleCategoriesForGirdNew() {
         List<ItemHandleResultDTO> 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;
     }
 

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<CategoryDao, CategoryEn
 	@Autowired
 	private CategoryModifyProducer categoryModifyProducer;
 
-	private Logger logger = LoggerFactory.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(getClass());
 
 	@Override
 	public List<CategoryDTO> list(Map<String, Object> params) {
@@ -245,7 +244,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 		if (subList.size() > 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<CategoryDao, CategoryEn
 			QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<CategoryEntity>(categoryEntity);
 			List<CategoryEntity> 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<CategoryDao, CategoryEn
 							if(!"".equals(value) && !fourthClassInfoCode.equals(value)){
 								fourthClassInfoCode = value;
 							}
-						} else if (c == 7) {
+						} else {
 							//细类名称列
 							fourthClassNameCurrent = "";
 							String value = ExcelUtils.getCellContent(cell);
@@ -474,7 +471,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 			Guid=100;
 		}
 		ran=Guid;
-		String str = time+currentTimeMillis.substring(1, currentTimeMillis.length())+ran;
+		String str = time+currentTimeMillis.substring(1)+ran;
 		return Long.parseLong(str);
 	}
 
@@ -510,27 +507,6 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 		return entity;
 	}
 
-	/**
-	 * 验证EXCEL文件
-	 * @param filePath
-	 * @return
-	 */
-	public boolean validateExcel(String filePath) {
-		if (filePath == null || !(isExcel2003(filePath) || isExcel2007(filePath))) {
-			return false;
-		}
-		return true;
-	}
-
-	// @描述：是否是2003的excel，返回true是2003
-	public static boolean isExcel2003(String filePath) {
-		return filePath.matches("^.+\\.(?i)(xls)$");
-	}
-	// @描述：是否是2007的excel，返回true是2007
-	public static boolean isExcel2007(String filePath) {
-		return filePath.matches("^.+\\.(?i)(xlsx)$");
-	}
-
 	/**
 	 * @param
 	 * @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -573,14 +549,14 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
             }
             List<String> 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<CategoryDao, CategoryEn
         JSONArray headNodes = new JSONArray();
         for (CategoryTreeDTO categoryTreeDto : dtoList) {
 
-            if (categoryTreeDto.getPid().longValue() == NumConstant.ZERO_L) {
+            if (categoryTreeDto.getPid() == NumConstant.ZERO_L) {
                 node = new JSONObject();
                 node.put("value", categoryTreeDto.getId());
                 node.put("label", categoryTreeDto.getCategoryName());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -340,9 +340,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             issueHandleEntity.setAdvice(dto.getAdvice());
             issueHandleEntity.setHandlerDeptId(dto.getHandlerDeptId());
             issueHandleEntity.setHandlerDept(dto.getHandlerDept());
-//            UserDetail user = SecurityUser.getUser();
-            /*issueHandleEntity.setHandlerDeptId(user.getDeptId());
-            issueHandleEntity.setHandlerDept(user.getDeptName());*/
+
             issueHandleService.insert(issueHandleEntity);
 
             informationFormDTO.setBusinessId(issueEntity.getId());
@@ -358,8 +356,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
         imgService.saveImages(dto.getImages(), referenceId, imageType);
 
-        // 插入部门响应记录
-        // deptRespondTask.saveEventDeptRespond(dto);
         // 发送消息
         newsTask.insertUserInformation(informationFormDTO);
         // 发送菜单消息-议题待回应
@@ -383,10 +379,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         QueryWrapper<IssueEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(eventId), "EVENT_ID", eventId);
         List<IssueEntity> 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<EpdcEventsDao, EpdcEv
             issueLimitHour = Integer.parseInt(obj.toString());
         }
 
-        List<KpiEventReportAmountResultDTO> list = baseDao.statEventReportAmount(eventReportAmountFormDto, issueLimitHour);
-
-        return list;
+        return baseDao.statEventReportAmount(eventReportAmountFormDto, issueLimitHour);
     }
 
     @Override
@@ -751,27 +742,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
                 entity.setParentDeptNames(dto.getAllDeptNames());
 
             }
-//            if (StringUtils.isNotEmpty(events.getParentDeptIds()) && StringUtils.isNotEmpty(events.getParentDeptNames())) {
-//                List<String> parentDeptIds = Arrays.asList(events.getParentDeptIds().split(","));
-//                List<String> 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<String> allDeptIds = Arrays.asList(events.getAllDeptIds().split(","));
-//                List<String> 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<EpdcEventsDao, EpdcEv
 
     @Override
     public List<EpdcRejectEventsDTO> rejectEventsExportList(Map<String, Object> params) {
-        List<EpdcRejectEventsDTO> list = baseDao.selectListOfRejectEvents(params);
-        return list;
+        return baseDao.selectListOfRejectEvents(params);
     }
 
 

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;

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<IssueDao, IssueEntity> imp
         QueryWrapper<ItemEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(issueId), "ISSUE_ID", issueId);
         List<ItemEntity> 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<IssueDao, IssueEntity> imp
                 entity.setParentDeptNames(dto.getAllDeptNames());
 
             }
-//            if (StringUtils.isNotEmpty(issue.getParentDeptIds()) && StringUtils.isNotEmpty(issue.getParentDeptNames())) {
-//                List<String> parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(","));
-//                List<String> 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<String> allDeptIds = Arrays.asList(issue.getAllDeptIds().split(","));
-//                List<String> 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);
         }

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<GridPlatformHandleLogEntity> {
 
-    /**
-     *
-     * 根据网格化平台项目关系表ID获取历史处理记录
-     *
-     * @params [itemGridPlatformId]
-     * @return java.util.List<java.lang.String>
-     * @author liuchuang
-     * @since 2019/12/25 19:17
-     */
-    List<String> selectListOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId);
-
-    /**
-     *
-     * 根据网格化平台项目关系表ID清空处理记录
-     *
-     * @params [itemGridPlatformId]
-     * @return void
-     * @author liuchuang
-     * @since 2019/12/25 18:58
-     */
-    void deleteHandleProcessByItemGridPlatFormId(String itemGridPlatformId);
-
     /**
      *
      * 获取网格化平台最新处理情况

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<ItemEntity> {
      */
     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<ItemEntity> {
     List<KpiItemHandleAmountResultDTO> selectListItemCloseAmount(@Param("timeLimitList") List<KpiItemTimeLimitByDeptResultDTO> kpiItemTimeLimitByDeptList,
                                                                  @Param("metaDataCode") String metaDataCode);
 
-    /**
-     * 删除项目处理进度表历史记录
-     *
-     * @return void
-     * @params [ids]
-     * @author liuchuang
-     * @since 2019/12/25 19:23
-     */
-    void deleteBatchItemHandleIds(@Param("ids") List<String> ids);
-
     /**
      * @Description: 根据项目id，查询当前登录人所在部门，以外的该项目关联的所有部门id
      * @Param: [itemId] 项目id
@@ -409,15 +389,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     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<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>
      * @describe: 北尚诉求列表

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<ItemHandleProcessEntity> {
 
-    /**
-     * 保存处理进度
-     *
-     * @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<ItemHandleProcessEntity> {
      */
     ItemHandleProcessCaseClosedToCityDTO getHandler(@Param("id") String id);
 
-
-    /**
-     * 诉求派遣
-     *
-     * @param state
-     * @return
-     */
-    List<ItemHandleProcessToCityResultDTO> getProcessListByState(@Param("state") String state);
-
-
     /**
      * 根据流程编号和日期获取流程数据
      *
@@ -96,16 +76,6 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
      */
     List<ItemHandleProcessDTO> listProcessByStateAndDate(@Param("state") String state, @Param("date") String date);
 
-    /**
-     * 派遣审核
-     *
-     * @param state
-     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO>
-     * @author LZN
-     * @date 2022/9/19 10:25
-     */
-    List<ItemHandleProcessToCityResultDTO> getDispatchAudit(@Param("state") String state);
-
     /**
      * 诉求上报
      *
@@ -118,6 +88,7 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
 
     /**
      * 上报驳回
+     *
      * @param id
      * @return
      */
@@ -125,10 +96,11 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
 
     /**
      * 诉求处理
+     *
      * @param id
      * @return
      */
-   AppealHandlingToCityResultDTO getAppealHandling(@Param("id") String id,@Param("itemId") String itemId);
+    AppealHandlingToCityResultDTO getAppealHandling(@Param("id") String id, @Param("itemId") String itemId);
 
     List<String> getURL(String itemId);
 }

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<GridPlatformHa
      */
     void delete(String[] ids);
 
-    /**
-     * 根据网格化平台项目关系表ID获取历史处理记录
-     *
-     * @return java.util.List<java.lang.String>
-     * @params [itemGridPlatformId]
-     * @author liuchuang
-     * @since 2019/12/25 19:17
-     */
-    List<String> listOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId);
-
-    /**
-     * 根据网格化平台项目关系表ID清空处理记录
-     *
-     * @return void
-     * @params [itemGridPlatformId]
-     * @author liuchuang
-     * @since 2019/12/25 18:56
-     */
-    void removeHandleProcessByItemGridPlatFormId(String itemGridPlatformId);
-
     /**
      * 获取网格化平台最新处理情况
      *

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<GridPlatformHandleLogDao, GridPlatformHandleLogEntity> implements GridPlatformHandleLogService {
 
-    @Autowired
-    private GridPlatformHandleLogRedis gridPlatformHandleLogRedis;
-
     @Override
     public PageData<GridPlatformHandleLogDTO> page(Map<String, Object> params) {
         IPage<GridPlatformHandleLogEntity> page = baseDao.selectPage(
@@ -101,17 +96,6 @@ public class GridPlatformHandleLogServiceImpl extends BaseServiceImpl<GridPlatfo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-    @Override
-    public List<String> 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);

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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
         List<ImgEntity> 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<ItemDao, ItemEntity> implem
             for (ItemDeptDTO dto : itemDeptDTOS) {
                 if (dto.getDeptId().equals(completeDeptDTO.getCommunityId())) {
                     communitySelected = true;
+                    break;
                 }
             }
         }
@@ -2308,11 +2309,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
         wrapper.eq("REFERENCE_ID", entity.getEventId() == null ? entity.getId() : entity.getEventId());
         List<ImgEntity> 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<ItemDao, ItemEntity> implem
         List<ImgEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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();

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));

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<ScreenDeptEventEff
      */
     List<EfficiencyEvaluationResultDTO> 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<ScreenDeptEventEff
      * @Date 2022/10/18 10:06
      */
     List<EfficiencyEvaluationResultDTO> getEventBar(EventStatisticsFormDTO formDTO);
+
+
+    /**
+     * 区直部门日统计
+     * @Param statDate
+     * @Return {@link List<ScreenDeptEventEfficiencyEntity>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:50
+     */
+    List<ScreenDeptEventEfficiencyEntity> getDeptEventEfficiencyDaily(@Param("statDate") String statDate);
+
+    /**
+     * 区直部门月统计
+     * @Param statDate
+     * @Return {@link List<ScreenDeptEventEfficiencyEntity>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:50
+     */
+    List<ScreenDeptEventEfficiencyEntity> getDeptEventEfficiencyMonthly(@Param("statDate") String statDate);
+
+    /**
+     * 区直部门年统计
+     * @Param statDate
+     * @Return {@link List<ScreenDeptEventEfficiencyEntity>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:50
+     */
+    List<ScreenDeptEventEfficiencyEntity> getDeptEventEfficiencyYearly(@Param("statDate") String statDate);
+
+    /**
+     * 获取区直部门大屏数据-自定义时间区间
+     * @Param formDTO
+     * @Return {@link List< EfficiencyEvaluationResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/12 14:40
+     */
+    List<EfficiencyEvaluationResultDTO> getDeptScreenDataByInterval(EventStatisticsFormDTO formDTO);
 }

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<CalenderDao, CalenderEntity> 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) {

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<Screen
         } else {
             statDate = formDTO.getStatDate();
         }
+        //下级部门统计
         List<ScreenDeptEventEfficiencyEntity> 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<ScreenDeptEventEfficiencyEntity> deptList = baseDao.getDeptEventEfficiencyDaily(statDate);
+        getDeptData(statDate, deptList);
     }
 
     /**
@@ -147,25 +95,11 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
             statDate = formDTO.getStatDate();
         }
         List<ScreenDeptEventEfficiencyEntity> 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<ScreenDeptEventEfficiencyEntity> deptList = baseDao.getDeptEventEfficiencyMonthly(statDate);
+        getDeptData(statDate, deptList);
     }
 
     /**
@@ -186,6 +120,51 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
             statDate = formDTO.getStatDate();
         }
         List<ScreenDeptEventEfficiencyEntity> list = baseDao.getEventEfficiencyYearly(statDate);
+        getData(statDate, list);
+
+        //区直部门统计
+        List<ScreenDeptEventEfficiencyEntity> deptList = baseDao.getDeptEventEfficiencyYearly(statDate);
+        getDeptData(statDate, deptList);
+    }
+
+    private void getDeptData(String statDate, List<ScreenDeptEventEfficiencyEntity> 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<ScreenDeptEventEfficiencyEntity> list) {
         if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(item -> {
                 item.setStatDate(statDate);
@@ -201,8 +180,47 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
                         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());
+                    }
+                }
+
+                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);
+            baseDao.deleteData(statDate, NumConstant.ONE_STR);
             insertBatch(list);
         }
     }
@@ -230,7 +248,12 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
             formDTO.setStatDate(DateUtils.format(new Date(), DateUtils.DATE_PATTERN).substring(0, 4));
         } else {
             //自定义区间
-            List<EfficiencyEvaluationResultDTO> list = baseDao.getScreenDataByInterval(formDTO);
+            List<EfficiencyEvaluationResultDTO> 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<Screen
                         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());
                         String closedRatio = closedCount.multiply(hundred).divide(eventCount, NumConstant.ONE, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
-                        String responseRatio = responseCount.multiply(hundred).divide(eventCount, NumConstant.ONE, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
                         item.setClosedRatio(closedRatio.concat("%"));
-                        item.setResponseRatio(responseRatio.concat("%"));
-                        if (item.getClosedCount() != NumConstant.ZERO) {
-                            String satisfiedRatio = satisfiedCount.multiply(hundred).divide(closedCount, NumConstant.ONE, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
-                            item.setSatisfiedRatio(satisfiedRatio.concat("%"));
-                        } else {
-                            item.setSatisfiedRatio("0%");
+                        if (NumConstant.ONE_STR.equals(formDTO.getType())) {
+                            BigDecimal responseCount = new BigDecimal(item.getResponseCount());
+                            BigDecimal satisfiedCount = new BigDecimal(item.getSatisfiedCount());
+                            String responseRatio = responseCount.multiply(hundred).divide(eventCount, NumConstant.ONE, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
+                            item.setResponseRatio(responseRatio.concat("%"));
+                            if (item.getClosedCount() != NumConstant.ZERO) {
+                                String satisfiedRatio = satisfiedCount.multiply(hundred).divide(closedCount, NumConstant.ONE, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
+                                item.setSatisfiedRatio(satisfiedRatio.concat("%"));
+                            } else {
+                                item.setSatisfiedRatio("0%");
+                            }
                         }
                     } else {
                         item.setClosedRatio("0%");
@@ -323,12 +348,12 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
                 //默认排序
                 if (NumConstant.TWO_STR.equals(formDTO.getType())) {
                     //直属部门
-                    list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getEventCount).reversed()).collect(Collectors.toList());
+                    list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio).reversed()).collect(Collectors.toList());
                 } else {
                     //下级组织
-                    list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getResponseRatio).reversed()
+                    list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio).reversed()
                             .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio, Comparator.reverseOrder())
-                            .thenComparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio, Comparator.reverseOrder())
+                            .thenComparing(EfficiencyEvaluationResultDTO::getResponseRatio, Comparator.reverseOrder())
                     ).collect(Collectors.toList());
                 }
             }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java

@@ -64,7 +64,7 @@ public class ScreenServiceImpl implements ScreenService {
         resultDTO.setDeptId(formDTO.getDeptId());
         resultDTO.setPeopleFlag(formDTO.getPeopleFlag());
         //1.入参时间有值的按时间查，没值的默认查截止到昨天的数据
-        if(StringUtils.isEmpty(formDTO.getStatDate())&&StringUtils.isEmpty(formDTO.getStatMonth())&&StringUtils.isEmpty(formDTO.getStatYear())){
+        if(StringUtils.isEmpty(formDTO.getStartTime())&&StringUtils.isEmpty(formDTO.getEndTime())){
             DateTime dateTime = new DateTime(new Date());
             Date d = dateTime.plusDays(-1).toDate();
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/utils/ShowApiUtil.java

@@ -15,7 +15,7 @@ import java.nio.charset.StandardCharsets;
  * @Description 万维易源-api工具类
  */
 public class ShowApiUtil {
-    private static Logger logger = LoggerFactory.getLogger(ShowApiUtil.class);
+    private static final Logger logger = LoggerFactory.getLogger(ShowApiUtil.class);
 
     /**
      * @param day 输入格式yyyyMMdd。如果不输入，则默认是当天

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml

@@ -35,14 +35,6 @@
         <result property="banliResult" column="BanliResult"/>
     </resultMap>
 
-    <select id="selectListOfHandleProcessLogByItemGridPlatFormId" resultType="string">
-        SELECT ITEM_HANDLE_PROCESS_ID FROM epdc_grid_platform_handle_log WHERE DEL_FLAG = '0' AND ITEM_GRID_PLATFORM_ID = #{itemGridPlatformId}
-    </select>
-
-    <delete id="deleteHandleProcessByItemGridPlatFormId">
-        DELETE FROM epdc_grid_platform_handle_log WHERE ITEM_GRID_PLATFORM_ID = #{itemGridPlatformId}
-    </delete>
-
     <select id="selectOneOfLastProcessLog" resultType="com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO">
         SELECT
             *

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -1371,32 +1371,6 @@
         ORDER BY img.CREATED_TIME
     </select>
 
-    <select id="selectCountOfItemDeptNotice" resultType="int">
-        SELECT
-            COUNT( ID ) AS num
-        FROM
-            epdc_item
-        WHERE
-            DEL_FLAG = '0'
-            AND GRID_ID = #{deptId}
-            AND EVENT_ID is not null
-            AND ITEM_STATE = #{state}
-            AND ID NOT IN (
-            SELECT
-                ITEM_ID
-            FROM
-                epdc_item_handle_process
-            WHERE
-                DEL_FLAG = '0'
-                AND HANDLER_DEPT_ID = #{deptId}
-                AND STATE = 0
-            GROUP BY
-                ITEM_ID
-            HAVING
-            COUNT( ID ) > 1
-            )
-    </select>
-
     <select id="selectCountOfItemWhistlingDeptNotice" resultType="int">
         SELECT
             COUNT( ID ) AS num
@@ -1515,13 +1489,6 @@
         ) noticeTable ON pendingTable.keystr = noticeTable.keystr
     </select>
 
-    <delete id="deleteBatchItemHandleIds">
-        DELETE FROM epdc_item_handle_process WHERE ID IN
-        <foreach item="id" collection="ids" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
     <select id="queryDeptIdList" resultType="Long">
         SELECT
             distinct d.DEPT_ID deptId
@@ -1692,29 +1659,7 @@
     <update id="rejectItemSatisfactionInfo">
         update epdc_item set EVALUATION_SCORE = null,EVALUATION_CONTENT = null,EVALUATION_TIME = null where id = #{id}
     </update>
-    <select id="selectSecondCateByItemId" resultType="java.lang.String">
-        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
-    </select>
+
     <select id="getItemListByUserId" resultMap="itemsMap">
 
         SELECT distinct
@@ -2272,12 +2217,6 @@
         <if test="endTime != null and endTime != ''">
             AND DATE_FORMAT(a.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
         </if>
-        <if test="statMonth != null and statMonth != ''">
-            AND DATE_FORMAT(a.created_time,'%Y-%m') = #{statMonth}
-        </if>
-        <if test="statYear != null and statYear != ''">
-            AND DATE_FORMAT(a.created_time,'%Y') = #{statYear}
-        </if>
     </select>
     <select id="getItemStatisListPage" resultType="com.elink.esua.epdc.dto.item.result.ItemStatisListPageResultDTO">
         SELECT
@@ -2351,16 +2290,30 @@
         <if test="statDate != null and statDate != ''">
             AND DATE_FORMAT(i.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
         </if>
-        <if test="statMonth != null and statMonth != ''">
-            AND DATE_FORMAT(i.created_time,'%Y-%m') = #{statMonth}
-        </if>
-        <if test="statYear != null and statYear != ''">
-            AND DATE_FORMAT(i.created_time,'%Y') = #{statYear}
-        </if>
         <!-- 增加入参code 在类别分析页面点击饼图时需要展示列表因此增加入参共用列表接口 王gf-->
-        <if test="code != null and code != ''">
+        <if test='isElse != null and isElse == "1" and code != null and code != ""'>
             AND SUBSTRING_INDEX(i.category_full_code,'-',1) = #{code}
         </if>
+        <if test='isElse != null and isElse == "0" and code != null and code != ""'>
+            AND SUBSTRING_INDEX(i.category_full_code,'-',2) = #{code}
+        </if>
+        <choose>
+            <when test='lamp != null and lamp == "red"'>
+                and i.item_state='0' and getworkminute(i.created_time, now()) > 480
+            </when>
+            <when test='lamp != null and lamp == "yellow"'>
+                and i.item_state='0'
+                and getworkminute(i.created_time, now()) > 360
+                and getworkminute(i.created_time, now()) <![CDATA[ <= ]]> 480
+            </when>
+            <when test='lamp != null and lamp == "green"'>
+                and i.item_state='0' and getworkminute(i.created_time, now()) <![CDATA[ <= ]]> 360
+            </when>
+            <otherwise></otherwise>
+        </choose>
+        <if test="evaluationScore != null and evaluationScore != ''">
+            AND i.evaluation_score = #{evaluationScore}
+        </if>
         order by i.created_time DESC
     </select>
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml

@@ -2,10 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao">
-    <insert id="insertItemHandleProcess">
-        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})
-    </insert>
 
     <update id="updateDeptNameByDeptId">
         UPDATE epdc_item_handle_process SET HANDLER_DEPT = #{newDeptName}, UPDATED_TIME = NOW() WHERE HANDLER_DEPT_ID = #{deptId}
@@ -21,17 +17,6 @@
         limit 1
     </select>
 
-    <select id="getProcessListByState" resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
-        select
-        p.*
-
-
-        from epdc_item_handle_process p
-        where p.DEL_FLAG='0'
-        and p.STATE = #{state}
-        and date_format( p.CREATED_TIME, '%Y-%m-%d' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m-%d' )
-    </select>
-
     <select id="listProcessByStateAndDate" resultType="com.elink.esua.epdc.dto.item.ItemHandleProcessDTO">
         SELECT
             p.*
@@ -53,20 +38,6 @@
         AND SQID IS NOT NULL
         )
     </select>
-    <select id="getDispatchAudit"
-            resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
-        select
-            p.*
-        from
-            epdc_item_handle_process p
-        where
-            p.del_flag = 0
-        and
-            p.state = #{state}
-        and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
-    </select>
-
-
 
     <select id="getURL" resultType="java.lang.String">
         SELECT

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml

@@ -7,6 +7,13 @@
         FROM screen_dept_event_efficiency
         WHERE 1 = 1
           AND STAT_DATE = #{statDate}
+          <if test='level == "2"'>
+            AND (DEPT_LEVEL = 'street_dept' OR DEPT_LEVEL = 'district_dept')
+          </if>
+          <if test='level != "2"'>
+            AND DEPT_LEVEL != 'street_dept'
+            AND DEPT_LEVEL != 'district_dept'
+          </if>
     </delete>
     <select id="getEventEfficiencyDaily" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
         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
     </select>
     <select id="getEventEfficiencyMonthly" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
@@ -227,6 +236,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
     </select>
     <select id="getEventEfficiencyYearly" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
@@ -347,6 +358,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
     </select>
     <select id="getScreenData" resultType="com.elink.esua.epdc.dto.screen.result.EfficiencyEvaluationResultDTO">
@@ -417,11 +430,12 @@
                    </if>
             FROM screen_dept_event_efficiency
                     WHERE DEL_FLAG = '0'
-                      AND PID = #{deptId}
+
             <if test='type == "2"'>
                 AND (DEPT_LEVEL = 'street_dept' OR DEPT_LEVEL = 'district_dept')
             </if>
             <if test='type != "2"'>
+                AND PID = #{deptId}
                 AND DEPT_LEVEL != 'street_dept'
                 AND DEPT_LEVEL != 'district_dept'
             </if>
@@ -465,7 +479,7 @@
                         </choose>
                     </when>
                     <otherwise>
-                        ORDER BY EVENT_COUNT DESC
+                        ORDER BY CLOSED_RATIO+0 DESC
                     </otherwise>
                 </choose>
             </when>
@@ -505,7 +519,7 @@
                         </choose>
                     </when>
                     <otherwise>
-                        ORDER BY RESPONSE_RATIO+0 DESC, CLOSED_RATIO+0 DESC, SATISFIED_RATIO+0 DESC
+                        ORDER BY SATISFIED_RATIO+0 DESC, CLOSED_RATIO+0 DESC, RESPONSE_RATIO+0 DESC
                     </otherwise>
                 </choose>
             </otherwise>
@@ -605,12 +619,8 @@
                 GROUP BY ALL_DEPT_IDS
                 ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%')
         WHERE a.del_flag = '0'
-          <if test='type == "2"'>
-            AND (a.type_key = 'street_dept' OR a.type_key = 'district_dept')
-          </if>
-          <if test='type != "2"'>
-            AND a.type_key != 'street_dept' AND a.type_key != 'district_dept'
-          </if>
+          AND a.type_key != 'street_dept'
+          AND a.type_key != 'district_dept'
           AND a.PID = #{deptId}
         GROUP BY a.id
         ORDER BY a.sort,
@@ -660,4 +670,236 @@
         ORDER BY a.sort,
                  CONVERT(a.`name` USING gbk) ASC
     </select>
+    <select id="getDeptEventEfficiencyDaily" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
+        SELECT a.GRID_UNITID                                                                            AS deptId,
+               a.GRID_UNITNAME                                                                          AS deptName,
+               '0'                                                                                      AS pid,
+               '0'                                                                                      AS pids,
+               '1'                                                                                      AS statType,
+               'district_dept'                                                                          AS deptLevel,
+               0                                                                                        AS deptSort,
+               COUNT(DISTINCT a.ITEM_ID)                                                                AS eventCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '0' THEN a.ITEM_ID END)                           AS livelihoodCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '1' THEN a.ITEM_ID END)                           AS developCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '2' THEN a.ITEM_ID END)                           AS lawCount,
+               COUNT(DISTINCT CASE WHEN c.ITEM_ID IS NOT NULL THEN a.ITEM_ID END)                       AS closedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '0' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS livelihoodClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '1' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS developClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '2' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS lawClosedCount
+
+        FROM epdc_item_handle_process a
+        INNER JOIN epdc_item b ON a.ITEM_ID = b.ID
+                AND b.DEL_FLAG = '0'
+                AND PEOPLE_FLAG IS NOT NULL
+                AND IS_PEOPLE = '1'
+                AND EVENT_ID IS NULL
+                AND ISSUE_ID IS NULL
+                AND DATE_FORMAT(b.CREATED_TIME, '%Y-%m-%d') &lt;= #{statDate}
+        LEFT JOIN epdc_item_handle_process c ON a.ITEM_ID = c.ITEM_ID
+                AND c.DEL_FLAG = '0'
+                AND c.STATE = '60'
+                AND DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d') &lt;= #{statDate}
+        WHERE a.DEL_FLAG = '0'
+          AND a.GRID_CANTONCODE = '370203'
+          AND a.GRID_UNITNAME IS NOT NULL
+          AND a.GRID_UNITNAME != ''
+          AND a.GRID_UNITNAME != '北尚诉办'
+          AND a.GRID_PARTYID NOT IN (
+                '101', '1525', '1549', '1550', '1551', '1552', '1553', '1554', '1555', '1556', '1557', '1558', '1559', '1560',
+                '1561', '1562', '1563', '1564', '1565', '1566', '1567', '1568', '1569', '1570', '1571', '1572', '1573', '1574',
+                '1575', '1576', '1577', '1578', '1579', '1580', '1581', '1582', '1583', '1584', '1585', '1586', '1587', '1588',
+                '1589', '1590', '1591', '1592', '1593', '1594', '1595', '1596', '1597', '1598', '1599', '1600', '1601', '1602',
+                '1603', '1604', '1605', '1606', '1607', '1608', '1609', '1610', '1611', '1612', '1613', '1614', '1615', '1616',
+                '1617', '1618', '1619', '1620', '1621', '1622', '1623', '1624', '1625', '1626', '1627', '1628', '1629', '1630',
+                '1631', '1632', '1633', '1634', '1635', '1636', '1637', '1638', '1639', '1640', '1641', '1642', '1643', '2216',
+                '2247', '2248', '2252', '2254', '2255', '2258', '2259', '2261', '2265', '2267', '2271', '2272', '2275', '2280',
+                '2281', '2285', '2287', '2290', '2292', '2293', '2294', '2295', '2298', '2299', '4701', '7487', '7488', '7489',
+                '7490', '7491', '7492', '7493', '7494', '7495', '7496', '7497', '7498', '7499', '7500', '7501', '7502', '7503',
+                '7504', '8481', '9841', '10100', '14751', '19177', '130954', '248834', '257176', '1140746', '1607411', '1636766',
+                '1636767', '1976283', '3368267', '3368281', '3368284', '3368286', '3368288', '3368291', '3537573', '3537682', '4180987',
+                '4181079', '4400541', '4742418', '4860578', '4885731'
+                )
+        GROUP BY a.GRID_UNITID
+    </select>
+    <select id="getDeptEventEfficiencyMonthly" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
+        SELECT a.GRID_UNITID                                                                            AS deptId,
+               a.GRID_UNITNAME                                                                          AS deptName,
+               '0'                                                                                      AS pid,
+               '0'                                                                                      AS pids,
+               '2'                                                                                      AS statType,
+               'district_dept'                                                                          AS deptLevel,
+               0                                                                                        AS deptSort,
+               COUNT(DISTINCT a.ITEM_ID)                                                                AS eventCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '0' THEN a.ITEM_ID END)                           AS livelihoodCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '1' THEN a.ITEM_ID END)                           AS developCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '2' THEN a.ITEM_ID END)                           AS lawCount,
+               COUNT(DISTINCT CASE WHEN c.ITEM_ID IS NOT NULL THEN a.ITEM_ID END)                       AS closedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '0' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS livelihoodClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '1' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS developClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '2' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS lawClosedCount
+
+        FROM epdc_item_handle_process a
+        INNER JOIN epdc_item b ON a.ITEM_ID = b.ID
+                AND b.DEL_FLAG = '0'
+                AND PEOPLE_FLAG IS NOT NULL
+                AND IS_PEOPLE = '1'
+                AND EVENT_ID IS NULL
+                AND ISSUE_ID IS NULL
+                AND DATE_FORMAT(b.CREATED_TIME, '%Y-%m') = #{statDate}
+        LEFT JOIN epdc_item_handle_process c ON a.ITEM_ID = c.ITEM_ID
+                AND c.DEL_FLAG = '0'
+                AND c.STATE = '60'
+                AND DATE_FORMAT(c.CREATED_TIME, '%Y-%m') = #{statDate}
+        WHERE a.DEL_FLAG = '0'
+          AND a.GRID_CANTONCODE = '370203'
+          AND a.GRID_UNITNAME IS NOT NULL
+          AND a.GRID_UNITNAME != ''
+          AND a.GRID_UNITNAME != '北尚诉办'
+          AND a.GRID_PARTYID NOT IN (
+                '101', '1525', '1549', '1550', '1551', '1552', '1553', '1554', '1555', '1556', '1557', '1558', '1559', '1560',
+                '1561', '1562', '1563', '1564', '1565', '1566', '1567', '1568', '1569', '1570', '1571', '1572', '1573', '1574',
+                '1575', '1576', '1577', '1578', '1579', '1580', '1581', '1582', '1583', '1584', '1585', '1586', '1587', '1588',
+                '1589', '1590', '1591', '1592', '1593', '1594', '1595', '1596', '1597', '1598', '1599', '1600', '1601', '1602',
+                '1603', '1604', '1605', '1606', '1607', '1608', '1609', '1610', '1611', '1612', '1613', '1614', '1615', '1616',
+                '1617', '1618', '1619', '1620', '1621', '1622', '1623', '1624', '1625', '1626', '1627', '1628', '1629', '1630',
+                '1631', '1632', '1633', '1634', '1635', '1636', '1637', '1638', '1639', '1640', '1641', '1642', '1643', '2216',
+                '2247', '2248', '2252', '2254', '2255', '2258', '2259', '2261', '2265', '2267', '2271', '2272', '2275', '2280',
+                '2281', '2285', '2287', '2290', '2292', '2293', '2294', '2295', '2298', '2299', '4701', '7487', '7488', '7489',
+                '7490', '7491', '7492', '7493', '7494', '7495', '7496', '7497', '7498', '7499', '7500', '7501', '7502', '7503',
+                '7504', '8481', '9841', '10100', '14751', '19177', '130954', '248834', '257176', '1140746', '1607411', '1636766',
+                '1636767', '1976283', '3368267', '3368281', '3368284', '3368286', '3368288', '3368291', '3537573', '3537682', '4180987',
+                '4181079', '4400541', '4742418', '4860578', '4885731'
+                )
+        GROUP BY a.GRID_UNITID
+    </select>
+    <select id="getDeptEventEfficiencyYearly" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
+        SELECT a.GRID_UNITID                                                                            AS deptId,
+               a.GRID_UNITNAME                                                                          AS deptName,
+               '0'                                                                                      AS pid,
+               '0'                                                                                      AS pids,
+               '3'                                                                                      AS statType,
+               'district_dept'                                                                          AS deptLevel,
+               0                                                                                        AS deptSort,
+               COUNT(DISTINCT a.ITEM_ID)                                                                AS eventCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '0' THEN a.ITEM_ID END)                           AS livelihoodCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '1' THEN a.ITEM_ID END)                           AS developCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '2' THEN a.ITEM_ID END)                           AS lawCount,
+               COUNT(DISTINCT CASE WHEN c.ITEM_ID IS NOT NULL THEN a.ITEM_ID END)                       AS closedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '0' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS livelihoodClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '1' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS developClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '2' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS lawClosedCount
+
+        FROM epdc_item_handle_process a
+        INNER JOIN epdc_item b ON a.ITEM_ID = b.ID
+                AND b.DEL_FLAG = '0'
+                AND PEOPLE_FLAG IS NOT NULL
+                AND IS_PEOPLE = '1'
+                AND EVENT_ID IS NULL
+                AND ISSUE_ID IS NULL
+                AND DATE_FORMAT(b.CREATED_TIME, '%Y') = #{statDate}
+        LEFT JOIN epdc_item_handle_process c ON a.ITEM_ID = c.ITEM_ID
+                AND c.DEL_FLAG = '0'
+                AND c.STATE = '60'
+                AND DATE_FORMAT(c.CREATED_TIME, '%Y') = #{statDate}
+        WHERE a.DEL_FLAG = '0'
+          AND a.GRID_CANTONCODE = '370203'
+          AND a.GRID_UNITNAME IS NOT NULL
+          AND a.GRID_UNITNAME != ''
+          AND a.GRID_UNITNAME != '北尚诉办'
+          AND a.GRID_PARTYID NOT IN (
+                '101', '1525', '1549', '1550', '1551', '1552', '1553', '1554', '1555', '1556', '1557', '1558', '1559', '1560',
+                '1561', '1562', '1563', '1564', '1565', '1566', '1567', '1568', '1569', '1570', '1571', '1572', '1573', '1574',
+                '1575', '1576', '1577', '1578', '1579', '1580', '1581', '1582', '1583', '1584', '1585', '1586', '1587', '1588',
+                '1589', '1590', '1591', '1592', '1593', '1594', '1595', '1596', '1597', '1598', '1599', '1600', '1601', '1602',
+                '1603', '1604', '1605', '1606', '1607', '1608', '1609', '1610', '1611', '1612', '1613', '1614', '1615', '1616',
+                '1617', '1618', '1619', '1620', '1621', '1622', '1623', '1624', '1625', '1626', '1627', '1628', '1629', '1630',
+                '1631', '1632', '1633', '1634', '1635', '1636', '1637', '1638', '1639', '1640', '1641', '1642', '1643', '2216',
+                '2247', '2248', '2252', '2254', '2255', '2258', '2259', '2261', '2265', '2267', '2271', '2272', '2275', '2280',
+                '2281', '2285', '2287', '2290', '2292', '2293', '2294', '2295', '2298', '2299', '4701', '7487', '7488', '7489',
+                '7490', '7491', '7492', '7493', '7494', '7495', '7496', '7497', '7498', '7499', '7500', '7501', '7502', '7503',
+                '7504', '8481', '9841', '10100', '14751', '19177', '130954', '248834', '257176', '1140746', '1607411', '1636766',
+                '1636767', '1976283', '3368267', '3368281', '3368284', '3368286', '3368288', '3368291', '3537573', '3537682', '4180987',
+                '4181079', '4400541', '4742418', '4860578', '4885731'
+                )
+        GROUP BY a.GRID_UNITID
+    </select>
+
+    <select id="getDeptScreenDataByInterval" resultType="com.elink.esua.epdc.dto.screen.result.EfficiencyEvaluationResultDTO">
+        SELECT a.GRID_UNITID                                                                            AS deptId,
+               a.GRID_UNITNAME                                                                          AS deptName,
+               '0'                                                                                      AS pid,
+               '0'                                                                                      AS pids,
+               '3'                                                                                      AS statType,
+               'district_dept'                                                                          AS deptLevel,
+               0                                                                                        AS deptSort,
+               COUNT(DISTINCT a.ITEM_ID)                                                                AS eventCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '0' THEN a.ITEM_ID END)                           AS livelihoodCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '1' THEN a.ITEM_ID END)                           AS developCount,
+               COUNT(DISTINCT CASE WHEN PEOPLE_FLAG = '2' THEN a.ITEM_ID END)                           AS lawCount,
+               COUNT(DISTINCT CASE WHEN c.ITEM_ID IS NOT NULL THEN a.ITEM_ID END)                       AS closedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '0' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS livelihoodClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '1' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS developClosedCount,
+               COUNT(DISTINCT CASE
+                       WHEN PEOPLE_FLAG = '2' AND c.ITEM_ID IS NOT NULL
+                               THEN a.ITEM_ID END)                                                      AS lawClosedCount
+
+        FROM epdc_item_handle_process a
+        INNER JOIN epdc_item b ON a.ITEM_ID = b.ID
+                AND b.DEL_FLAG = '0'
+                AND PEOPLE_FLAG IS NOT NULL
+                AND IS_PEOPLE = '1'
+                AND EVENT_ID IS NULL
+                AND ISSUE_ID IS NULL
+                AND DATE_FORMAT(b.CREATED_TIME, '%Y-%m-%d') &gt;= #{startDate}
+                AND DATE_FORMAT(b.CREATED_TIME, '%Y-%m-%d') &lt;= #{endDate}
+        LEFT JOIN epdc_item_handle_process c ON a.ITEM_ID = c.ITEM_ID
+                AND c.DEL_FLAG = '0'
+                AND c.STATE = '60'
+                AND DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d') &gt;= #{startDate}
+                AND DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d') &lt;= #{endDate}
+        WHERE a.DEL_FLAG = '0'
+          AND a.GRID_CANTONCODE = '370203'
+          AND a.GRID_UNITNAME IS NOT NULL
+          AND a.GRID_UNITNAME != ''
+          AND a.GRID_UNITNAME != '北尚诉办'
+          AND a.GRID_PARTYID NOT IN (
+                '101', '1525', '1549', '1550', '1551', '1552', '1553', '1554', '1555', '1556', '1557', '1558', '1559', '1560',
+                '1561', '1562', '1563', '1564', '1565', '1566', '1567', '1568', '1569', '1570', '1571', '1572', '1573', '1574',
+                '1575', '1576', '1577', '1578', '1579', '1580', '1581', '1582', '1583', '1584', '1585', '1586', '1587', '1588',
+                '1589', '1590', '1591', '1592', '1593', '1594', '1595', '1596', '1597', '1598', '1599', '1600', '1601', '1602',
+                '1603', '1604', '1605', '1606', '1607', '1608', '1609', '1610', '1611', '1612', '1613', '1614', '1615', '1616',
+                '1617', '1618', '1619', '1620', '1621', '1622', '1623', '1624', '1625', '1626', '1627', '1628', '1629', '1630',
+                '1631', '1632', '1633', '1634', '1635', '1636', '1637', '1638', '1639', '1640', '1641', '1642', '1643', '2216',
+                '2247', '2248', '2252', '2254', '2255', '2258', '2259', '2261', '2265', '2267', '2271', '2272', '2275', '2280',
+                '2281', '2285', '2287', '2290', '2292', '2293', '2294', '2295', '2298', '2299', '4701', '7487', '7488', '7489',
+                '7490', '7491', '7492', '7493', '7494', '7495', '7496', '7497', '7498', '7499', '7500', '7501', '7502', '7503',
+                '7504', '8481', '9841', '10100', '14751', '19177', '130954', '248834', '257176', '1140746', '1607411', '1636766',
+                '1636767', '1976283', '3368267', '3368281', '3368284', '3368286', '3368288', '3368291', '3537573', '3537682', '4180987',
+                '4181079', '4400541', '4742418', '4860578', '4885731'
+                )
+        GROUP BY a.GRID_UNITID
+    </select>
+
 </mapper>