fix[project]: 同步待办时，调整待办和任务时间相关字段的取值逻辑

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)) {

project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java

@@ -232,6 +232,7 @@ public class SimulationTaskServiceImpl extends ServiceImpl<SimulationTaskMapper,
         task.setDescription(demand.getDescription());
         task.setBeginTime(demand.getBeginTime());
         task.setEndTime(demand.getEndTime());
+        task.setFinishTime(demand.getFinishTime());
         task.setCreator(demand.getCreator());
         task.setCreateTime(demand.getCreateTime());
         task.setTenantId(ThreadLocalContext.getTenantId());

project/src/main/resources/mapper/SimulationDemandMapper.xml

@@ -8,7 +8,7 @@
         insert into simulation_demand (uuid,demand_name,demand_code,demand_type,sim_type,demand_status,achieve_status,progress,approval_status,
                                        begin_time,end_time,finish_time,project_id,phase_id,workspace_id,tenant_id,creator,create_time,demandSource,description,machine_id) values
             (#{req.uuid},#{req.demandName},#{req.demandCode},#{req.demandType},#{req.simType},#{req.demandStatus},#{req.achieveStatus},#{req.progress},#{req.approvalStatus},
-             #{req.beginTime},#{req.endTime},'',#{req.projectId},#{req.phaseId},#{req.workspaceId},#{tenantId},#{req.creator},#{req.createTime},#{req.demandSource},#{req.description},#{req.machineId})
+             #{req.beginTime},#{req.endTime},#{req.finishTime},#{req.projectId},#{req.phaseId},#{req.workspaceId},#{tenantId},#{req.creator},#{req.createTime},#{req.demandSource},#{req.description},#{req.machineId})
     </insert>
 
     <insert id="addDemandMember">

project/src/main/resources/mapper/SimulationTaskMapper.xml

@@ -11,11 +11,11 @@
     </insert>
 
     <insert id="saveBatchTask"  useGeneratedKeys="true" keyProperty="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,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
         <foreach collection='list' item='it' index='index' separator=','>
             (#{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},