垃圾项目

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

@@ -47,8 +47,9 @@ public class IcEventOperationLogDTO implements Serializable {
      * 3、立项：shift_project；
      * 4、转需求：shift_demand
      * 5、办结：close_case;
+     * 6、需求办结：close_demand
      */
-	private String actionCode;
+    private String actionCode;
 
     /**
      * 1、发布事件：publish；
@@ -57,16 +58,26 @@ public class IcEventOperationLogDTO implements Serializable {
      * 4、立项：shift_project；
      * 5、转需求: shift_demand；
      * 6、办结：close_case;
-     * 7、选择是否已解决：choose_resolve;
+     * 7、需求办结：close_demand;
-     * 8、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；
+     * 8、选择是否已解决：choose_resolve;
+     * 9、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；
      */
-	private String actionDesc;
+    private String actionDesc;
 
     /**
      * 操作时间
      */
 	private Date operateTime;
 
+    /**
+     * 服务方【事件被转需求，需求在办结时的服务方名称】
+     */
+    private String serviceParty;
+    /**
+     * 实际服务时间【事件被转需求，需求在办结时填写的实际服务时间 xx至xx】
+     */
+    private String actualServiceTime;
+
     /**
      * 删除标识 1删除；0未删除
      */

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

@@ -17,11 +17,13 @@ public class IcEventReplyFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
     public interface Comment extends CustomerClientShowGroup {
     }
+    public interface Process extends CustomerClientShowGroup {
+    }
 
     /**
      * 事件ID
      */
-    @NotBlank(message = "事件ID不能为空", groups = {UpdateGroup.class, Comment.class})
+    @NotBlank(message = "事件ID不能为空", groups = {UpdateGroup.class, Comment.class, Process.class})
     private String icEventId;
     /**
      * 二类分类Id

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

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -229,6 +230,15 @@ public class IcEventController {
         List<IcEventAnalysisOrgResDTO> list = icEventService.analysisOrgTotal(formDTO);
         return new Result<List<IcEventAnalysisOrgResDTO>>().ok(list);
     }
+    /**
+     * @Author sun
+     * @Description 事件管理-处理进展
+     **/
+    @PostMapping("process")
+    public Result<LinkedList<IcEventProcessListResultDTO>> process(@RequestBody IcEventReplyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, IcEventReplyFormDTO.Process.class);
+        return new Result<LinkedList<IcEventProcessListResultDTO>>().ok(icEventService.process(formDTO));
+    }
 
     /**
      * Desc: 定时任务自动评价

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

@@ -1,8 +1,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventOperationLogEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.LinkedList;
 
 /**
  * 事件操作日志表
@@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcEventOperationLogDao extends BaseDao<IcEventOperationLogEntity> {
-	
+
+    LinkedList<IcEventProcessListResultDTO> selectByEventId(@Param("icEventId") String icEventId);
+
 }

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

@@ -1,8 +1,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventReplyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.LinkedList;
 
 /**
  * 事件回复表
@@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcEventReplyDao extends BaseDao<IcEventReplyEntity> {
-	
+
+    LinkedList<IcEventProcessListResultDTO> selectByEventId(@Param("icEventId") String icEventId);
+
 }

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

@@ -47,6 +47,7 @@ public class IcEventOperationLogEntity extends BaseEpmetEntity {
 	 * 3、立项：shift_project；
 	 * 4、转需求：shift_demand
 	 * 5、办结：close_case;
+	 * 6、需求办结：close_demand
      */
 	private String actionCode;
 
@@ -57,8 +58,9 @@ public class IcEventOperationLogEntity extends BaseEpmetEntity {
 	 * 4、立项：shift_project；
 	 * 5、转需求: shift_demand；
 	 * 6、办结：close_case;
-	 * 7、选择是否已解决：choose_resolve;
+	 * 7、需求办结：close_demand;
-	 * 8、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；
+	 * 8、选择是否已解决：choose_resolve;
+	 * 9、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；
      */
 	private String actionDesc;
 
@@ -66,5 +68,13 @@ public class IcEventOperationLogEntity extends BaseEpmetEntity {
      * 操作时间
      */
 	private Date operateTime;
+	/**
+	 * 服务方【事件被转需求，需求在办结时的服务方名称】
+	 */
+	private String serviceParty;
+	/**
+	 * 实际服务时间【事件被转需求，需求在办结时填写的实际服务时间 xx至xx】
+	 */
+	private String actualServiceTime;
 
 }

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

@@ -3,8 +3,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcEventOperationLogDTO;
+import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventOperationLogEntity;
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -75,4 +77,6 @@ public interface IcEventOperationLogService extends BaseService<IcEventOperation
      * @date 2022-05-17
      */
     void delete(String[] ids);
+
+    LinkedList<IcEventProcessListResultDTO> getByEventId(String icEventId);
 }

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

@@ -3,8 +3,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcEventReplyDTO;
+import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventReplyEntity;
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -75,4 +77,6 @@ public interface IcEventReplyService extends BaseService<IcEventReplyEntity> {
      * @date 2022-05-17
      */
     void delete(String[] ids);
+
+    LinkedList<IcEventProcessListResultDTO> getByEventId(String icEventId);
 }

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

@@ -8,6 +8,7 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.IcEventEntity;
 
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -140,6 +141,11 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      **/
     IcEventListResultDTO detail(IcEventListFormDTO formDTO);
 
+    /**
+     * @Author sun
+     * @Description 事件管理-处理进展
+     **/
+    LinkedList<IcEventProcessListResultDTO> process(IcEventReplyFormDTO formDTO);
     /**
      * 事件分类分析- 饼图2，直属下级 事件数量
      * @param formDTO

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

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcEventOperationLogDao;
 import com.epmet.dto.IcEventOperationLogDTO;
+import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventOperationLogEntity;
 import com.epmet.service.IcEventOperationLogService;
 import org.apache.commons.lang3.StringUtils;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -80,4 +82,9 @@ public class IcEventOperationLogServiceImpl extends BaseServiceImpl<IcEventOpera
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public LinkedList<IcEventProcessListResultDTO> getByEventId(String icEventId) {
+        return baseDao.selectByEventId(icEventId);
+    }
+
 }

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

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcEventReplyDao;
 import com.epmet.dto.IcEventReplyDTO;
+import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventReplyEntity;
 import com.epmet.service.IcEventReplyService;
 import org.apache.commons.lang3.StringUtils;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -80,4 +82,9 @@ public class IcEventReplyServiceImpl extends BaseServiceImpl<IcEventReplyDao, Ic
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public LinkedList<IcEventProcessListResultDTO> getByEventId(String icEventId) {
+        return baseDao.selectByEventId(icEventId);
+    }
+
 }

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

@@ -47,7 +47,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -61,6 +60,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
+
 public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntity> implements IcEventService, ResultDataResolver {
 
     @Value("${openapi.scan.server.url}")
@@ -296,8 +296,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         }
         //转需求对应的操作记录
         if (StringUtils.isNotBlank(formDTO.getOperationType()) && "2".equals(formDTO.getOperationType())) {
-            date.setTime(date.getTime() + 6000 * 1);
+            logList.add(logEntity(formDTO.getCustomerId(), entity.getId(), formDTO.getUserId(), formDTO.getDemand().getWantServiceTime(), "shift_demand", "shift_demand"));
-            logList.add(logEntity(formDTO.getCustomerId(), entity.getId(), formDTO.getUserId(), date, "shift_demand", "shift_demand"));
         }
         //选择了已完成
         if (StringUtils.isNotBlank(formDTO.getOperationType()) && "closed_case".equals(formDTO.getStatus())) {
@@ -824,5 +823,40 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         }while (ids.size() == size);
     }
 
+    /**
+     * @Author sun
+     * @Description 事件管理-处理进展
+     **/
+    @Override
+    public LinkedList<IcEventProcessListResultDTO> process(IcEventReplyFormDTO formDTO) {
+        LinkedList<IcEventProcessListResultDTO> resultList = new LinkedList<IcEventProcessListResultDTO>();
+        //1.查询事件基础信息
+        IcEventEntity entity = baseDao.selectById(formDTO.getIcEventId());
+        if (null == entity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件不存在");
+        }
+
+        //2.查询事件回复信息
+        LinkedList<IcEventProcessListResultDTO> event = icEventReplyService.getByEventId(formDTO.getIcEventId());
+
+
+        //3.判断查询事件项目进展或需求进展信息
+        //项目进展
+        if ("1".equals(entity.getOperationType())) {
+            ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO();
+            processListV2FormDTO.setProjectId(entity.getOperationId());
+            List<ProcessListV2ResultDTO> project = projectTraceService.processListV2(processListV2FormDTO);
+            resultList.addAll(ConvertUtils.sourceToTarget(project, IcEventProcessListResultDTO.class));
+        }
+        //需求进展
+        if ("2".equals(entity.getOperationType())) {
+            LinkedList<IcEventProcessListResultDTO> demand = icEventOperationLogService.getByEventId(formDTO.getIcEventId());
+            resultList.addAll(demand);
+        }
+        resultList.addAll(event);
+
+        return resultList;
+    }
+
 
 }

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

@@ -3,6 +3,22 @@
 
 <mapper namespace="com.epmet.dao.IcEventOperationLogDao">
 
-
+    <select id="selectByEventId" resultType="com.epmet.dto.result.IcEventProcessListResultDTO">
+        SELECT
+            id processId,
+            'demand' type,
+            if(action_desc = 'shift_demand', '转服务', '需求完成') processName,
+            UNIX_TIMESTAMP(created_time) processTime,
+            operate_time serviceTime,
+            service_party serviceParty,
+            actual_service_time actualServiceTime
+        FROM
+            ic_event_operation_log
+        WHERE
+            del_flag = '0'
+        AND action_desc in('shift_demand','close_demand')
+        AND ic_event_id = #{icEventId}
+        ORDER BY created_time DESC
+    </select>
 
 </mapper>

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

@@ -3,6 +3,20 @@
 
 <mapper namespace="com.epmet.dao.IcEventReplyDao">
 
-
+    <select id="selectByEventId" resultType="com.epmet.dto.result.IcEventProcessListResultDTO">
+        SELECT
+            id processId,
+            'event' type,
+            '回复' processName,
+            UNIX_TIMESTAMP(created_time) processTime,
+            user_show_name departmentName,
+            content publicReply
+        FROM
+            ic_event_reply
+        WHERE
+            del_flag = '0'
+        AND ic_event_id = #{icEventId}
+        ORDER BY created_time DESC
+    </select>
 
 </mapper>