From af2f1450e22d4b65e0013733e08025cdcd075b31 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 18:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
index fcd5916..59b5ce6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
@@ -1,6 +1,7 @@
 package com.aps.core.service.impl;
 
 import com.aps.common.core.utils.DateUtils;
+import com.aps.common.security.utils.SecurityUtils;
 import com.aps.core.domain.ApsStandardProcess;
 import com.aps.core.mapper.ApsStandardProcessMapper;
 import com.aps.core.service.IApsStandardProcessService;
@@ -55,6 +56,7 @@
     public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess)
     {
         apsStandardProcess.setCreateTime(DateUtils.getNowDate());
+        apsStandardProcess.setCreateBy(SecurityUtils.getUsername());
         return apsStandardProcessMapper.insertApsStandardProcess(apsStandardProcess);
     }
 
@@ -68,6 +70,7 @@
     public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess)
     {
         apsStandardProcess.setUpdateTime(DateUtils.getNowDate());
+        apsStandardProcess.setUpdateBy(SecurityUtils.getUsername());
         return apsStandardProcessMapper.updateApsStandardProcess(apsStandardProcess);
     }
 
@@ -94,4 +97,26 @@
     {
         return apsStandardProcessMapper.deleteApsStandardProcessById(id);
     }
+
+    /**
+     * 瀵煎叆鏁版嵁
+     * @param tempList
+     * @return true/false
+     */
+    @Override
+    public boolean importData(List<ApsStandardProcess> tempList) {
+        try {
+            if (!tempList.isEmpty()) {
+                tempList.forEach(temp->{
+                    temp.setCreateBy(SecurityUtils.getUsername());
+                    temp.setCreateTime(DateUtils.getNowDate());
+                    apsStandardProcessMapper.insertApsStandardProcess(temp);
+                });
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
 }

--
Gitblit v1.9.3