diff --git a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java index 4e731a7..07de285 100644 --- a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java @@ -400,7 +400,7 @@ public class ProjectServiceImpl implements ProjectService { + "

" + "项目名称:" + name + "
" + "客户单位:" + projectClientService.getNamesById(p.getProjectClientId()) + "
" + "计划时间:" - + DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getEndTime(), "MM-dd") + + DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getPlanTime(), "MM-dd") + "
" + "负责人:" + fzrNames // StringUtils.trimToEmpty(StringUtils.join(fzrNames, ",")) + "
" + "创建人:" + syUsersMapper.findByUserName(p.getCreateUserId()).getTrueName(); if (StringUtils.isNotBlank(toUser)) { @@ -473,7 +473,8 @@ public class ProjectServiceImpl implements ProjectService { oldPro.setName(p.getName()); oldPro.setContent(p.getContent()); oldPro.setStartTime(p.getStartTime()); - oldPro.setEndTime(p.getEndTime()); + //oldPro.setEndTime(p.getEndTime()); + oldPro.setPlanTime(p.getPlanTime()); oldPro.setType(p.getType()); oldPro.setStatus(p.getStatus()); oldPro.setImportance(p.getImportance());