维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/abnormal/AbnormalDetails.java

@@ -33,14 +33,19 @@ public class AbnormalDetails extends BaseEntity {
     private String explain;
 
     /**
-     * 处理时间
+     * 状态
      */
-    private Date handleTime;
+    private Integer status;
 
     /**
-     * 状态
+     * 跟进用户
      */
-    private Integer status;
+    private Long handleUser;
+
+    /**
+     * 跟进时间
+     */
+    private Date handleTime;
 
     /**
      * 逻辑删除 0未删除 1已删除

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/abnormal/AbnormalInfo.java

@@ -7,6 +7,8 @@ import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 异常记录
@@ -19,7 +21,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class AbnormalInfo extends BaseEntity {
 
-
     /**
      * 异常类型
      */
@@ -46,6 +47,16 @@ public class AbnormalInfo extends BaseEntity {
     private Integer status;
 
     /**
+     * 跟进用户
+     */
+    private Long handleUser;
+
+    /**
+     * 跟进时间
+     */
+    private Date handleTime;
+
+    /**
      * 备注
      */
     private String remark;

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/abnormal/AbnormalInfoEx.java

@@ -17,6 +17,6 @@ public class AbnormalInfoEx extends AbnormalInfo {
     /**
      * 最近操作人
      */
-    private String userName;
+    private String handleUserName;
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/abnormal/impl/AbnormalDetailsServiceImpl.java

@@ -15,6 +15,7 @@ import com.fjhx.utils.UserClientUtil;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -46,10 +47,11 @@ public class AbnormalDetailsServiceImpl extends ServiceImpl<AbnormalDetailsMappe
         if (records.size() == 0) {
             return page;
         }
-        UserClientUtil.setUserName(records, "createUser", "createUserName");
+        UserClientUtil.setUserName(records, "handleUser", "handleUserName");
         return page;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(AbnormalDetailsVo abnormalDetailsVo) {
         Long abnormalInfoId = abnormalDetailsVo.getAbnormalInfoId();
@@ -61,6 +63,8 @@ public class AbnormalDetailsServiceImpl extends ServiceImpl<AbnormalDetailsMappe
         AbnormalInfo abnormalInfo = new AbnormalInfo();
         abnormalInfo.setId(abnormalInfoId);
         abnormalInfo.setStatus(StatusConstant.YES.equals(status) ? 2 : 1);
+        abnormalInfo.setHandleUser(abnormalDetailsVo.getHandleUser());
+        abnormalInfo.setHandleTime(abnormalDetailsVo.getHandleTime());
         abnormalInfoService.updateById(abnormalInfo);
 
         save(abnormalDetailsVo);

hx-service/victoriatourist/src/main/java/com/fjhx/service/abnormal/impl/AbnormalInfoServiceImpl.java

@@ -2,7 +2,6 @@ package com.fjhx.service.abnormal.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.base.BaseEntity;
 import com.fjhx.entity.abnormal.AbnormalInfo;
 import com.fjhx.mapper.abnormal.AbnormalInfoMapper;
 import com.fjhx.params.abnormal.AbnormalInfoEx;
@@ -45,9 +44,9 @@ public class AbnormalInfoServiceImpl extends ServiceImpl<AbnormalInfoMapper, Abn
             return page;
         }
 
-        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(records, BaseEntity::getUpdateUser);
+        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(records, AbnormalInfo::getHandleUser);
 
-        records.forEach(item -> item.setUserName(userNameMap.get(item.getUpdateUser())));
+        records.forEach(item -> item.setHandleUserName(userNameMap.get(item.getUpdateUser())));
 
         return page;
     }