1

dao/project_account_dao.go

@@ -137,6 +137,7 @@ func (d *ProjectAccountDao) Delete(data *models.CmProjectAccount) error {
 
 // 查找
 func (d *ProjectAccountDao) FindById(id int) (viewmodels.ProjectInfo, error) {
+
 	projectInfo := viewmodels.ProjectInfo{}
 	_, err := d.engine.Sql("select p.`name` as project_name, p.`code`, p.`create_time`, a.`mobile`, a.`name` from `cm_project` as p, `cm_project_account` as a where p.`user_id` = a.`id` and p.`id` = ?", id).Get(&projectInfo)
 	return projectInfo, err

dao/tree_contract_dao.go

@@ -61,15 +61,17 @@ func (d *TreeContractDao) GetAll(bidsectionId int, projectId int, treeType int)
 // 获得项目下的项目节不包含合同
 func (d *TreeContractDao) GetAllNoContract(bidsectionId int, projectId int, treeType int) []models.CmTreeContracts {
 
+	// 获得全部
 	contractCondition := ""
+	// 获得不包含合同
 	if false {
-		contractCondition = "contract_id!=0"
+		contractCondition = "contract_id=0"
 	}
 
 	datalist := make([]models.CmTreeContracts, 0)
 	err := d.engine.
 		Asc("id").
-		Where("bidsection_id =? and project_id=? and tree_type=?"+contractCondition, bidsectionId, projectId, treeType).
+		Where("bidsection_id =? and project_id=? and tree_type=? and contract_id=0"+contractCondition, bidsectionId, projectId, treeType).
 		Limit(5000, 0).
 		Find(&datalist)
 	if err != nil {

services/project_service.go

@@ -7,6 +7,7 @@
 package services
 
 import (
+	"errors"
 	"html"
 	"log"
 	"strconv"
@@ -101,9 +102,12 @@ func (s *projectService) ValidRule(ctx iris.Context) (viewmodels.Project, error)
 // ID获得项目信息-TODO
 func (s *projectService) Get(projectId int) (*viewmodels.Project, error) {
 	data, err := s.dao.FindById(projectId)
-	id, err := comm.AesEncrypt(strconv.Itoa(data.Id), conf.SignSecret)
-	project := &viewmodels.Project{Code: data.Code, Name: data.Name, Id: id}
-	return project, err
+	if err != nil {
+		return nil, errors.New("获得项目详情出错")
+	}
+	project := makeProjectVM(data)
+
+	return &project, nil
 }
 
 // 获得一组项目信息 -项目编号
@@ -154,7 +158,11 @@ func makeProjectVM(projectCM *models.CmProject) viewmodels.Project {
 	projectVM.Name = projectCM.Name
 	projectVM.Category = projectCM.Category
 	projectVM.StaffName = projectCM.StaffName
-	projectVM.CreateTime = projectCM.CreateTime.Format(conf.SysTimeform)
+	projectVM.UserAccount = projectCM.UserAccount
+	if !projectCM.CreateTime.IsZero() {
+		projectVM.CreateTime = projectCM.CreateTime.Format(conf.SysTimeform)
+	}
+
 	return projectVM
 }
 

web/api/project_setting_api.go

@@ -322,7 +322,8 @@ func (c *ProjectSettingApi) GetProject() {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 	}
-	data, err := c.ServiceProjectAccount.GetProjectInfo(projectId)
+	data, err := c.ServiceProject.Get(projectId)
+	// data, err := c.ServiceProjectAccount.GetProjectInfo(projectId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return

web/viewmodels/project.go

@@ -13,17 +13,18 @@ import (
 )
 
 type Project struct {
-	Id         string `form:"id" json:"id"`
-	Code       string `form:"code" json:"code"`
-	Name       string `form:"name" json:"name"`
-	Category   string `form:"category" json:"category"`
-	StaffName  string `form:"staffName" json:"staffName"`
-	CreateTime string `form:"createTime" json:"createTime"`
+	Id          string `form:"id" json:"id"`
+	Code        string `form:"code" json:"code"`
+	Name        string `form:"name" json:"name"`
+	UserAccount string `form:"userAccount" json:"userAccount"`
+	Category    string `form:"category" json:"category"`
+	StaffName   string `form:"staffName" json:"staffName"`
+	CreateTime  string `form:"createTime" json:"createTime"`
 }
 type ProjectInfo struct {
 	ProjectName string `from:"project_name" json:"projectName"`
 	Code        string `from:"code" json:"code"`
-	CreateTime  int    `from:"create_time" json:"createTime"`
+	CreateTime  string `from:"create_time" json:"createTime"`
 	Mobile      string `from:"mobile" json:"mobile"`
 	Name        string `from:"name" json:"name"`
 }