1

dao/tree_contract_dao.go

@@ -61,17 +61,10 @@ 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"
-	}
-
 	datalist := make([]models.CmTreeContracts, 0)
 	err := d.engine.
 		Asc("id").
-		Where("bidsection_id =? and project_id=? and tree_type=? and contract_id=0"+contractCondition, bidsectionId, projectId, treeType).
+		Where("bidsection_id =? and project_id=? and tree_type=? and contract_id=0", bidsectionId, projectId, treeType).
 		Limit(5000, 0).
 		Find(&datalist)
 	if err != nil {

services/contract_service.go

@@ -303,82 +303,10 @@ func (s *contractService) Get(treeId int, bidsectionId int, projectId int, treeT
 func (s *contractService) GetContract(contractId int) *viewmodels.Contracts {
 	contract := s.contractDao.Get(contractId)
 
-	contractsVM := makeContractVM(contract)
-
-	// contractsVM := &viewmodels.Contracts{}
-
-	// id, _ := comm.AesEncrypt(strconv.Itoa(contract.Id), conf.SignSecret)
-	// treeId, _ := comm.AesEncrypt(strconv.Itoa(contract.TreeId), conf.SignSecret)
-	// bidsectionId, _ := comm.AesEncrypt(strconv.Itoa(contract.BidsectionId), conf.SignSecret)
-
-	// contractsVM.Id = id
-	// contractsVM.TreeId = treeId
-	// contractsVM.ContractsType = contract.ContractsType
-	// contractsVM.BidsectionId = bidsectionId
-
-	// contractsVM.Name = contract.Name
-	// contractsVM.Content = contract.Content
-	// contractsVM.Code = contract.Code
-	// contractsVM.PartyA = contract.PartyA
-	// contractsVM.PartyASigner = contract.PartyASigner
-	// contractsVM.PartyB = contract.PartyB
-	// contractsVM.PartyBSigner = contract.PartyBSigner
-	// contractsVM.Remarks = contract.Remarks
-	// contractsVM.Price = contract.Price
-	// contractsVM.Returned = contract.Returned
-	// contractsVM.Paid = contract.Paid
-	// contractsVM.Status = contract.Status
-	// contractsVM.Locking = contract.Locking
-
-	// contractsVM.CreateTime = contract.CreateTime.Format(conf.SysTimeform)
-	// contractsVM.UpdateTime = contract.UpdateTime.Format(conf.SysTimeform)
-	// contractsVM.SignerTime = contract.SignerTime.Format(conf.SysTimeform)
-
+	contractsVM := s.makeContractVM(contract)
 	return &contractsVM
 }
 
-// 构建合同详情视图
-func makeContractVM(contract *models.CmContracts) viewmodels.Contracts {
-	contractsVM := viewmodels.Contracts{}
-	if contract.Id == 0 {
-		return contractsVM
-	}
-
-	id, _ := comm.AesEncrypt(strconv.Itoa(contract.Id), conf.SignSecret)
-	treeId, _ := comm.AesEncrypt(strconv.Itoa(contract.TreeId), conf.SignSecret)
-	bidsectionId, _ := comm.AesEncrypt(strconv.Itoa(contract.BidsectionId), conf.SignSecret)
-
-	contractsVM.Id = id
-	contractsVM.TreeId = treeId
-	contractsVM.ContractsType = contract.ContractsType
-	contractsVM.BidsectionId = bidsectionId
-
-	contractsVM.Name = contract.Name
-	contractsVM.Content = contract.Content
-	contractsVM.Code = contract.Code
-	contractsVM.PartyA = contract.PartyA
-	contractsVM.PartyASigner = contract.PartyASigner
-	contractsVM.PartyB = contract.PartyB
-	contractsVM.PartyBSigner = contract.PartyBSigner
-	contractsVM.Remarks = contract.Remarks
-	contractsVM.Price = contract.Price
-	contractsVM.Returned = contract.Returned
-	contractsVM.Paid = contract.Paid
-	contractsVM.Status = contract.Status
-	contractsVM.Locking = contract.Locking
-
-	contractsVM.CreateTime = contract.CreateTime.Format(conf.SysTimeform)
-	contractsVM.UpdateTime = contract.UpdateTime.Format(conf.SysTimeform)
-	// nilTime := time.Time{}
-	// contract.SignerTime != nilTime
-
-	if !contract.SignerTime.IsZero() {
-		contractsVM.SignerTime = contract.SignerTime.Format(conf.SysTimeform)
-	}
-
-	return contractsVM
-}
-
 // 新增合同
 func (s *contractService) Add(contractData *viewmodels.Contracts, projectId int, bidsectionId int, treeId int) error {
 	// 1. 项目节存在
@@ -656,3 +584,45 @@ func (s *contractService) getContractTotalAndPrice(bidsectionId int, projectId i
 
 	return contractTotal, priceTotal
 }
+
+// 构建合同详情视图
+func (s *contractService) makeContractVM(contract *models.CmContracts) viewmodels.Contracts {
+	contractsVM := viewmodels.Contracts{}
+	if contract.Id == 0 {
+		return contractsVM
+	}
+
+	id, _ := comm.AesEncrypt(strconv.Itoa(contract.Id), conf.SignSecret)
+	treeId, _ := comm.AesEncrypt(strconv.Itoa(contract.TreeId), conf.SignSecret)
+	bidsectionId, _ := comm.AesEncrypt(strconv.Itoa(contract.BidsectionId), conf.SignSecret)
+
+	contractsVM.Id = id
+	contractsVM.TreeId = treeId
+	contractsVM.ContractsType = contract.ContractsType
+	contractsVM.BidsectionId = bidsectionId
+
+	contractsVM.Name = contract.Name
+	contractsVM.Content = contract.Content
+	contractsVM.Code = contract.Code
+	contractsVM.PartyA = contract.PartyA
+	contractsVM.PartyASigner = contract.PartyASigner
+	contractsVM.PartyB = contract.PartyB
+	contractsVM.PartyBSigner = contract.PartyBSigner
+	contractsVM.Remarks = contract.Remarks
+	contractsVM.Price = contract.Price
+	contractsVM.Returned = contract.Returned
+	contractsVM.Paid = contract.Paid
+	contractsVM.Status = contract.Status
+	contractsVM.Locking = contract.Locking
+
+	contractsVM.CreateTime = contract.CreateTime.Format(conf.SysTimeform)
+	contractsVM.UpdateTime = contract.UpdateTime.Format(conf.SysTimeform)
+	// nilTime := time.Time{}
+	// contract.SignerTime != nilTime
+
+	if !contract.SignerTime.IsZero() {
+		contractsVM.SignerTime = contract.SignerTime.Format(conf.SysTimeform)
+	}
+
+	return contractsVM
+}

services/project_account_service.go

@@ -397,6 +397,7 @@ func (s *projectAccountService) ChangePassword(AccountData viewmodels.AccountPas
 
 func (s *projectAccountService) GetProjectInfo(id int) (viewmodels.ProjectInfo, error) {
 	projectInfo, err := s.dao.FindById(id)
+
 	return projectInfo, err
 }
 

services/project_service.go

@@ -153,11 +153,14 @@ func (s *projectService) Save(id int, projectVM viewmodels.Project) error {
 func makeProjectVM(projectCM *models.CmProject) viewmodels.Project {
 	projectVM := viewmodels.Project{}
 	id, _ := comm.AesEncrypt(strconv.Itoa(projectCM.Id), conf.SignSecret)
+	userId, _ := comm.AesEncrypt(strconv.Itoa(projectCM.UserId), conf.SignSecret)
+
 	projectVM.Id = id
 	projectVM.Code = projectCM.Code
 	projectVM.Name = projectCM.Name
 	projectVM.Category = projectCM.Category
 	projectVM.StaffName = projectCM.StaffName
+	projectVM.UserId = userId
 	projectVM.UserAccount = projectCM.UserAccount
 	if !projectCM.CreateTime.IsZero() {
 		projectVM.CreateTime = projectCM.CreateTime.Format(conf.SysTimeform)

web/api/project_setting_api.go

@@ -323,12 +323,15 @@ func (c *ProjectSettingApi) GetProject() {
 		return
 	}
 	data, err := c.ServiceProject.Get(projectId)
+	userId, _ := utils.GetDecryptId(data.UserId)
+	accountData := c.ServiceProjectAccount.Get(userId, projectId)
+
 	// data, err := c.ServiceProjectAccount.GetProjectInfo(projectId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 	} else {
-		c.Ctx.JSON(iris.Map{"code": 0, "msg": "操作成功", "data": data})
+		c.Ctx.JSON(iris.Map{"code": 0, "msg": "操作成功", "project": data, "account": accountData})
 	}
 }
 

web/viewmodels/project.go

@@ -16,6 +16,7 @@ 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"`
 	Category    string `form:"category" json:"category"`
 	StaffName   string `form:"staffName" json:"staffName"`