ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

fix(meter):终端用户表计档案完成查询调整。

Browse Source
This commit is contained in:
徐涛 2022-09-19 12:19:31 +08:00
parent ed83fbc77c
commit 01953132ca
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controller/meter04kv.go
View File

@ -2,6 +2,7 @@ package controller
import ( import (
"electricity_bill_calc/excel" "electricity_bill_calc/excel"
"electricity_bill_calc/logger"
"electricity_bill_calc/model" "electricity_bill_calc/model"
"electricity_bill_calc/response" "electricity_bill_calc/response"
"electricity_bill_calc/security" "electricity_bill_calc/security"
@ -14,6 +15,7 @@ import (
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"github.com/samber/lo" "github.com/samber/lo"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"go.uber.org/zap"
) )
func InitializeMeter04kVController(router *gin.Engine) { func InitializeMeter04kVController(router *gin.Engine) {
@ -149,6 +151,7 @@ func modifySingle04kVMeter(c *gin.Context) {
formData := new(_MeterModificationFormData) formData := new(_MeterModificationFormData)
c.BindJSON(formData) c.BindJSON(formData)
copier.Copy(meterDetail, formData) copier.Copy(meterDetail, formData)
logger.Named("Controller", "Meter").Debug("Check #1", zap.Any("meter", meterDetail))
err = service.Meter04kVService.UpdateSingleMeter(meterDetail) err = service.Meter04kVService.UpdateSingleMeter(meterDetail)
if err != nil { if err != nil {
result.Error(http.StatusInternalServerError, err.Error()) result.Error(http.StatusInternalServerError, err.Error())

6
model/meter_04kv.go
View File

@ -19,9 +19,9 @@ type Meter04KV struct {
ContactPhone *string `json:"contactPhone" excel:"phone"` ContactPhone *string `json:"contactPhone" excel:"phone"`
Ratio decimal.Decimal `bun:",notnull,default:1" json:"ratio" excel:"ratio"` Ratio decimal.Decimal `bun:",notnull,default:1" json:"ratio" excel:"ratio"`
Seq int64 `bun:"type:bigint,notnull" json:"seq" excel:"seq"` Seq int64 `bun:"type:bigint,notnull" json:"seq" excel:"seq"`
IsPublicMeter bool `bun:"public_meter,notnull,default:false" json:"isPublicMeter" excel:"public"` IsPublicMeter bool `bun:"public_meter,notnull" json:"isPublicMeter" excel:"public"`
WillDilute bool `bun:"dilute,notnull,default:false" json:"willDilute" excel:"dilute"` WillDilute bool `bun:"dilute,notnull" json:"willDilute" excel:"dilute"`
Enabled bool `bun:",notnull,default:true" json:"enabled"` Enabled bool `bun:",notnull" json:"enabled"`
ParkDetail *Park `bun:"rel:belongs-to,join:park_id=id" json:"-"` ParkDetail *Park `bun:"rel:belongs-to,join:park_id=id" json:"-"`
} }

4
service/meter04kv.go
View File

@ -77,7 +77,7 @@ func (_Meter04kVService) Get04kVMeterDetail(park, code string) (*model.Meter04KV
var meter = new(model.Meter04KV) var meter = new(model.Meter04KV)
ctx, cancel := global.TimeoutContext() ctx, cancel := global.TimeoutContext()
defer cancel() defer cancel()
err := global.DB.NewSelect().Model(&meter). err := global.DB.NewSelect().Model(meter).
Where("code = ?", code). Where("code = ?", code).
Where("park_id = ?", park). Where("park_id = ?", park).
Scan(ctx) Scan(ctx)
@ -101,7 +101,7 @@ func (_Meter04kVService) insertNewMeter(tx *bun.Tx, ctx *context.Context, meter
} }
func (_Meter04kVService) updateMeter(tx *bun.Tx, ctx *context.Context, meter model.Meter04KV) error { func (_Meter04kVService) updateMeter(tx *bun.Tx, ctx *context.Context, meter model.Meter04KV) error {
_, err := tx.NewUpdate().Model(meter). _, err := tx.NewUpdate().Model(&meter).
Where("code = ?", meter.Code). Where("code = ?", meter.Code).
Where("park_id = ?", meter.ParkId). Where("park_id = ?", meter.ParkId).
Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "dilute", "enabled"). Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "dilute", "enabled").