feat: 1

dao/project_dao.go

@@ -75,3 +75,9 @@ func (d *ProjectDao) Update(data *models.CmProject, columns []string) error {
 	}
 	return err
 }
+
+func (d *ProjectDao) FindById(id int) (*models.CmProject, error) {
+	data := &models.CmProject{}
+	_, err := d.engine.Where("id=?", id).Get(data)
+	return data, err
+}

services/project_service.go

@@ -24,7 +24,7 @@ import (
 type ProjectService interface {
 	//ValidManager(code string, account string, password string) error
 	ValidRule(iris.Context) (viewmodels.Project, error)
-	Get(projectId int) *viewmodels.Project
+	Get(projectId int) (*viewmodels.Project, error)
 	GetList(viewmodels.Project) []viewmodels.Project
 	GetName(code string) []viewmodels.Project
 	Save(projectId int, projectVM viewmodels.Project) error
@@ -80,9 +80,11 @@ func (s *projectService) ValidRule(ctx iris.Context) (viewmodels.Project, error)
 }
 
 // ID获得项目信息-TODO
-func (s *projectService) Get(projectId int) *viewmodels.Project {
-
-	return nil
+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
 }
 
 // 获得一组项目信息 -项目编号

web/api/project_api.go

@@ -38,11 +38,11 @@ func (c *ProjectApi) Get() {
 		return
 	}
 	// 获得项目信息
-	ProjectData := c.ServiceProject.Get(projectIdInt)
+	ProjectData, err := c.ServiceProject.Get(projectIdInt)
 	c.Ctx.JSON(iris.Map{
 		"code": 0,
 		"data": ProjectData,
-		"msg":  "",
+		"msg":  fmt.Sprintf("%s", err),
 	})
 	// }
 }

web/viewmodels/folder_contract.go

@@ -25,13 +25,15 @@ type FolderContract struct {
 	ContractsPayProgress    string `form:"contractsPayProgress" json:"contractsPayProgress"`
 
 	// 安全巡检字段-后期做接口后移动-TODO
-	SafeTotal           int `form:"safeTotal" json:"safeTotal"`
-	SafeRectification   int `form:"safeRectification" json:"safeRectification"`
-	SafeRectificationIn int `form:"safeRectificationIn" json:"safeRectificationIn"`
+	SafeTotal               int `form:"safeTotal" json:"safeTotal"`
+	SafeRectification       int `form:"safeRectification" json:"safeRectification"`
+	SafeRectificationIn     int `form:"safeRectificationIn" json:"safeRectificationIn"`
+	SafeRectificationFinish int `form:"safeRectificationFinish" json:"safeRectificationFinish"`
 	// 质量巡检
-	QualityTotal           int `form:"qualityTotal" json:"qualityTotal"`
-	QualityRectification   int `form:"qualityRectification" json:"qualityRectification"`
-	QualityRectificationIn int `form:"qualityRectificationIn" json:"qualityRectificationIn"`
+	QualityTotal               int `form:"qualityTotal" json:"qualityTotal"`
+	QualityRectification       int `form:"qualityRectification" json:"qualityRectification"`
+	QualityRectificationIn     int `form:"qualityRectificationIn" json:"qualityRectificationIn"`
+	QualityRectificationFinish int `form:"qualityRectificationFinish" json:"qualityRectificationFinish"`
 
 	Csrf string `form:"csrf" json:"csrf"`
 	// Leaf        bool    `json:"leaf" `