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

dao/safe_dao.go

@@ -24,6 +24,17 @@ func NewSafeDao(engine *xorm.Engine) *SafeDao {
 	}
 }
 
+func (d *SafeDao) FindById(id int) *models.CmSafe {
+	data := &models.CmSafe{Id: id}
+	ok, err := d.engine.Get(data)
+	if ok && err == nil {
+		return data
+	} else {
+		data.Id = 0
+		return data
+	}
+}
+
 // id获得数据
 func (d *SafeDao) GetListByBid(id int) []models.CmSafe {
 	dataList := make([]models.CmSafe, 0)

models/cm_safe.go

@@ -7,6 +7,7 @@ import (
 type CmSafe struct {
 	Id               int       `xorm:"not null pk autoincr comment('自增id') INT(11)"`
 	BidsectionId     int       `xorm:"not null default 0 comment('标段id') INT(11)"`
+	Uid              int       `xorm:"not null default 0 comment('创建者id') INT(11)"`
 	Code             string    `xorm:"comment('编号') VARCHAR(128)"`
 	CreateTime       time.Time `xorm:"comment('检查时间') DATETIME"`
 	EndTime          time.Time `xorm:"comment('结束时间') DATETIME"`

services/safe_service.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"fmt"
 	"log"
 	"strconv"
 
@@ -14,50 +15,44 @@ import (
 )
 
 type SafeService interface {
-	Get(id int) []viewmodels.SafeList
+	Get(id int, pid int) []viewmodels.SafeList
 	Post(data models.CmSafe) error
 	Del(id int) error
-
+	GetDetail(id int) viewmodels.Safe
 	ValidRule(ctx iris.Context) (viewmodels.Safe, error)
 }
 
 // //返回service操作类
 type safeService struct {
-	daoSafe      *dao.SafeDao
-	daoSafeAudit *dao.SafeAuditDao
-	daoSafeFile  *dao.SafeFileDao
-	valid        string
-	validCreate  string
+	daoSafe           *dao.SafeDao
+	daoSafeAudit      *dao.SafeAuditDao
+	daoSafeFile       *dao.SafeFileDao
+	daoProjectAccount *dao.ProjectAccountDao
+	valid             string
+	validCreate       string
 }
 
 //创建项目用户service
 func NewSafeService() SafeService {
 	return &safeService{
-		daoSafe:      dao.NewSafeDao(datasource.InstanceDbMaster()),
-		daoSafeAudit: dao.NewSafeAuditDao(datasource.InstanceDbMaster()),
-		daoSafeFile:  dao.NewSafeFileDao(datasource.InstanceDbMaster()),
-		valid:        "/api/safe",
-		validCreate:  "/api/safe/create",
+		daoSafe:           dao.NewSafeDao(datasource.InstanceDbMaster()),
+		daoSafeAudit:      dao.NewSafeAuditDao(datasource.InstanceDbMaster()),
+		daoSafeFile:       dao.NewSafeFileDao(datasource.InstanceDbMaster()),
+		daoProjectAccount: dao.NewProjectAccountDao(datasource.InstanceDbMaster()),
 	}
 }
-func (s *safeService) Get(id int) []viewmodels.SafeList {
+func (s *safeService) Get(id int, pid int) []viewmodels.SafeList {
 	datalist := s.daoSafe.GetListByBid(id)
 	safeList := make([]viewmodels.SafeList, 0)
 	for _, item := range datalist {
 		safeVM := viewmodels.SafeList{}
 		safeVM.Code = item.Code
-		// fmt.Println("safe_id: %d", item.Id)
-		auditRecord := s.daoSafeAudit.GetRecordBySid(item.Id)
-		safeVM.AuditName = auditRecord.Name
-		// bidId, _ := comm.AesEncrypt(strconv.Itoa(item.BidsectionId), conf.SignSecret)
-		// safeVM.BidsectionId = bidId
-		safeVM.CreateTime = auditRecord.CreateTime
+		account := s.daoProjectAccount.Get(item.Uid, pid)
+		safeVM.AuditName = account.Name
+		safeVM.CreateTime = item.CreateTime.Format(conf.SysTimeform)
 		safeVM.Demand = item.Demand
-		// safeVM.EndTime = item.EndTime.Format("2006-01-02 15:04:05")
-
 		id, _ := comm.AesEncrypt(strconv.Itoa(item.Id), conf.SignSecret)
 		safeVM.Id = id
-
 		safeVM.Inspection = item.Inspection
 		safeVM.InspectionDetail = item.InspectionDetail
 		safeVM.Position = item.Position
@@ -85,6 +80,21 @@ func (s *safeService) Del(id int) error {
 	}
 	return err
 }
+
+// 详情页数据拼装
+func (s *safeService) GetDetail(id int) viewmodels.Safe {
+
+	safeData := s.daoSafe.FindById(id)
+
+	fmt.Println(safeData)
+	// id, _ := comm.AesEncrypt(strconv.Itoa(safeData.BidsectionId), conf.SignSecret)
+
+	// bid, _2 := comm.AesEncrypt(strconv.Itoa(safeData.BidsectionId), conf.SignSecret)
+	data := viewmodels.Safe{}
+	// data.Id = string(id)
+
+	return data
+}
 func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
 	safeVaild := viewmodels.Safe{}
 	if ctx.Method() == "GET" {

web/api/safe_api.go

@@ -8,9 +8,11 @@
 package api
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/kataras/iris/v12"
+	"go.mod/conf"
 	"go.mod/models"
 	"go.mod/services"
 	"go.mod/web/utils"
@@ -40,14 +42,18 @@ func (c *SafeApi) Get() {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
 		return
 	}
-
+	pid, err := utils.GetProjectId(c.Ctx)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": "项目id不存在, 请重新登录"})
+		return
+	}
 	bidsectionId, err := utils.GetDecryptId(safeData.BidsectionId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadJSON转换异常,请检查参数"})
 		return
 	}
 	// c.ServiceSafe.Get(bidsectionId, RpcConnect)
-	SafeData := c.ServiceSafe.Get(bidsectionId)
+	SafeData := c.ServiceSafe.Get(bidsectionId, pid)
 
 	c.Ctx.JSON(iris.Map{
 		"code": 0,
@@ -86,11 +92,18 @@ func (c *SafeApi) Post() {
 	data.BidsectionId = bidsectionId
 	data.Code = safeData.Code
 	data.Inspection = safeData.Inspection
-	createTime, err := time.Parse("2006-11-01 08:11:11", safeData.CreateTime)
+	uid, err := utils.GetProjectAccountId(c.Ctx)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": "未登录或账号失效，请重新登录"})
+		return
+	}
+	data.Uid = uid
+	createTime, err := time.Parse(conf.SysTimeform, safeData.CreateTime)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": "日期转换异常,请检查参数"})
 		return
 	}
+	fmt.Println(createTime)
 	data.CreateTime = createTime
 	err1 := c.ServiceSafe.Post(data)
 	if err != nil {
@@ -152,24 +165,24 @@ func (c *SafeApi) Delete() {
 // @Success 200 {object} viewmodels.Safe "{code:0成功,data:viewmodels.Safe,msg:}"
 // @Failure 400 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Router /api/safe/detail [get]
-// func (c *SafeApi) GetDetail() {
-// 	// 1.规则验证
-// 	safeData, err := c.ServiceSafe.ValidRule(c.Ctx)
-// 	if err != nil {
-// 		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
-// 		return
-// 	}
+func (c *SafeApi) GetDetail() {
+	// 1.规则验证
+	safeData, err := c.ServiceSafe.ValidRule(c.Ctx)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
+		return
+	}
 
-// 	id, err := utils.GetDecryptId(safeData.Id)
-// 	if err != nil {
-// 		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadForm转换异常,请检查参数"})
-// 		return
-// 	}
-// 	SafeData := c.ServiceSafe.GetDetail(id)
+	id, err := utils.GetDecryptId(safeData.Id)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadForm转换异常,请检查参数"})
+		return
+	}
+	SafeData := c.ServiceSafe.GetDetail(id)
 
-// 	c.Ctx.JSON(iris.Map{
-// 		"code": 0,
-// 		"msg":  "请求成功",
-// 		"data": SafeData,
-// 	})
-// }
+	c.Ctx.JSON(iris.Map{
+		"code": 0,
+		"msg":  "请求成功",
+		"data": SafeData,
+	})
+}

web/viewmodels/safe.go

@@ -8,12 +8,14 @@ package viewmodels
  */
 import (
 	validation "github.com/go-ozzo/ozzo-validation/v3"
+	"go.mod/models"
 )
 
 type Safe struct {
 	Id           string `form:"id" json:"id" `
 	BidsectionId string `form:"bidsectionId" json:"bidsectionId"`
 
+	Uid              string `form:"uid" json:"uid" `
 	Code             string `form:"code" json:"code"`
 	CreateTime       string `form:"createTime" json:"createTime"`
 	EndTime          string `form:"endTime" json:"endTime"`
@@ -24,25 +26,21 @@ type Safe struct {
 	Status           int    `form:"status" json:"status"`
 }
 type SafeList struct {
-	Id               string `form:"id" json:"id" `
-	Code             string `form:"code" json:"code"`
-	CreateTime       string `form:"createTime" json:"createTime"`
-	Position         string `form:"position" json:"position"`
-	Inspection       string `form:"inspection" json:"inspection"`
-	InspectionDetail string `form:"inspectionDetail" json:"inspectionDetail"`
-	Demand           string `form:"demand" json:"demand"`
-	Status           int    `form:"status" json:"status"`
-	AuditName        string `form:"auditName" json:"auditName"`
-	FileCounts       int64  `from:"fileCounts" json:"fileCounts"`
+	Id               string               `form:"id" json:"id" `
+	Code             string               `form:"code" json:"code"`
+	CreateTime       string               `form:"createTime" json:"createTime"`
+	Position         string               `form:"position" json:"position"`
+	Inspection       string               `form:"inspection" json:"inspection"`
+	InspectionDetail string               `form:"inspectionDetail" json:"inspectionDetail"`
+	Demand           string               `form:"demand" json:"demand"`
+	Status           int                  `form:"status" json:"status"`
+	AuditName        string               `form:"auditName" json:"auditName"`
+	auditors         []models.CmSafeAudit `form:"auditors" json:"auditors"`
+	FileCounts       int64                `from:"fileCounts" json:"fileCounts"`
 }
 
-// type SafeCreate struct {
-// 	BidsectionId string `form:"bidsection_id" json:"bidsection_id"`
-// 	CreateTime   string `form:"create_time" json:"create_time"`
-// 	Code         string `form:"code" json:"code"`
-// 	Position     string `form:"position" json:"position"`
-// 	Inspection   string `form:"inspection" json:"inspection"`
-// }
+type SafeDetail struct {
+}
 type SafeListAuditRecord struct {
 	Name       string `form:"name" json:"name"`
 	CreateTime string `form:"create_time" json:"create_time"`