From d8cef0a05401284e18fefcfcf51ebc1b0f6da702 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 13:50:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
index 13a7c0e..ab8300c 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
@@ -1,15 +1,22 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.zy.asrs.entity.CommandInfoLog;
 import com.zy.asrs.mapper.CommandInfoMapper;
 import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.service.CommandInfoLogService;
 import com.zy.asrs.service.CommandInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service("commandInfoService")
 public class CommandInfoServiceImpl extends ServiceImpl<CommandInfoMapper, CommandInfo> implements CommandInfoService {
+
+    @Autowired
+    private CommandInfoLogService commandInfoLogService;
 
     @Override
     public List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo) {
@@ -28,9 +35,18 @@
 
     @Override
     public int saveToHistory(String taskNo) {
+        int count = 0;
         if (this.selectByTaskNo(taskNo).isEmpty()) {
-            return 0;
+            return count;
         }
-        return this.baseMapper.saveToHistory(taskNo);
+        for (CommandInfo commandInfo : this.baseMapper.selectByTaskNo(taskNo)) {
+            String jsonString = JSON.toJSONString(commandInfo);
+            CommandInfoLog commandInfoLog = JSON.parseObject(jsonString, CommandInfoLog.class);
+            commandInfoLog.setId(null);
+            if (commandInfoLogService.insert(commandInfoLog)) {
+                count++;
+            }
+        }
+        return count;
     }
 }

--
Gitblit v1.9.1