|
@@ -424,6 +424,7 @@ func (s ProjectService) UpdateProjectTarget(projectUpdateParam *vo.ProjectUpdate
|
|
|
ContentType: projectUpdateParam.ContentType,
|
|
|
ProjectDetail: projectUpdateParam.ProjectDetail,
|
|
|
Tools: projectUpdateParam.Tools,
|
|
|
+ EstimatedCost: estimatedCost,
|
|
|
}
|
|
|
//if projectUpdateParam.ProjectStatus == 2 {
|
|
|
// updateProject.SubmitAt = t
|
|
@@ -513,7 +514,11 @@ func (s ProjectService) GetProjectDetail(projectId string) (*vo.ReProjectDetail,
|
|
|
reProjectDetail.ProjectStatus = project.ProjectStatus
|
|
|
reProjectDetail.ProjectPlatform = project.ProjectPlatform
|
|
|
reProjectDetail.CreatedAt = project.CreatedAt.Format("2006-01-02 15:04:05")
|
|
|
- reProjectDetail.EstimatedCost = project.EstimatedCost
|
|
|
+ if project.ProjectStatus < 6 {
|
|
|
+ reProjectDetail.EstimatedCost = project.EstimatedCost
|
|
|
+ } else {
|
|
|
+ reProjectDetail.EstimatedCost = project.NeedPay
|
|
|
+ }
|
|
|
reProjectDetail.ServiceChargeRate = project.ServiceChargeRate
|
|
|
var creatorName, phone string
|
|
|
if project.SubAccountId == 0 {
|
|
@@ -617,7 +622,7 @@ func (s ProjectService) CopyProject(param *vo.ProjectSearchParam) (*string, erro
|
|
|
|
|
|
// 复制任务
|
|
|
projectNew := entity.Project{
|
|
|
- ProjectStatus: projectOrigin.ProjectStatus,
|
|
|
+ ProjectStatus: 1,
|
|
|
ProjectType: projectOrigin.ProjectType,
|
|
|
ProjectId: projectIdNew,
|
|
|
ProductID: projectOrigin.ProductID,
|