事件标记难点堵点

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java

@@ -172,6 +172,11 @@ approved：人工审核通过）
      */
 	private String auditReason;
 
+    /**
+     * 是否标记难点堵点  0:否 1：是
+     */
+	private String difficultPoint;
+
     /**
      * 删除标识:0.未删除 1.已删除
      */

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java

@@ -98,6 +98,10 @@ public class IcEventAddEditFormDTO implements Serializable {
      * 处理中：processing；已办结：closed_case
      */
     private String status;
+    /**
+     * 是否标记难点堵点  0:否 1：是
+     */
+    private String difficultPoint;
     /**
      * 立项接口入参对象
      */

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description 【迁入管理】列表--接口入参
@@ -75,4 +76,13 @@ public class IcEventListFormDTO implements Serializable {
     private String customerId;
     private String staffId;
 
+    /**
+     * 事件ID集合
+     */
+    private List<String> icEventIdList;
+    /**
+     * 操作类型 0:取消标记  1:标记
+     */
+    private String type;
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java

@@ -192,6 +192,16 @@ public class IcEventListResultDTO implements Serializable {
      */
     private String imageUrl;
 
+    /**
+     * 是否标记难点堵点  0:否 1：是
+     */
+    private String difficultPoint;
+
+    /**
+     * 是否标记难点堵点  0:否 1：是
+     */
+    private String difficultPointName;
+
     /**
      * 事件附件
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -491,4 +491,14 @@ public class IcEventController {
         return new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description  标记事件为难点堵点
+     **/
+    @PostMapping("difficultpointevent")
+    public Result difficultPointEvent(@RequestBody IcEventListFormDTO formDTO) {
+        icEventService.difficultPointEvent(formDTO);
+        return new Result();
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -1,6 +1,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcEventDTO;
 import com.epmet.dto.form.IcEventCategoryAnalysisFormDTO;
 import com.epmet.dto.form.IcEventListFormDTO;
 import com.epmet.dto.form.MyReportIcEvFormDTO;
@@ -136,4 +137,6 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
      * @return
      */
     Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard);
+
+    List<IcEventDTO> getByEventIds(@Param("icEventIdList") List<String> icEventIdList);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java

@@ -171,4 +171,9 @@ public class IcEventEntity extends BaseEpmetEntity {
      */
 	private String auditReason;
 
+	/**
+	 * 是否标记难点堵点  0:否 1：是
+	 */
+	private String difficultPoint;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -220,4 +220,6 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      * @Description  工作端事件红点消除
      **/
     void govRedDot(String icEventId);
+
+    void difficultPointEvent(IcEventListFormDTO formDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -677,6 +677,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         if (StringUtils.isNotBlank(formDTO.getOperationType()) && StringUtils.isNotBlank(formDTO.getStatus()) && "closed_case".equals(formDTO.getStatus())){
             entity.setStatus(formDTO.getStatus());
             entity.setCloseCaseTime(new Date());
+            entity.setDifficultPoint("0");
         }
         entity.setOperationType(NumConstant.ZERO_STR);
         entity.setLatestOperatedTime(new Date());
@@ -1196,6 +1197,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         entity.setStatus("closed_case");
         entity.setCloseCaseTime(new Date());
         entity.setLatestOperatedTime(new Date());
+        entity.setDifficultPoint("0");
         baseDao.updateById(entity);
 
         //3.判断新增操作记录
@@ -1580,4 +1582,31 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         baseDao.updateById(entity);
     }
 
+    @Override
+    public void difficultPointEvent(IcEventListFormDTO formDTO) {
+        if (CollectionUtils.isEmpty(formDTO.getIcEventIdList())) {
+            return;
+        }
+        //1.校验是否存在已结案事件或已标记事件
+        if ("1".equals(formDTO.getType())) {
+            List<IcEventDTO> list = baseDao.getByEventIds(formDTO.getIcEventIdList());
+            if (!CollectionUtils.isEmpty(list)) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在已结案或已标记为难点堵点的事件，不允许重复操作", "存在已结案或已标记为难点堵点的事件，不允许重复操作");
+            }
+        }
+
+        List<IcEventEntity> entityList = new ArrayList<>();
+        String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
+        formDTO.getIcEventIdList().forEach(ev -> {
+            IcEventEntity entity = new IcEventEntity();
+            entity.setId(ev);
+            entity.setDifficultPoint(formDTO.getType());
+            entity.setUpdatedBy(userId);
+            entity.setUpdatedTime(new Date());
+            entityList.add(entity);
+        });
+        updateBatchById(entityList);
+
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.25__alter_ic_event.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `ic_event`
+ADD COLUMN `DIFFICULT_POINT`  varchar(3) NULL DEFAULT '0' COMMENT '是否标记难点堵点  0:否 1：是' AFTER `AUDIT_REASON`;

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -126,6 +126,8 @@
         <result property="createdTime" column="created_time" />
         <result property="createdUserId" column="created_by" />
         <result property="categoryId" column="category_id" />
+        <result property="difficultPoint" column="difficult_point" />
+        <result property="difficultPointName" column="difficultPointName" />
         <collection property="attachmentList" ofType="com.epmet.dto.result.IcEventListResultDTO$Attachment"
                     column="icEventId" select="matterListByPartyServiceCenterId"/>
         <!--<collection property="attachmentList" ofType="com.epmet.dto.result.IcEventListResultDTO$Attachment" select="">
@@ -178,7 +180,9 @@
             ie.comment_time,
             ie.created_time,
             ie.created_by,
-            iec.category_id
+            iec.category_id,
+            ie.difficult_point,
+            IF(ie.difficult_point = '1','是','否') difficultPointName
         FROM
             ic_event ie
         LEFT JOIN ic_event_category iec ON(ie.id = iec.ic_event_id AND iec.del_flag = '0')
@@ -375,4 +379,18 @@
         where e.ID_CARD = #{reportorIdCard}
           and e.DEL_FLAG = '0'
     </select>
+
+    <select id="getByEventIds" resultType="com.epmet.dto.IcEventDTO">
+        SELECT
+            id
+        FROM
+            ic_event
+        WHERE
+            del_flag = '0'
+        <foreach collection="icEventIdList" item="id" open="AND id IN (" separator="," close=")">
+            #{id}
+        </foreach>
+        AND (`status` = 'closed_case' OR difficult_point = '1')<!-- 已结案的或已标记为难点堵点的 -->
+    </select>
+
 </mapper>