diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index 65fc1ecb..fbedf416 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -516,8 +516,12 @@ public class LyricInternalServiceImpl implements ILyricInternalService { req.setDemandStatus("0"); req.setAchieveStatus("0"); req.setProgress(0); + // 计划开始对应任务的计划开始时间 req.setBeginTime(todo.getPlanStartTime()); - req.setEndTime(todo.getClosedTime()); + // 需求时间对应任务的计划结束时间 + req.setEndTime(todo.getRequiredTime()); + // 完成时间对应任务的完成时间 + req.setFinishTime(todo.getFinishTime()); // 这里取EP中的创建时间 String createTime = todo.getCreateTime(); if (StringUtils.isBlank(createTime)) { diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java index 11fff2e6..54a3670e 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java @@ -232,6 +232,7 @@ public class SimulationTaskServiceImpl extends ServiceImpl diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml index 96caa469..2f0d78f0 100644 --- a/project/src/main/resources/mapper/SimulationTaskMapper.xml +++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml @@ -11,11 +11,11 @@ - insert into simulation_task (uuid,task_name,task_code,task_pool_name,task_pool_version,node_id,days,standard,fold_id,status,achieve_status,begin_time,end_time,progress,exe_status,confidence,analyse_target,analyse_software,approval_status,description,difficult,tenant_id + insert into simulation_task (uuid,task_name,task_code,task_pool_name,task_pool_version,node_id,days,standard,fold_id,status,achieve_status,begin_time,end_time,finish_time,progress,exe_status,confidence,analyse_target,analyse_software,approval_status,description,difficult,tenant_id ,creator,create_time,department,sectionName,groupName,bCapacity,flowTemplate,englishName,demand_id,tag1,tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10,imageFileId,discipline) values (#{it.uuid},#{it.taskName},#{it.taskCode},'','',#{it.nodeId},#{it.days},#{it.standard},'',1,0, - #{it.beginTime},#{it.endTime},0,1,#{it.confidence},#{it.analyseTarget},#{it.analyseSoftware},'0',#{it.description},#{it.difficult},#{it.tenantId}, + #{it.beginTime},#{it.endTime},#{it.finishTime},0,1,#{it.confidence},#{it.analyseTarget},#{it.analyseSoftware},'0',#{it.description},#{it.difficult},#{it.tenantId}, #{it.creator},#{it.createTime},#{it.department},#{it.sectionName},#{it.groupName},#{it.bCapacity},#{it.flowTemplate},#{it.englishName},#{it.demandId},#{it.tag1},#{it.tag2}, #{it.tag3},#{it.tag4}, #{it.tag5},#{it.tag6},