fix(#24):修复获取到指定核算报表中的分页公摊表计的核算信息问题

2023-08-14 13:48:58 +08:00
parent 845bd75348
commit bfa7ac1508
5 changed files with 144 additions and 19 deletions
--- a/service/meter.go
+++ b/service/meter.go
@@ -363,16 +363,16 @@ func (ms _MeterService) ReplaceMeter(

 	// 步骤6：将旧表计的部分信息赋予新表计
 	newMeterCreationForm := vo.MeterCreationForm{
-		Code:             newMeterCode,
-		Address:          oldMeter.Address,
-		MeterType:        oldMeter.MeterType,
-		Ratio:            newMeterRatio,
-		Seq:              oldMeter.Seq,
-		Enabled:          oldMeter.Enabled,
-		Building:         oldMeter.Building,
-		OnFloor:          oldMeter.OnFloor,
-		Area:             oldMeter.Area,
-		Reading: *newMeterReading,
+		Code:      newMeterCode,
+		Address:   oldMeter.Address,
+		MeterType: oldMeter.MeterType,
+		Ratio:     newMeterRatio,
+		Seq:       oldMeter.Seq,
+		Enabled:   oldMeter.Enabled,
+		Building:  oldMeter.Building,
+		OnFloor:   oldMeter.OnFloor,
+		Area:      oldMeter.Area,
+		Reading:   *newMeterReading,
 	}

 	// 步骤7：将新表计写入系统
@@ -444,6 +444,118 @@ func (ms _MeterService) ReplaceMeter(
 	return nil
 }

+//func replaceMeter(
+//	pid string,
+//	oldMeterCode string,
+//	oldMeterReading *MeterReadingForm,
+//	newMeterCode string,
+//	newMeterRatio *big.Float,
+//	newMeterReading *MeterReadingForm,
+//) (bool, error) {
+//	ctx := context.Background()
+//	tx, err := PostgresPool{}.begin(ctx)
+//	if err != nil {
+//		return false, err
+//	}
+//
+//	// 步骤1：获取旧表计的信息
+//	oldMeter, err := repositories{}.meter_fetch_meter_detail(pid, oldMeterCode)
+//	if err != nil {
+//		tx.rollback(ctx)
+//		return false, err
+//	}
+//	if oldMeter == nil {
+//		tx.rollback(ctx)
+//		return false, fmt.Errorf("要替换的旧表计不存在")
+//	}
+//
+//	// 步骤2：将旧表计的读数写入读数表
+//	err = repositories{}.meter_record_reading(tx, pid, oldMeterCode, oldMeter.MeterType, oldMeter.Ratio, oldMeterReading)
+//	if err != nil {
+//		tx.rollback(ctx)
+//		return false, err
+//	}
+//
+//	// 步骤3: 将旧表计从系统中移除
+//	err = repositories{}.meter_detach_meter(tx, pid, oldMeterCode)
+//	if err != nil {
+//		tx.rollback(ctx)
+//		return false, err
+//	}
+//
+//	// 步骤4: 获取旧表计的关联信息
+//	var oldMeterAssociations []*MeterRelation
+//	if oldMeter.MeterType == Pooling {
+//		oldMeterAssociations, err = repositories{}.meter_list_pooled_meter_relations(pid, oldMeterCode)
+//	} else {
+//		oldMeterAssociations, err = repositories{}.meter_list_meter_relations(pid, oldMeterCode)
+//	}
+//	if err != nil {
+//		tx.rollback(ctx)
+//		return false, err
+//	}
+//
+//	// 步骤5: 将旧表计的关联信息全部置为解除
+//	for _, relation := range oldMeterAssociations {
+//		err = repositories{}.meter_unbind_meter(tx, pid, relation.MasterMeter, relation.SlaveMeter)
+//		if err != nil {
+//			tx.rollback(ctx)
+//			return false, err
+//		}
+//	}
+//
+//	// 步骤6: 将旧表计的部分信息赋予新表计
+//	newMeterCreationForm := &MeterCreationForm{
+//		Code:      newMeterCode,
+//		Address:   oldMeter.Address,
+//		MeterType: oldMeter.MeterType,
+//		Ratio:     newMeterRatio,
+//		Seq:       oldMeter.Seq,
+//		// Assign other fields
+//		Reading: newMeterReading,
+//	}
+//
+//	// 步骤7: 将新表计写入系统
+//	err = repositories{}.meter_create_meter(tx, pid, newMeterCreationForm)
+//	if err != nil {
+//		tx.rollback(ctx)
+//		return false, err
+//	}
+//
+//	// 步骤8: 将新表计的读数写入读数表
+//	err = repositories{}.meter_record_reading(tx, pid, newMeterCode, oldMeter.MeterType, newMeterRatio, newMeterReading)
+//	if err != nil {
+//		tx.rollback(ctx)
+//		return false, err
+//	}
+//
+//	// 步骤9: 将旧表计的关联信息复制一份并赋予新表计
+//	if oldMeter.MeterType == Pooling {
+//		for _, relation := range oldMeterAssociations {
+//			err = repositories{}.meter_bind_meter(tx, pid, newMeterCode, relation.SlaveMeter)
+//			if err != nil {
+//				tx.rollback(ctx)
+//				return false, err
+//			}
+//		}
+//	} else {
+//		for _, relation := range oldMeterAssociations {
+//			err = repositories{}.meter_bind_meter(tx, pid, relation.MasterMeter, newMeterCode)
+//			if err != nil {
+//				tx.rollback(ctx)
+//				return false, err
+//			}
+//		}
+//	}
+//
+//	err = tx.commit(ctx)
+//	if err != nil {
+//		return false, err
+//	}
+//
+//	return true, nil
+//}
+
 // 列出园区中指定公摊表计下的所有关联表计
 func (ms _MeterService) ListPooledMeterRelations(pid, masterMeter string) ([]*model.MeterDetail, error) {
 	ms.log.Info("列出园区中指定公摊表计下的所有关联表计", zap.String("park id", pid), zap.String("meter code", masterMeter))
@@ -783,4 +895,4 @@ func (ms _MeterService) BatchImportReadings(pid string, file *multipart.FileHead
 //	newMeterCode string, newMeterRatio decimal.Decimal, newMeterDisplayRatio decimal.Decimal,
 //	newMeterReading vo.NewMeterForReplacingForm) {
 //
-//}
+//}