Merge branch 'master' of http://192.168.1.41:3000/caipin/construction_management

dao/approver_dao.go

@@ -72,6 +72,7 @@ func (d *ApproverDao) InsertData(cur_uid int, bid int, pid int, dataType int, da
 		approverVM.ProjectId = pid
 		approverVM.DataType = dataType
 		approverVM.DataId = dataId
+		approverVM.CreateTime = time.Now()
 		approverVM.Status = 0
 		if i == 0 {
 			approverVM.Status = 1
@@ -107,6 +108,7 @@ func (d *ApproverDao) InsertData(cur_uid int, bid int, pid int, dataType int, da
 		approverVM.ProjectId = pid
 		approverVM.DataType = dataType
 		approverVM.DataId = dataId
+		approverVM.CreateTime = time.Now()
 		data = append(data, approverVM)
 
 		// 消息推送
@@ -484,8 +486,8 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 				session.Rollback()
 				return err
 			}
-			// 改变审批流程中的整改人id
-			_, err = session.Exec("update `cm_approver` set `audit_id` = ? where `bidsection_id` = ? and `data_type` = ? and `data_id` = ? and `audit_order` = ?", auditId, auditor.BidsectionId, auditor.DataType, auditor.DataId, auditor.AuditOrder+1)
+			// 改变审批流程中的整改人id, 以及创建时间
+			_, err = session.Exec("update `cm_approver` set `audit_id` = ? where `bidsection_id` = ? and `data_type` = ? and `data_id` = ? and `audit_order` = ? create_time = ?", auditId, auditor.BidsectionId, auditor.DataType, auditor.DataId, auditor.AuditOrder+1, time.Now())
 			if err != nil {
 				session.Rollback()
 				return err

dao/permission_account_dao.go

@@ -71,22 +71,11 @@ func (d *PermissionAccountDao) Update(data *models.CmPermissionAccount, columns
 }
 
 // 获得当前账号下的标段权限
-func (d *PermissionAccountDao) GetPermissionWithAccountId(accountId int, bidsectionId int, isAdmin bool) (viewmodels.PermissionView, error) {
+func (d *PermissionAccountDao) GetPermissionWithAccountId(accountId int, bidsectionId int) (viewmodels.PermissionView, error) {
 	data := viewmodels.PermissionView{}
 	permission := viewmodels.Permission{}
-	if isAdmin == true {
-		permission.ContractAccess = 1
-		permission.ContractAdd = 1
-		permission.ContractDelete = 1
-		permission.QualityAccess = 1
-		permission.QualityAdd = 1
-		permission.QualityDelete = 1
-		permission.SafeAccess = 1
-		permission.SafeAdd = 1
-		permission.SafeDelete = 1
-	}
 	has, err := d.engine.
-		Sql("select * from cm_permission_account where bidsection_id= ? and account_id = ?", bidsectionId, accountId).
+		Sql("select * from cm_permission_account where bidsection_id= ? and account_id = ?", accountId, bidsectionId).
 		Get(&data)
 	if has == false {
 		contractPermission := map[string]int{

services/bid_account_service.go

@@ -23,7 +23,7 @@ type BidAccountService interface {
 	ValidRuleDelete(ctx iris.Context) (viewmodels.BidAccount, error)
 	Create(viewBidAccount viewmodels.BidAccount, projectId int, accountId int) error
 	Delete(viewBidAccount viewmodels.BidAccount, projectId int) error
-	GetPermission(accountId int, bidsectionId int, projectId int) (viewmodels.PermissionView, error)
+	GetPermission(accountId int, bidsectionId int) (viewmodels.PermissionView, error)
 }
 
 //返回service操作类
@@ -83,15 +83,8 @@ func (s *bidAccountService) ValidRuleDelete(ctx iris.Context) (viewmodels.BidAcc
 }
 
 // 获取当前标段的权限
-func (s *bidAccountService) GetPermission(accountId int, bidsectionId int, projectId int) (viewmodels.PermissionView, error) {
-	account := s.projectAccountDao.Get(accountId, projectId)
-	var isAdmin bool
-	if account.IsAdmin == 1 {
-		isAdmin = true
-	} else {
-		isAdmin = false
-	}
-	data, err := s.permissionDao.GetPermissionWithAccountId(accountId, bidsectionId, isAdmin)
+func (s *bidAccountService) GetPermission(accountId int, bidsectionId int) (viewmodels.PermissionView, error) {
+	data, err := s.permissionDao.GetPermissionWithAccountId(accountId, bidsectionId)
 	return data, err
 }
 

services/project_account_service.go

@@ -32,7 +32,6 @@ type ProjectAccountService interface {
 	ValidRulePermission(ctx iris.Context) (viewmodels.Permission, error)
 	ValidRuleAccount(ctx iris.Context) (viewmodels.ProjectAccount, error)
 	ValidGetPermission(ctx iris.Context) (viewmodels.Permission, error)
-	ValidRuleProjectId(ctx iris.Context) (viewmodels.ProjectAccount, error)
 	Get(accountId int, projectId int) *viewmodels.ProjectAccount
 	GetAll(projectId int) []viewmodels.ProjectAccount
 	GetBidAccount(bidsectionId int, projectId int, projectAccountId int, name string) []viewmodels.ProjectAccount

web/api/project_setting_auth_api.go

@@ -229,14 +229,7 @@ func (c *ProjectSettingApi) GetPermission() {
 		return
 	}
 
-	// 获得项目ID
-	pid, err := utils.GetProjectId(c.Ctx)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
-		return
-	}
-
-	data, err := c.ServiceBidAccount.GetPermission(accountId, bidsectionId, pid)
+	data, err := c.ServiceBidAccount.GetPermission(accountId, bidsectionId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return

web/viewmodels/permission.go

@@ -34,6 +34,12 @@ type PermissionView struct {
 	SafePermission     string `from:"safe_permission" json:"safe"`
 }
 
+type PermissionView struct {
+	ContractPermission string `from:"contract_permission" json:"contract"`
+	QualityPermission  string `from:"quality_permission" json:"quality"`
+	SafePermission     string `from:"safe_permission" json:"safe"`
+}
+
 func (l Permission) Validate() error {
 	return validation.ValidateStruct(&l,
 		validation.Field(&l.BidsectionId, validation.Required.Error("标段ID不能为空")),
@@ -41,11 +47,6 @@ func (l Permission) Validate() error {
 	)
 }
 
-func (l Permission) ValidateType() error {
-	return validation.ValidateStruct(&l,
-		validation.Field(&l.BidsectionType, validation.In(0, 1, 2).Error("未找到相关请求类型")),
-	)
-}
 func (l Permission) ValidateSinglePermission() error {
 	return validation.ValidateStruct(&l,
 		validation.Field(&l.BidsectionId, validation.Required.Error("标段ID不能为空")),