1

conf/db.go

@@ -29,13 +29,13 @@ var DbMasterList = []DbConfig{
 	},
 	// production
 	{
-		Host:      "192.168.1.170",
-		Port:      30000,
+		Host:      "192.168.1.158",
+		Port:      8066,
 		User:      "root",
-		Pwd:       "root",
+		Pwd:       "123456",
 		Datebase:  "construction",
 		IsRunning: true,
 	},
 }
 
-var DbMaster = DbMasterList[0]
+var DbMaster = DbMasterList[1]

dao/tree_contract_dao.go

@@ -48,6 +48,7 @@ func (d *TreeContractDao) GetAll(bidsectionId int, projectId int, treeType int)
 	err := d.engine.
 		Asc("id").
 		Where("bidsection_id =? and project_id=? and tree_type=?", bidsectionId, projectId, treeType).
+		Limit(5000, 0).
 		Find(&datalist)
 	if err != nil {
 		return datalist

lib/permission.json

@@ -22,7 +22,7 @@
             "/api/contract/survey"
         ],
         "delete":[
-
+            ""
         ]
     },
     "quality": {

services/project_account_service.go

@@ -29,6 +29,7 @@ import (
 type ProjectAccountService interface {
 	ValidRule(ctx iris.Context) (viewmodels.ProjectAccount, error)
 	ValidRulePermission(ctx iris.Context) (viewmodels.Permission, error)
+	ValidRuleAccount(ctx iris.Context) (viewmodels.ProjectAccount, error)
 
 	Get(accountId int, projectId int) *viewmodels.ProjectAccount
 	GetAll(projectId int) []viewmodels.ProjectAccount
@@ -36,6 +37,7 @@ type ProjectAccountService interface {
 	Search(name string, projectId int) []viewmodels.ProjectAccount
 	Add(viewAccount viewmodels.ProjectAccount, projectId int) error
 	Save(viewAccount viewmodels.ProjectAccount, id int, projectId int) error
+	SaveAccount(viewAccount viewmodels.ProjectAccount, id int, projectId int) error
 	Enable(id int, projectId int, enable int) error
 	ChangeAccount(id int, projectId int, viewAccount viewmodels.ProjectAccount) error
 	GetProjectInfo(id int) (viewmodels.ProjectInfo, error)
@@ -129,6 +131,25 @@ func (s *projectAccountService) ValidRulePermission(ctx iris.Context) (viewmodel
 	return accountVaild, nil
 }
 
+// 验证编辑用户
+func (s *projectAccountService) ValidRuleAccount(ctx iris.Context) (viewmodels.ProjectAccount, error) {
+	accountVaild := viewmodels.ProjectAccount{}
+	err := ctx.ReadJSON(&accountVaild)
+	if err != nil {
+		log.Println("account-ValidRule-ReadForm转换异常, error=", err)
+		return accountVaild, err
+	}
+
+	err = accountVaild.ValidateAccount()
+
+	if err != nil {
+		log.Println("权限验证, error=", err)
+		return accountVaild, err
+	}
+
+	return accountVaild, nil
+}
+
 // 获得一个项目用户
 func (s *projectAccountService) Get(id int, projectId int) *viewmodels.ProjectAccount {
 	modelsAccount := s.dao.Get(id, projectId)
@@ -227,11 +248,25 @@ func (s *projectAccountService) Save(viewAccount viewmodels.ProjectAccount, id i
 	//account.Mobile = viewAccount.Mobile
 	account.Telephone = viewAccount.Telephone
 	account.AccountGroup = viewAccount.AccountGroup
+
 	err := s.dao.Update(&account, []string{"Name", "Company", "Position", "Telephone", "AccountGroup"})
 
 	return err
 }
 
+func (s *projectAccountService) SaveAccount(viewAccount viewmodels.ProjectAccount, id int, projectId int) error {
+	account := models.CmProjectAccount{}
+	account.Id = id
+	account.ProjectId = projectId
+	account.Name = viewAccount.Name
+	account.Company = viewAccount.Company
+	account.Position = viewAccount.Position
+	account.Telephone = viewAccount.Telephone
+	err := s.dao.Update(&account, []string{"Name", "Company", "Position", "Telephone"})
+
+	return err
+}
+
 // 设置启用/禁止
 func (s *projectAccountService) Enable(id int, projectId int, enable int) error {
 

web/api/project_account_api.go

@@ -150,3 +150,45 @@ func (c *ProjectAccountApi) GetSearch() {
 		"data": dataList,
 	})
 }
+
+// @Summary 编辑账号
+// @Tags 项目账号相关
+// @Description 编辑账号
+// @Accept  json
+// @Produce  json
+// @Security ApiKeyAuth
+// @Param   id     body    string     true        "账号ID" default(PcqqGsn1O0jBSmLqkuOTwQ)
+// @Param   name     body    string     true        "姓名"
+// @Param   company     body    string     true        "公司"
+// @Param   position     body    string     true        "职位"
+// @Param   telephone     body    string     true        "座机"
+// @Success 200 {string} string "{code:0成功,-1参数类错误,data:viewmodels.ProjectAccount,msg:错误信息}"
+// @Router /api/projectAccount/account/save [post]
+func (c *ProjectAccountApi) PostAccountSave() {
+	// 验证内容
+	AccountData, err := c.ServiceProjectAccount.ValidRuleAccount(c.Ctx)
+	if err != nil {
+		ErrMsg := utils.FormValidError(err)
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": ErrMsg})
+		return
+	} else {
+		// 获得更新账号ID
+		id, err := utils.GetDecryptId(AccountData.Id)
+		if err != nil {
+			c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+			return
+		}
+		projectId, err := utils.GetProjectId(c.Ctx)
+		if err != nil {
+			c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+			return
+		}
+
+		err = c.ServiceProjectAccount.SaveAccount(AccountData, id, projectId)
+		if err != nil {
+			c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+			return
+		}
+		c.Ctx.JSON(iris.Map{"code": 0, "msg": "编辑成功"})
+	}
+}

web/viewmodels/project_account.go

@@ -61,6 +61,14 @@ func (l ProjectAccount) ValidatePassword() error {
 	)
 }
 
+func (l ProjectAccount) ValidateAccount() error {
+	return validation.ValidateStruct(&l,
+		validation.Field(&l.Name, validation.Required.Error("姓名不能为空")),
+		validation.Field(&l.Company, validation.Required.Error("单位不能为空")),
+		validation.Field(&l.Position, validation.Required.Error("职位不能为空")),
+	)
+}
+
 //MoveId string `form:"moveId"`
 // LastLogin    int       `xorm:"comment('最后登录时间') INT(11)"`