Bladeren bron

Merge branch 'xt_statistics_branch' of http://git.shengws.com/csx/XT_New into xt_statistics_branch

XMLWAN 4 jaren geleden
bovenliggende
commit
85ae26f3b2

+ 0 - 1
controllers/new_mobile_api_controllers/index_evaluation_api_controller.go Bestand weergeven

34
 //获取取值范围
34
 //获取取值范围
35
 func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueData() {
35
 func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueData() {
36
 	range_type, _ := this.GetInt64("range_type")
36
 	range_type, _ := this.GetInt64("range_type")
37
-	fmt.Println(range_type)
38
 	project_id, _ := this.GetInt64("project_id")
37
 	project_id, _ := this.GetInt64("project_id")
39
 	item_id, _ := this.GetInt64("item_id")
38
 	item_id, _ := this.GetInt64("item_id")
40
 	adminUserInfo := this.GetMobileAdminUserInfo()
39
 	adminUserInfo := this.GetMobileAdminUserInfo()

+ 1 - 1
service/statistics_service/index_evaluation_service.go Bestand weergeven

1403
 
1403
 
1404
 func FindOrgQualityControlStandardInspectionReference(user_org_id int64) (references []*InspectionReference, err error) {
1404
 func FindOrgQualityControlStandardInspectionReference(user_org_id int64) (references []*InspectionReference, err error) {
1405
 	db := service.XTReadDB()
1405
 	db := service.XTReadDB()
1406
-	err = db.Raw("Select reference.project_name as project_name,qcs.inspection_major as project_id, qcs.inspection_minor as id,reference.item_name as item_name,reference.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit  from xt_quality_control_standard qcs Left JOIN xt_inspection_reference reference ON  qcs.inspection_major = reference.project_id and qcs.inspection_minor = reference.id and  (reference.org_id = ? OR org_id = 0)  Where qcs.user_org_id = ?  AND qcs.status = 1", user_org_id, user_org_id).Scan(&references).Error
1406
+	err = db.Raw("Select reference.project_name as project_name,qcs.inspection_major as project_id, qcs.inspection_minor as id,reference.item_name as item_name,qcs.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit  from xt_quality_control_standard qcs Left JOIN xt_inspection_reference reference ON  qcs.inspection_major = reference.project_id and qcs.inspection_minor = reference.id and  (reference.org_id = ? OR org_id = 0)  Where qcs.user_org_id = ?  AND qcs.status = 1", user_org_id, user_org_id).Scan(&references).Error
1407
 	return
1407
 	return
1408
 }
1408
 }
1409
 
1409