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

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -3,8 +3,11 @@ package new_mobile_api_controllers
 import (
 	"XT_New/controllers"
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
+	"encoding/json"
 	"fmt"
+	"time"
 )
 
 type CommonApiController struct {
@@ -49,19 +52,40 @@ func (this *CommonApiController) GetInspectionRange() {
 	})
 }
 
-func (this *CommonApiController) SaveInspection() {
+func (this *CommonApiController) SaveInspectionTwo() {
+	adminInfo := this.GetAdminUserInfo()
+	orgid := adminInfo.CurrentOrgId
 	fmt.Println("触发-------------------0")
-	//dataBody := make(map[string]interface{}, 0)
-	//err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//fmt.Println("err",err)
-	//inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
-	//fmt.Println("大项",inspectionmajor)
-	//inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
-	//fmt.Println("小项",inspectionMinor)
-	//minrange := dataBody["min_range"].(string)
-	//fmt.Println("minragne",minrange)
-	//largerange := dataBody["large_range"].(string)
-	//fmt.Println("largerange",largerange)
-	//sort := dataBody["sort"].(string)
-	//fmt.Println("sort",sort)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("大项", inspectionmajor)
+	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
+	fmt.Println("小项", inspectionMinor)
+	minrange := dataBody["min_range"].(string)
+	fmt.Println("minragne", minrange)
+	largerange := dataBody["large_range"].(string)
+	fmt.Println("largerange", largerange)
+	sort := dataBody["sort"].(string)
+	fmt.Println("sort", sort)
+	standard := models.XtQualityControlStandard{
+		InspectionMajor: inspectionmajor,
+		InspectionMinor: inspectionMinor,
+		MinRange:        minrange,
+		LargeRange:      largerange,
+		Sort:            sort,
+		UserOrgId:       orgid,
+		Status:          1,
+		CreatedTime:     time.Now().Unix(),
+	}
+	fmt.Println(standard)
+	err = service.SaveInspection(&standard)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"standard": standard,
+	})
 }

controllers/new_mobile_api_controllers/common_api_router.go

@@ -1,6 +1,7 @@
 package new_mobile_api_controllers
 
 import (
+	"fmt"
 	"github.com/astaxie/beego"
 )
 
@@ -9,5 +10,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/saveinspction", &CommonApiController{}, "Post:SaveInspection")
+	beego.Router("/com/api/saveinspection", &CommonApiController{}, "Post:SaveInspectionTwo")
+	fmt.Println("进来没有------")
 }

models/common_models.go

@@ -0,0 +1,17 @@
+package models
+
+type XtQualityControlStandard struct {
+	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"`
+}
+
+func (XtQualityControlStandard) TableName() string {
+	return "xt_quality_control_standard"
+}

service/common_service.go

@@ -19,3 +19,9 @@ func GetInspectionRange(id int64) (models.XtInspectionReference, error) {
 	err := XTReadDB().Model(&reference).Where("id=? and status = 1", id).Find(&reference).Error
 	return reference, err
 }
+
+func SaveInspection(standard *models.XtQualityControlStandard) error {
+
+	err := XTWriteDB().Create(&standard).Error
+	return err
+}