From c01ba9929a2a27fb6ce0ea1e0ece918405c25d49 Mon Sep 17 00:00:00 2001 From: liuxi Date: Thu, 10 Jun 2021 16:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nbclass/szxgl/mapper/ProjectMapper.java | 3 ++- .../java/com/nbclass/szxgl/model/Project.java | 21 ++++++++++++++++++- .../service/impl/ProjectServiceImpl.java | 17 +++++++++------ .../resources/mapper/szxgl/ProjectMapper.xml | 10 +++++++-- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/nbclass/szxgl/mapper/ProjectMapper.java b/src/main/java/com/nbclass/szxgl/mapper/ProjectMapper.java index 922bf57..7036514 100644 --- a/src/main/java/com/nbclass/szxgl/mapper/ProjectMapper.java +++ b/src/main/java/com/nbclass/szxgl/mapper/ProjectMapper.java @@ -1,5 +1,6 @@ package com.nbclass.szxgl.mapper; +import java.util.Date; import java.util.List; import java.util.Map; @@ -36,6 +37,6 @@ public interface ProjectMapper extends MyMapper { * @param status * @return */ - public void updateProjectStatus(String id, String contractno, int status); + public void updateProjectStatus(String id, String contractno, int status, String endTime); } \ No newline at end of file diff --git a/src/main/java/com/nbclass/szxgl/model/Project.java b/src/main/java/com/nbclass/szxgl/model/Project.java index 799a2d1..00a8410 100644 --- a/src/main/java/com/nbclass/szxgl/model/Project.java +++ b/src/main/java/com/nbclass/szxgl/model/Project.java @@ -64,11 +64,19 @@ public class Project { /** * 结束时间 */ - @NotNull(message="结束时间不能为空") + // @NotNull(message="结束时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Column(name = "_end_time") private Date endTime; + /** + * 项目计划时间 + */ + @NotNull(message="计划时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Column(name = "_plan_time") + private Date planTime; + /** * 创建人 */ @@ -125,6 +133,7 @@ public class Project { */ @Column(name = "_project_clien_array") private String projectClienArray; + // 以下是查询字段 @@ -170,6 +179,8 @@ public class Project { private String starttime; @Transient private String endtime; + @Transient + private String plantime; /** * 项目负责人userid(多个逗号分隔) @@ -268,6 +279,14 @@ public class Project { public void setEndTime(Date endTime) { this.endTime = endTime; } + public Date getPlanTime() { + return planTime; + } + + public void setPlanTime(Date planTime) { + this.planTime = planTime; + } + public String getCreateUserId() { return createUserId; 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 9a357b2..4e731a7 100644 --- a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java @@ -250,7 +250,7 @@ public class ProjectServiceImpl implements ProjectService { */ @Transactional public String addProject(Project p, Integer isSendMsg, String[] deptIds, List filesList) { - if (p.getStartTime().getTime() > p.getEndTime().getTime()) { + if (p.getStartTime().getTime() > p.getPlanTime().getTime()) { throw new ParameterException("项目时间范围不对！"); } @@ -425,13 +425,14 @@ public class ProjectServiceImpl implements ProjectService { if(p.getStartTime()==null) { throw new ParameterException("开始时间不能为空！"); } - if(p.getEndTime()==null) { - throw new ParameterException("结束时间不能为空！"); + if(p.getPlanTime()==null) { + throw new ParameterException("计划时间不能为空！"); } - if (p.getStartTime().getTime() > p.getEndTime().getTime()) { + if (p.getStartTime().getTime() > p.getPlanTime().getTime()) { throw new ParameterException("项目时间范围不对！"); } - + //修改项目不能修改结束时间 + p.setEndTime(null); String[] fzrIds = null, csrIds = null; if(StringUtils.isNotBlank(p.getFzrIds()))fzrIds = p.getFzrIds().split(","); if(StringUtils.isNotBlank(p.getCsrIds()))csrIds = p.getCsrIds().split(","); @@ -974,7 +975,11 @@ public class ProjectServiceImpl implements ProjectService { if(Integer.parseInt(status)==3 && StringUtils.isBlank(contractno)) { throw new ParameterException("合同号不能为空"); } - mapper.updateProjectStatus(id, contractno, Integer.parseInt(status)); + Date endTime = null; + if (status.equals("3")){ + endTime = new Date(); + } + mapper.updateProjectStatus(id, contractno, Integer.parseInt(status),DateUtil.date2String(new Date(),DateUtil.PATTERN_STANDARD)); } @Override diff --git a/src/main/resources/mapper/szxgl/ProjectMapper.xml b/src/main/resources/mapper/szxgl/ProjectMapper.xml index 4853d6d..cbc41ba 100644 --- a/src/main/resources/mapper/szxgl/ProjectMapper.xml +++ b/src/main/resources/mapper/szxgl/ProjectMapper.xml @@ -13,6 +13,7 @@ + @@ -25,7 +26,7 @@