取消作业 结束作业 log

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsTicketOperLogService.java

@@ -76,7 +76,7 @@ public interface IIsTicketOperLogService extends IService<IsTicketOperLog> {
     Boolean addLog10(Long jobId, String jobName);
 
     /**
-     * 完成作业
+     * 结束作业
      * @return
      */
     Boolean addLog11(Long jobId, String jobName);

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -852,6 +852,8 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         update(Wrappers.<IsJobTicket>lambdaUpdate().eq(IsJobTicket::getTicketId, isJobTicket.getTicketId())
                 .set(IsJobTicket::getTicketStatus, FINISHED.status)
                 .set(IsJobTicket::getTicketEndTime, new Date()));
+        // 结束作业
+        isTicketOperLogService.addLog11(isJobTicket.getTicketId(), getById(isJobTicket.getTicketId()).getTicketName());
         return true;
     }
 
@@ -867,6 +869,8 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         // 2.既然走到这了，说明可以取消
         update(Wrappers.<IsJobTicket>lambdaUpdate().eq(IsJobTicket::getTicketId, isJobTicket.getTicketId())
                 .set(IsJobTicket::getTicketStatus, 6));
+        // 取消作业
+        isTicketOperLogService.addLog10(isJobTicket.getTicketId(), getById(isJobTicket.getTicketId()).getTicketName());
         return true;
     }
 

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsTicketOperLogServiceImpl.java

@@ -1,20 +1,16 @@
 package com.ktg.iscs.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import java.util.Date;
-import java.util.List;
-import cn.hutool.core.lang.Assert;
-import com.ktg.common.core.text.Convert;
-import com.ktg.common.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.iscs.mapper.IsTicketOperLogMapper;
 import com.ktg.iscs.domain.IsTicketOperLog;
+import com.ktg.iscs.mapper.IsTicketOperLogMapper;
 import com.ktg.iscs.service.IIsTicketOperLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
 
 /**
  * 作业操作过程Service业务层处理
@@ -222,7 +218,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("完成作业：" + date + username +"已完成作业" + jobName + "。");
+        isTicketOperLog.setOperationContent("结束作业：" + date + username +"已完成作业" + jobName + "。");
         save(isTicketOperLog);
         return true;
     }