列表、进展

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

@@ -42,7 +42,7 @@ public class IcEventAddEditFormDTO implements Serializable {
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class})
+   // @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class})
     @Length(min = 15, max = 18, message = "身份证号位数不正确", groups = AddGroup.class)
     private String idCard;
     /**

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

@@ -1,7 +1,5 @@
 package com.epmet.service.impl;
-import java.util.Date;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
@@ -26,12 +24,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.dao.IcEventDao;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.CustomerDTO;
-import com.epmet.dto.IcEventDTO;
-import com.epmet.dto.IssueProjectCategoryDictDTO;
-import com.epmet.dto.IcResiUserDTO;
-import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.DemandRecId;
 import com.epmet.dto.result.*;
@@ -53,7 +46,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -698,8 +690,15 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         }
 
         //5.新增操作记录数据
-        IcEventOperationLogEntity logEntity = logEntity(formDTO.getCustomerId(), formDTO.getIcEventId(), formDTO.getUserId(), new Date(), "reply", "reply");
-        icEventOperationLogService.insert(logEntity);
+        Date date = new Date();
+        List<IcEventOperationLogEntity> logList = new ArrayList<>();
+        logList.add(logEntity(formDTO.getCustomerId(), formDTO.getIcEventId(), formDTO.getUserId(), date, "reply", "reply"));
+        //回复时选择了已完成
+        if (StringUtils.isNotBlank(formDTO.getOperationType()) && "closed_case".equals(formDTO.getStatus())) {
+            date.setTime(date.getTime() + 6000 * 1);
+            logList.add(logEntity(formDTO.getCustomerId(), entity.getId(), formDTO.getUserId(), date, "close_case", "close_case"));
+        }
+        icEventOperationLogService.insertBatch(logList);
 
     }
 

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

@@ -86,7 +86,7 @@
     </select>
 
     <resultMap id="icEventMap" type="com.epmet.dto.result.IcEventListResultDTO">
-        <id property="icEventId" column="id"/>
+        <id property="icEventId" column="icEventId"/>
         <result property="gridId" column="grid_id"/>
         <result property="sourceType" column="source_type" />
         <result property="address" column="address" />
@@ -121,7 +121,7 @@
     </select>
     <select id="icEventList" parameterType="map" resultMap="icEventMap">
         SELECT
-            ie.id,
+            ie.id icEventId,
             ie.grid_id,
             ie.event_content,
             ie.source_type,
@@ -132,7 +132,7 @@
             IF(ie.satisfaction = 'bad','不满意',IF (ie.satisfaction = 'good','基本满意',IF (ie.satisfaction = 'perfect','非常满意','')))satisfactionName,
             ie.created_time,
             ie.`status`,
-            IF(ie.satisfaction = 'processing','处理中',IF (ie.satisfaction = 'closed_case','已办结',''))statusName,
+            IF(ie.status = 'processing','处理中',IF (ie.status = 'closed_case','已办结',''))statusName,
             ie.happen_time,
             ie.created_by,
             iec.category_id