From 40b84471af090076dab16f8608e5b1c8132591f5 Mon Sep 17 00:00:00 2001 From: qqkj Date: Fri, 16 Apr 2021 17:56:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xm-core/src/main/java/com/xm/core/entity/XmProject.java | 6 +++--- .../src/main/java/com/xm/core/entity/XmProjectBaseline.java | 6 +++--- .../java/com/xm/core/service/XmProjectBaselineService.java | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java index ff8e145c..5bcb402d 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java @@ -63,7 +63,7 @@ public class XmProject implements java.io.Serializable { @ApiModelProperty(notes="考核备注",allowEmptyValue=true,example="",allowableValues="") String assessRemarks; - @ApiModelProperty(notes="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后",allowEmptyValue=true,example="",allowableValues="") String status; @ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="") @@ -235,7 +235,7 @@ public class XmProject implements java.io.Serializable { this.assessRemarks = assessRemarks; } /** - * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停 + * 项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后 **/ public void setStatus(String status) { this.status = status; @@ -476,7 +476,7 @@ public class XmProject implements java.io.Serializable { return this.assessRemarks; } /** - * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停 + * 项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后 **/ public String getStatus() { return this.status; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java index 56a484eb..fc80492e 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java @@ -62,7 +62,7 @@ public class XmProjectBaseline implements java.io.Serializable { @ApiModelProperty(notes="考核备注",allowEmptyValue=true,example="",allowableValues="") String assessRemarks; - @ApiModelProperty(notes="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停，5-售前，6-售后",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后",allowEmptyValue=true,example="",allowableValues="") String status; @ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="") @@ -240,7 +240,7 @@ public class XmProjectBaseline implements java.io.Serializable { this.assessRemarks = assessRemarks; } /** - * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停，5-售前，6-售后 + * 项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后 **/ public void setStatus(String status) { this.status = status; @@ -493,7 +493,7 @@ public class XmProjectBaseline implements java.io.Serializable { return this.assessRemarks; } /** - * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停，5-售前，6-售后 + * 项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后 **/ public String getStatus() { return this.status; diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java index 4b53e880..f3d71e28 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java @@ -30,7 +30,8 @@ public class XmProjectBaselineService extends BaseService { XmProjectBaseline projectBase=new XmProjectBaseline(); BeanUtils.copyProperties(project, projectBase); projectBase.setId(this.createKey("id")); - projectBase.setCtime(new Date()); + projectBase.setProjectId(project.getId()); + projectBase.setBaseTime(new Date()); projectBase.setBaseRemark(remark); projectBase.setBaselineId(sequenceService.getCommonNo("{date:yyyyMMddHHmmssS}-{rand:4}")); this.insert(projectBase);