From 7b48a69a764c93a6b0dd32422d32f59afc6f4ac4 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Thu, 5 Dec 2024 09:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E3=80=91=E4=BF=9D=E5=AD=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessRouteTaskService.java       | 18 ++++++++++++++++++
 .../mapper/master/ProcessRouteTaskMapper.xml   |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
index cce7c564..116da8d9 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.base.core.vo.PageVO;
 import com.nflg.product.technology.constant.HandleStateEnum;
@@ -28,6 +29,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -138,11 +141,18 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
             throw new NflgBusinessException(STATE.ParamErr, "工厂" + processRouteTaskVO.getFactory() + "物料号" + processRouteTaskVO.getMaterialNo() + "工艺路线已存在");
         }
 
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+        LocalDateTime firstDay = LocalDateTime.parse(year + "-01-01 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        LocalDateTime lastDay = LocalDateTime.parse("9999-12-31 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         ProcessRouteTaskEntity taskEntity = Convert.convert(ProcessRouteTaskEntity.class, processRouteTaskVO);
+        taskEntity.setUpdatedByName(SessionUtil.getRealName());
         // 新增
         if (ObjectUtil.isEmpty(processRouteTaskVO.getRowId())) {
             taskEntity.setRowId(IdWorker.getId());
             taskEntity.setTaskCode(RandomUtil.randomString(8));
+            taskEntity.setCreatedByName(SessionUtil.getRealName());
+            taskEntity.setExpireStartTime(firstDay);
+            taskEntity.setExpireEndTime(lastDay);
         } else {
             // 修改
 
@@ -162,10 +172,14 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
         if (CollUtil.isNotEmpty(processesVOList)) {
             List<ProcessRouteTaskProcessesEntity> taskProcessesEntityList = Convert.toList(ProcessRouteTaskProcessesEntity.class, processesVOList);
             taskProcessesEntityList.forEach(taskProcessesEntity -> {
+                taskProcessesEntity.setUpdatedByName(SessionUtil.getRealName());
                 // 新增
                 if (ObjectUtil.isEmpty(taskProcessesEntity.getRowId())) {
                     taskProcessesEntity.setRowId(IdWorker.getId());
                     taskProcessesEntity.setTaskRowId(taskEntity.getRowId());
+                    taskProcessesEntity.setCreatedByName(SessionUtil.getRealName());
+                    taskProcessesEntity.setExpireStartTime(firstDay);
+                    taskProcessesEntity.setExpireEndTime(lastDay);
                 } else {
                     // 修改
 
@@ -178,10 +192,14 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
         if (CollUtil.isNotEmpty(assemblyVOList)) {
             List<ProcessRouteTaskAssemblyEntity> taskAssemblyEntityList = Convert.toList(ProcessRouteTaskAssemblyEntity.class, assemblyVOList);
             taskAssemblyEntityList.forEach(taskAssemblyEntity -> {
+                taskAssemblyEntity.setUpdatedByName(SessionUtil.getRealName());
                 // 新增
                 if (ObjectUtil.isEmpty(taskAssemblyEntity.getRowId())) {
                     taskAssemblyEntity.setRowId(IdWorker.getId());
                     taskAssemblyEntity.setTaskRowId(taskEntity.getRowId());
+                    taskAssemblyEntity.setCreatedByName(SessionUtil.getRealName());
+                    taskAssemblyEntity.setExpireStartTime(firstDay);
+                    taskAssemblyEntity.setExpireEndTime(lastDay);
                 } else {
                     // 修改
 
diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
index 4b3a01fe..b68fca9a 100644
--- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
+++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
@@ -4,7 +4,7 @@
 
     <sql id="base_column_list">
         row_id,task_code, factory, material_no, description, usefulness, status, from_batch,
-        to_batch, expire_start_time, expire_end_time, del_flag, created_by, created_time, updated_by,
+        to_batch, expire_start_time, expire_end_time, del_flag, created_by, created_by_name, created_time, updated_by, updated_by_name,
         updated_time, handle_state, sap_state
     </sql>