1

dao/contract_dao.go

@@ -59,7 +59,7 @@ func (d *ContractDao) GetTypeYear(bidsectionId int, projectId int, contractsType
 
 	datalist := make([]models.CmContracts, 0)
 	_ = d.engine.
-		Where("project_id=? and bidsection_id=? and contracts_type=? and signer_time>='"+startYear+"' and signer_time<='"+endYear+"'",
+		Where("project_id=? and bidsection_id=? and contracts_type=? and create_time>='"+startYear+"' and create_time<='"+endYear+"'",
 			projectId, bidsectionId, contractsType).
 		Find(&datalist)
 	return datalist

services/contract_service.go

@@ -519,6 +519,7 @@ func (s *contractService) GetSurvey(bidsectionId int, projectId int, contractsTy
 	// 1.获得收入合同
 	year := time.Now().Year()
 	incomeList := s.contractDao.GetTypeYear(bidsectionId, projectId, contractsType, year)
+	fmt.Println(incomeList)
 	// 2.初始化
 	totalContractPrice := 0.00
 	totalTypePrice := 0.00

services/safe_service.go

@@ -22,7 +22,9 @@ type SafeService interface {
 	Post(data models.CmSafe) error
 	Del(id int) error
 	GetDetail(id int, pid int) viewmodels.SafeDetail
+
 	GetSurvey(projectId int, bidsectionId int) map[string]interface{}
+	GetPending(projectId int, projectAccountId int) []viewmodels.SafeList
 	ValidRule(ctx iris.Context) (viewmodels.Safe, error)
 }
 
@@ -315,6 +317,14 @@ func (s *safeService) GetSurvey(projectId int, bidsectionId int) map[string]inte
 	return surveryData
 }
 
+// 获得账号下需要审批的巡检
+func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmodels.SafeList {
+
+	// s.daoSafe.GetStatus()
+
+	return nil
+}
+
 // 规则校验
 func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
 	safeVaild := viewmodels.Safe{}

web/routes/routes.go

@@ -180,4 +180,11 @@ func Configure(b *bootstrap.Bootstrapper) {
 	apiAnnex.Router.Use(middleware.SessionsAuth)
 	apiAnnex.Router.Use(middleware.AccessAuth)
 	apiAnnex.Handle(new(api.AnnexApi))
+
+	apiDashboard := mvc.New(b.Party("/api/dashboard"))
+	apiDashboard.Register(SafeService)
+	apiDashboard.Register(QualityService)
+	apiDashboard.Router.Use(middleware.SessionsAuth)
+	apiDashboard.Router.Use(middleware.AccessAuth)
+	apiDashboard.Handle(new(api.DashboardApi))
 }

web/viewmodels/contracts_paid.go

@@ -39,7 +39,7 @@ func (l ContractsPaid) ValidateAdd() error {
 	return validation.ValidateStruct(&l,
 		validation.Field(&l.ContractsId, validation.Required.Error("合同ID不能为空")),
 		validation.Field(&l.BidsectionId, validation.Required.Error("标段ID不能为空")),
-		validation.Field(&l.Time, validation.Required.Error("回款时间不能为空")),
+		validation.Field(&l.Time, validation.Required.Error("支付时间不能为空")),
 		validation.Field(&l.Price, validation.Required.Error("金额不能为空")),
 		validation.Field(&l.Way, validation.Required.Error("合同类型不能为空"), validation.In("支票", "现金", "网上转账", "电汇", "邮政汇款", "支付宝", "微信支付", "其他").Error("未找到相关回款类型")),
 	)
@@ -47,7 +47,7 @@ func (l ContractsPaid) ValidateAdd() error {
 
 func (l ContractsPaid) ValidateDel() error {
 	return validation.ValidateStruct(&l,
-		validation.Field(&l.Id, validation.Required.Error("回款ID不能为空")),
+		validation.Field(&l.Id, validation.Required.Error("已支付ID不能为空")),
 		validation.Field(&l.ContractsId, validation.Required.Error("合同ID不能为空")),
 		validation.Field(&l.BidsectionId, validation.Required.Error("标段ID不能为空")),
 	)