rdluck 4 years ago
parent
commit
fe843c56fa
2 changed files with 18 additions and 22 deletions
  1. 18 19
      models/data_source_longzhong.go
  2. 0 3
      services/data_source_longzhong.go

+ 18 - 19
models/data_source_longzhong.go

@@ -15,8 +15,8 @@ type Longzhongdata struct {
 	ModifyTime      time.Time
 	UnitDesc        string
 	UpdTime         string
-	AddTime string
-	DisplayTime string
+	AddTime         string
+	DisplayTime     string
 }
 
 type Longzhonginfo struct {
@@ -74,7 +74,7 @@ func ModifyLongzhongdata(item *Longzhongdata) (err error) {
 			  display_time=?
 			WHERE longzhonginfo_id = ? AND dt=?
 			 `
-	_, err = o.Raw(sql, item.Close, item.UnitDesc, item.UpdTime,item.AddTime,item.DisplayTime, item.LongzhonginfoId, item.Dt).Exec()
+	_, err = o.Raw(sql, item.Close, item.UnitDesc, item.UpdTime, item.AddTime, item.DisplayTime, item.LongzhonginfoId, item.Dt).Exec()
 	return
 }
 
@@ -97,12 +97,11 @@ func ModifyLongzhonginfo(item *Longzhonginfo) (err error) {
 		  classify_name = ?,
 		  remark = ?,
 		  last_modify_date = ?,
-		  temp_id = ?,
 		  temp_name = ?,
 		  is_normal = ?,
 		  modify_time=NOW()
-		WHERE unitid = ? `
-	_, err = o.Raw(sql, item.SecName, item.Unit, item.Frequency, item.ClassifyId, item.ClassifyName, item.Remark, item.LastModifyDate, item.TempId, item.TempName, item.IsNormal, item.Unitid).Exec()
+		WHERE unitid = ? AND temp_id = ? `
+	_, err = o.Raw(sql, item.SecName, item.Unit, item.Frequency, item.ClassifyId, item.ClassifyName, item.Remark, item.LastModifyDate, item.TempName, item.IsNormal, item.Unitid, item.TempId).Exec()
 	return
 }
 
@@ -143,19 +142,19 @@ func GetLongzhonginfoMaxId() (count int, err error) {
 }
 
 type LzProductInfoDetail struct {
-	UnitId    int64   `json:"unit_id"`
-	UnitName  string  `json:"unit_name"`
-	TempId    int     `json:"temp_id"`
-	TempName  string  `json:"temp_name"`
-	TempUnit  string  `json:"temp_unit"`
-	ProId     int     `json:"pro_id"`
-	ProCnName string  `json:"pro_cn_name"`
-	UnitValue float64 `json:"unit_value"`
-	UnitDesc  string  `json:"unit_desc"`
-	DataTime  string  `json:"data_time"`
-	UpdTime   string  `json:"upd_time"`
-	AddTime string `json:"add_time"`
-	DisplayTime string `json:"display_time"`
+	UnitId      int64   `json:"unit_id"`
+	UnitName    string  `json:"unit_name"`
+	TempId      int     `json:"temp_id"`
+	TempName    string  `json:"temp_name"`
+	TempUnit    string  `json:"temp_unit"`
+	ProId       int     `json:"pro_id"`
+	ProCnName   string  `json:"pro_cn_name"`
+	UnitValue   float64 `json:"unit_value"`
+	UnitDesc    string  `json:"unit_desc"`
+	DataTime    string  `json:"data_time"`
+	UpdTime     string  `json:"upd_time"`
+	AddTime     string  `json:"add_time"`
+	DisplayTime string  `json:"display_time"`
 }
 
 type LzProductInfoDetailResp struct {

+ 0 - 3
services/data_source_longzhong.go

@@ -172,9 +172,6 @@ func GetLzProductList() (err error) {
 			lzProduct.ClassifyName = classifyName
 			lzProduct.Unit = v.Unit
 			lzProduct.CreateTime = time.Now()
-			if v.IsNormal == "" {
-				v.IsNormal = "1"
-			}
 			lzProduct.IsNormal = v.IsNormal
 			lzProduct.LastModifyDate = v.Maxdate
 			lzProduct.Unitid = v.Unitid