bodycheck

controllers/bodycheck/bodycheck.go

@@ -51,25 +51,25 @@ func (c *BodyCheckController) GetCheckByUser() {
 
 	bodyCheck, err := c.dao.GetBodyCheckByUser(user.CustomerId)
 	if err != nil {
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
 	}
 	if len(bodyCheck) == 0 {
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": "没有查询到数据",
 		})
 	}
 	presentations, err := c.dao.GetPresentationByCheckID(bodyCheck[0].Id)
 	if err != nil {
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
 	}
-	c.ResponseJson(map[string]interface{}{
+	c.ResponseJSON(map[string]interface{}{
 		"Status":   true,
 		"Message":  presentations,
 		"Info":     bodyCheck,
@@ -87,7 +87,7 @@ func (c *BodyCheckController) PostCheckResult() {
 	err := json.Unmarshal(con, &formVal)
 	if err != nil {
 		beego.Error(err)
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
@@ -114,7 +114,7 @@ func (c *BodyCheckController) PostCheckResult() {
 	result.CheckType = int(formVal["CheckType"].(float64))
 	if err != nil {
 		beego.Error(err.Error())
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
@@ -123,7 +123,7 @@ func (c *BodyCheckController) PostCheckResult() {
 	result.CheckDate, err = time.ParseInLocation("2006-01-02 15:04:05", formVal["CheckDate"].(string), loc)
 	if err != nil {
 		beego.Error(err.Error())
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
@@ -132,25 +132,25 @@ func (c *BodyCheckController) PostCheckResult() {
 	user, err := c.dao.GetUserByOpenID(result.WechatAccount)
 	if err != nil {
 		beego.Error(err.Error())
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
 	}
 
-	if user == nil || user.Id < 1 {
+	if user == nil || user.CustomerId == "" {
 		beego.Error("没有当前用户信息！")
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": "没有当前用户信息！",
 		})
 	}
-	userid := user.Id
+	userid := user.CustomerId
 
 	checkinfo, err := c.dao.GetCheckByUserAndEquipmentID(userid, result.EquipmentId)
 	if err != nil {
 		beego.Error(err.Error())
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
@@ -159,14 +159,14 @@ func (c *BodyCheckController) PostCheckResult() {
 		caseEquipment, err := c.dao.GetCaseEquipment(result.EquipmentId)
 		if err != nil {
 			beego.Error(err.Error())
-			c.ResponseJson(map[string]interface{}{
+			c.ResponseJSON(map[string]interface{}{
 				"Status":  false,
 				"Message": err.Error(),
 			})
 		}
 		if caseEquipment == nil || caseEquipment.Id < 1 {
 			beego.Error("设备未维护！")
-			c.ResponseJson(map[string]interface{}{
+			c.ResponseJSON(map[string]interface{}{
 				"Status":  false,
 				"Message": "设备未维护！",
 			})
@@ -201,7 +201,7 @@ func (c *BodyCheckController) PostCheckResult() {
 	presentation, err := c.dao.GetPresentation(checkinfo.Id, result.CheckType)
 	if err != nil {
 		beego.Error(err.Error())
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
@@ -217,7 +217,7 @@ func (c *BodyCheckController) PostCheckResult() {
 		presentation, err = c.dao.SavePresentation(preNew)
 		if err != nil {
 			beego.Error(err.Error())
-			c.ResponseJson(map[string]interface{}{
+			c.ResponseJSON(map[string]interface{}{
 				"Status":  false,
 				"Message": err.Error(),
 			})
@@ -230,7 +230,7 @@ func (c *BodyCheckController) PostCheckResult() {
 		err = c.dao.UpdatePresentation(presentation)
 		if err != nil {
 			beego.Error(err.Error())
-			c.ResponseJson(map[string]interface{}{
+			c.ResponseJSON(map[string]interface{}{
 				"Status":  false,
 				"Message": err.Error(),
 			})
@@ -239,7 +239,7 @@ func (c *BodyCheckController) PostCheckResult() {
 		err = c.dao.DeletePresentionDetail(presentation.Id)
 		if err != nil {
 			beego.Error(err.Error())
-			c.ResponseJson(map[string]interface{}{
+			c.ResponseJSON(map[string]interface{}{
 				"Status":  false,
 				"Message": err.Error(),
 			})
@@ -249,7 +249,7 @@ func (c *BodyCheckController) PostCheckResult() {
 	specs, err := c.dao.GetCheckSpecs()
 	if err != nil {
 		beego.Error(err.Error())
-		c.ResponseJson(map[string]interface{}{
+		c.ResponseJSON(map[string]interface{}{
 			"Status":  false,
 			"Message": err.Error(),
 		})
@@ -284,14 +284,14 @@ func (c *BodyCheckController) PostCheckResult() {
 			err := c.dao.SavePresentationDetail(details)
 			if err != nil {
 				beego.Error(err.Error())
-				c.ResponseJson(map[string]interface{}{
+				c.ResponseJSON(map[string]interface{}{
 					"Status":  false,
 					"Message": err.Error(),
 				})
 			}
 		}
 	}
-	c.ResponseJson(map[string]interface{}{
+	c.ResponseJSON(map[string]interface{}{
 		"Status":  true,
 		"Message": "",
 	})

models/model/ta_body_check.go

@@ -6,7 +6,7 @@ import (
 
 type TaBodyCheck struct {
 	Id          int       `xorm:"not null pk autoincr INT(11)"`
-	UserId      int       `xorm:"not null INT(11)"`
+	UserId      string    `xorm:"not null INT(11)"`
 	EquipmentId string    `xorm:"not null VARCHAR(100)"`
 	CreateDate  time.Time `xorm:"not null DATETIME"`
 	Status      int       `xorm:"not null comment('1为正常') INT(11)"`