需求更改

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -28,7 +28,7 @@ func (this *CommonApiController) GetInspectionMajor() {
 
 func (this *CommonApiController) GetInspectionMinor() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
+	fmt.Println("id----------------------------------------", id)
 	minor, err := service.GetInspectionMinor(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -52,9 +52,10 @@ func (this *CommonApiController) GetInspectionRange() {
 	})
 }
 
-func (this *CommonApiController) SaveInspectionTwo() {
+func (this *CommonApiController) SaveConfiguration() {
 	adminInfo := this.GetAdminUserInfo()
 	orgid := adminInfo.CurrentOrgId
+	fmt.Println(orgid)
 	fmt.Println("触发-------------------0")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
@@ -89,3 +90,16 @@ func (this *CommonApiController) SaveInspectionTwo() {
 		"standard": standard,
 	})
 }
+
+func (this *CommonApiController) GetConfigurationlist() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	configurationlist, err := service.GetConfigurationlist(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"configurationlist": configurationlist,
+	})
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -1,7 +1,6 @@
 package new_mobile_api_controllers
 
 import (
-	"fmt"
 	"github.com/astaxie/beego"
 )
 
@@ -10,6 +9,6 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getinspectionmajor", &CommonApiController{}, "Get:GetInspectionMajor")
 	beego.Router("/com/api/getinspectionminor", &CommonApiController{}, "Get:GetInspectionMinor")
 	beego.Router("/com/api/getinspectionrange", &CommonApiController{}, "Get:GetInspectionRange")
-	beego.Router("/com/api/saveinspection", &CommonApiController{}, "Post:SaveInspectionTwo")
-	fmt.Println("进来没有------")
+	beego.Router("/com/api/saveconfiguration", &CommonApiController{}, "Post:SaveConfiguration")
+	beego.Router("com/api/getconfigurationlist", &CommonApiController{}, "Get:GetConfigurationlist")
 }

models/common_models.go

@@ -1,6 +1,23 @@
 package models
 
+type QualityControlStandard struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	InspectionMajor int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
+	InspectionMinor int64  `gorm:"column:inspection_minor" json:"inspection_minor" form:"inspection_minor"`
+	MinRange        string `gorm:"column:min_range" json:"min_range" form:"min_range"`
+	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime     int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime     int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	LargeRange      string `gorm:"column:large_range" json:"large_range" form:"large_range"`
+	Unit            string `gorm:"column:unit" json:"unit" form:"unit"`
+	ProjectName     string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	ItemName        string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+}
+
 type XtQualityControlStandard struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
 	InspectionMajor int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
 	InspectionMinor int64  `gorm:"column:inspection_minor" json:"inspection_minor" form:"inspection_minor"`
 	MinRange        string `gorm:"column:min_range" json:"min_range" form:"min_range"`

service/common_service.go

@@ -1,6 +1,9 @@
 package service
 
-import "XT_New/models"
+import (
+	"XT_New/models"
+	"fmt"
+)
 
 func GetInspectionMajor(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
@@ -25,3 +28,19 @@ func SaveInspection(standard *models.XtQualityControlStandard) error {
 	err := XTWriteDB().Create(&standard).Error
 	return err
 }
+
+func GetConfigurationlist(orgid int64) (standard []*models.QualityControlStandard, err error) {
+
+	//err = XTReadDB().Model(&standard).Where("user_org_id = ? and status =1", orgid).Order("sort asc,created_time desc").Find(&standard).Error
+	//return standard,err
+
+	db := XTReadDB().Table("xt_quality_control_standard as x").Where("x.status =1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	table := XTReadDB().Table("xt_inspection_reference as s")
+	fmt.Println(table)
+	err = db.Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").
+		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Order("x.sort asc,x.created_time desc").Scan(&standard).Error
+	return standard, err
+}