caipin před 4 roky
rodič
revize
bd04de41ba
3 změnil soubory, kde provedl 21 přidání a 10 odebrání
  1. 4 1
      models/cm_project.go
  2. 4 0
      services/project_service.go
  3. 13 9
      web/viewmodels/project.go

+ 4 - 1
models/cm_project.go

@@ -5,7 +5,7 @@ import (
 )
 
 type CmProject struct {
-	Id               int       `xorm:"not null pk autoincr comment('自增ID') INT(11)"`
+	Id               int       `xorm:"not null pk comment('自增ID') INT(11)"`
 	Code             string    `xorm:"comment('项目编号') VARCHAR(32)"`
 	EnterpriseId     int       `xorm:"comment('企业id') INT(11)"`
 	UserId           int       `xorm:"comment('管理员id(sso用户)') INT(11)"`
@@ -14,6 +14,9 @@ type CmProject struct {
 	Category         string    `xorm:"comment('办事处') VARCHAR(32)"`
 	StaffId          string    `xorm:"comment('负责人Id(cld员工)') VARCHAR(64)"`
 	StaffName        string    `xorm:"comment('负责人(cld员工)') VARCHAR(32)"`
+	StaffQq          string    `xorm:"comment('负责人QQ') VARCHAR(32)"`
+	StaffPhone       string    `xorm:"comment('负责人手机') VARCHAR(32)"`
+	StaffTelephone   string    `xorm:"comment('负责人座机') VARCHAR(32)"`
 	CreateTime       time.Time `xorm:"comment('创建时间') DATETIME"`
 	CreateName       string    `xorm:"comment('创建人') VARCHAR(32)"`
 	CreateCategory   string    `xorm:"comment('创建办事处') VARCHAR(32)"`

+ 4 - 0
services/project_service.go

@@ -220,8 +220,12 @@ func makeProjectVM(projectCM *models.CmProject) viewmodels.Project {
 	projectVM.Name = projectCM.Name
 	projectVM.Category = projectCM.Category
 	projectVM.StaffName = projectCM.StaffName
+	projectVM.StaffPhone = projectCM.StaffPhone
+	projectVM.StaffQq = projectCM.StaffQq
+	projectVM.StaffTelephone = projectCM.StaffTelephone
 	projectVM.UserId = userId
 	projectVM.UserAccount = projectCM.UserAccount
+
 	if !projectCM.CreateTime.IsZero() {
 		projectVM.CreateTime = projectCM.CreateTime.Format(conf.SysTimeform)
 	}

+ 13 - 9
web/viewmodels/project.go

@@ -13,15 +13,19 @@ import (
 )
 
 type Project struct {
-	Id               string `form:"id" json:"id"`
-	Code             string `form:"code" json:"code"`
-	Name             string `form:"name" json:"name"`
-	UserId           string `form:"userId" json:"userId"`
-	UserAccount      string `form:"userAccount" json:"userAccount"`
-	CategoryId       string `form:"categoryId" json:"categoryId"`
-	Category         string `form:"category" json:"category"`
-	StaffId          string `form:"staffId" json:"staffId"`
-	StaffName        string `form:"staffName" json:"staffName"`
+	Id             string `form:"id" json:"id"`
+	Code           string `form:"code" json:"code"`
+	Name           string `form:"name" json:"name"`
+	UserId         string `form:"userId" json:"userId"`
+	UserAccount    string `form:"userAccount" json:"userAccount"`
+	CategoryId     string `form:"categoryId" json:"categoryId"`
+	Category       string `form:"category" json:"category"`
+	StaffId        string `form:"staffId" json:"staffId"`
+	StaffName      string `form:"staffName" json:"staffName"`
+	StaffQq        string `form:"staffQq" json:"staffQq"`
+	StaffPhone     string `form:"staffPhone" json:"staffPhone"`
+	StaffTelephone string `form:"staffTelephone" json:"staffTelephone"`
+
 	CreateTime       string `form:"createTime" json:"createTime"`
 	CreateName       string `form:"createName" json:"createName"`
 	CreateCategory   string `form:"createCategory" json:"createCategory"`