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 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 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 @@ 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