jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-05-07 23:56:46 +08:00
parent c8541786dd
commit f8d55d7c0a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java
View File

@ -156,8 +156,6 @@ public class ProPlanController extends BaseController
String task_predecessors_str_type = beforeTaskType.toString(); String task_predecessors_str_type = beforeTaskType.toString();
plan.setPredecessors(task_predecessors_str); plan.setPredecessors(task_predecessors_str);
plan.setTaskType(task_predecessors_str_type); plan.setTaskType(task_predecessors_str_type);
plan.setPlanStartDate(task.getActualStart());
plan.setPlanFinishDate(task.getActualFinish());
return plan; return plan;
} }

12
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java
View File

@ -67,21 +67,24 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
if(proPlanSchedule.getSchedulePercent()!=100L){ if(proPlanSchedule.getSchedulePercent()!=100L){
proPlanSchedule.setFinishDate(null); proPlanSchedule.setFinishDate(null);
} }
if(proPlanSchedule.getCreateDate()==null){
proPlanSchedule.setCreateDate(DateUtils.getNowDate());
}
proPlanSchedule.setCreateBy(SecurityContextHolder.getUserName()); proPlanSchedule.setCreateBy(SecurityContextHolder.getUserName());
proPlanSchedule.setCreateDate(DateUtils.getNowDate());
int res = proPlanScheduleMapper.insertProPlanSchedule(proPlanSchedule); int res = proPlanScheduleMapper.insertProPlanSchedule(proPlanSchedule);
if(res>0){ if(res>0){
ProPlan plan = proPlanMapper.selectProPlanById(proPlanSchedule.getPlanId()); ProPlan plan = proPlanMapper.selectProPlanById(proPlanSchedule.getPlanId());
plan.setScheduleNode(proPlanSchedule.getSchedulePercent().toString()); plan.setScheduleNode(proPlanSchedule.getSchedulePercent().toString());
plan.setUpdateTime(proPlanSchedule.getCreateDate());
if(proPlanSchedule.getSchedulePercent()>=100){ if(proPlanSchedule.getSchedulePercent()>=100){
if(plan.getStartDate()==null){ if(plan.getStartDate()==null){
plan.setStartDate(DateUtils.getNowDate()); plan.setStartDate(proPlanSchedule.getCreateDate());
} }
plan.setFinishDate(proPlanSchedule.getFinishDate()); plan.setFinishDate(proPlanSchedule.getFinishDate());
RecursionEditFinishDate(plan); RecursionEditFinishDate(plan);
}else{ }else{
if(plan.getStartDate()==null){ if(plan.getStartDate()==null){
plan.setStartDate(DateUtils.getNowDate()); plan.setStartDate(proPlanSchedule.getCreateDate());
RecursionEditStartDate(plan); RecursionEditStartDate(plan);
}else{ }else{
RecursionEditFinishDate(plan); RecursionEditFinishDate(plan);
@ -282,9 +285,10 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
List<ProPlan> brothers = proPlanMapper.selectProPlanBrothers(plan.getProjectId(),plan.getParentId()); List<ProPlan> brothers = proPlanMapper.selectProPlanBrothers(plan.getProjectId(),plan.getParentId());
if(brothers.size()==0){ if(brothers.size()==0){
ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId()); ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId());
entity.setUpdateTime(plan.getUpdateTime());
if(entity!=null){ if(entity!=null){
if(entity.getStartDate()==null){ if(entity.getStartDate()==null){
entity.setStartDate(DateUtils.getNowDate()); entity.setStartDate(entity.getUpdateTime());
} }
List<ProPlan> belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId()); List<ProPlan> belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId());
Float Finished = 0.0F; Float Finished = 0.0F;

6
yanzhu-ui-vue3/src/views/manage/schedule/index.vue
View File

@ -119,6 +119,7 @@
:value="scope.row.images.split(',').length" :value="scope.row.images.split(',').length"
type="primary" type="primary"
class="item" class="item"
:offset="[2, 8]"
> >
<image-preview :src="scope.row.images" :width="50" :height="50" /> <image-preview :src="scope.row.images" :width="50" :height="50" />
</el-badge> </el-badge>
@ -256,6 +257,9 @@
<el-form-item label="施工作业图" prop="images"> <el-form-item label="施工作业图" prop="images">
<image-upload v-model="form.images" :limit="5" /> <image-upload v-model="form.images" :limit="5" />
</el-form-item> </el-form-item>
<el-form-item label="填报时间" prop="createDate">
<el-date-picker v-model="form.createDate" />
</el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
@ -318,7 +322,7 @@ const data = reactive({
], ],
finishDate: [{ required: true, message: "完成时间不能为空", trigger: "change" }], finishDate: [{ required: true, message: "完成时间不能为空", trigger: "change" }],
description: [{ required: true, message: "施工进度描述不能为空", trigger: "blur" }], description: [{ required: true, message: "施工进度描述不能为空", trigger: "blur" }],
images: [{ required: true, message: "施工作业图不能为空", trigger: "change" }], images_1: [{ required: true, message: "施工作业图不能为空", trigger: "change" }],
}, },
}); });