Kaynağa Gözat

耗材参数

XMLWAN 4 yıl önce
ebeveyn
işleme
baa70900e3

+ 8 - 2
controllers/his_project_api_controller.go Dosyayı Görüntüle

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

+ 6 - 0
service/his_project_service.go Dosyayı Görüntüle

@@ -677,3 +677,9 @@ func DeleteMainTemplateById(id int64) error {
677 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
+}