浏览代码

耗材参数

XMLWAN 4 年前
父节点
当前提交
baa70900e3
共有 2 个文件被更改,包括 14 次插入2 次删除
  1. 8 2
      controllers/his_project_api_controller.go
  2. 6 0
      service/his_project_service.go

+ 8 - 2
controllers/his_project_api_controller.go 查看文件

368
 func (this *HisProjectApiController) GetProjectTeamDetail() {
368
 func (this *HisProjectApiController) GetProjectTeamDetail() {
369
 
369
 
370
 	id, _ := this.GetInt64("id")
370
 	id, _ := this.GetInt64("id")
371
+	adminUserInfo := this.GetAdminUserInfo()
372
+	orgId := adminUserInfo.CurrentOrgId
371
 	projectTeamDetail, err := service.GetProjectTeamDetail(id)
373
 	projectTeamDetail, err := service.GetProjectTeamDetail(id)
374
+	hisList, err := service.GetProjectHisList(orgId)
375
+	list, err := service.GetAllProjectList(orgId)
372
 	if err != nil {
376
 	if err != nil {
373
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
377
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
374
 		return
378
 		return
375
 	}
379
 	}
376
 	this.ServeSuccessJSON(map[string]interface{}{
380
 	this.ServeSuccessJSON(map[string]interface{}{
377
 		"projectTeamDetail": projectTeamDetail,
381
 		"projectTeamDetail": projectTeamDetail,
382
+		"list":              list,
383
+		"hisList":           hisList,
378
 	})
384
 	})
379
 	return
385
 	return
380
 }
386
 }
613
 		CreatedTime: time.Now().Unix(),
619
 		CreatedTime: time.Now().Unix(),
614
 	}
620
 	}
615
 	err := service.CreateProjectList(&projectList)
621
 	err := service.CreateProjectList(&projectList)
616
-
622
+	detail, _ := service.GetProjectDetail(id)
617
 	if err != nil {
623
 	if err != nil {
618
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
624
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
619
 		return
625
 		return
620
 	}
626
 	}
621
 	this.ServeSuccessJSON(map[string]interface{}{
627
 	this.ServeSuccessJSON(map[string]interface{}{
622
-		"projectList": projectList,
628
+		"projectList": detail,
623
 	})
629
 	})
624
 	return
630
 	return
625
 }
631
 }

+ 6 - 0
service/his_project_service.go 查看文件

677
 	return err
677
 	return err
678
 
678
 
679
 }
679
 }
680
+
681
+func GetProjectHisList(orgid int64) (hisProjectList []*models.XtHisProjectList, error error) {
682
+
683
+	error = XTReadDB().Model(&hisProjectList).Where("user_org_id = ? and status = 1", orgid).Group("project_id").Find(&hisProjectList).Error
684
+	return hisProjectList, error
685
+}