Browse Source

校验:指定任务是否完成

master
gjh 2 weeks ago
parent
commit
9b8a4a2704
  1. 11
      huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java
  2. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java
  3. 31
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java

11
huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java

@ -239,4 +239,15 @@ public class HuzhouPlanController {
List<PlanSelectVo> rs =planinfoService.getPlanNames(projectid);
return Result.OK(rs);
}
/**
* 自测接口
* @param projectId
* @return
*/
@GetMapping("/isCanUploadFile")
public Result<?> isCanUploadFile(@Param("projectId") String projectId,@Param("taskName")String taskName) {
Boolean rs = planinfoService.isCanUploadFile(projectId, taskName);
return Result.OK("指定任务是否完成:",rs);
}
}

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java

@ -138,4 +138,6 @@ public interface IHuzhouPlaninfoService extends IService<HuzhouPlaninfo> {
void updateScheduledTime(HuzhouPlaninfo huzhouPlaninfo);
List<PlanSelectVo> getPlanNames(String projectid);
Boolean isCanUploadFile(String projectId,String taskName);
}

31
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java

@ -1707,12 +1707,13 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
}
@Override
public void modifyPlanSpecialProject(MultipartFile multipartFile, String projectid,HttpServletResponse response) throws IOException {
// 校验文件名称
checkExcelName(multipartFile,"监理项目模板");
LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectid)
.last("LIMIT 1");
// 不知道groupId 有什么用暂时
HuzhouPlaninfo oldPlanInfo = planInfoMapper.selectOne(queryWrapper);
String groupId = oldPlanInfo.getGroupId();
// 1. 删除原先的计划
@ -1751,18 +1752,12 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
.set(HuzhouPlaninfo::getIsfinish, "0");
planInfoMapper.update(null, updateWrapper1);
// 立项阶段默认完成
// LambdaUpdateWrapper<HuzhouPlaninfo> updateWrapper2 = new LambdaUpdateWrapper<>();
// updateWrapper2.eq(HuzhouPlaninfo::getProjectId, projectid)
// .likeRight(HuzhouPlaninfo::getTaskLevel, "1")
// .set(HuzhouPlaninfo::getIsfinish, "2");
// planInfoMapper.update(null, updateWrapper2);
// TODO 5. 更新子项目计划更新标志
// LambdaUpdateWrapper<HuzhouSubProjectinfo> subUpdateWrapper = new LambdaUpdateWrapper<>();
// subUpdateWrapper.eq(HuzhouSubProjectinfo::getId, projectid);
// subUpdateWrapper.set(HuzhouSubProjectinfo::getUpdatePlanFlag, "2");
// subProjectInfoMapper.update(null, subUpdateWrapper);
// 5. 增加限制:监理项目只允许修改一次
LambdaUpdateWrapper<HuzhouSubProjectinfo> subUpdateWrapper = new LambdaUpdateWrapper<>();
subUpdateWrapper.eq(HuzhouSubProjectinfo::getId, projectid);
subUpdateWrapper.set(HuzhouSubProjectinfo::getUpdatePlanFlag, "2");
subProjectInfoMapper.update(null, subUpdateWrapper);
}
@Override
@ -1786,4 +1781,14 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
}
return rs;
}
@Override
public Boolean isCanUploadFile(String projectId, String taskName) {
LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(HuzhouPlaninfo::getProjectId, projectId)
.eq(HuzhouPlaninfo::getTaskName, taskName)
.eq(HuzhouPlaninfo::getIsfinish, "2");
return planInfoMapper.selectCount(queryWrapper) > 0;
}
}

Loading…
Cancel
Save