Преглед изворни кода

feat: 收费记录显示操作员姓名——关联sys_user.nick_name

lq пре 1 месец
родитељ
комит
2c2ac4bb55

+ 1 - 0
frontend/src/view/report/paymentRecord.vue

@@ -42,6 +42,7 @@
       <el-table-column :label="$t.value.ExitTime" align="center" width="170">
         <template #default="{ row }">{{ row.exit_time }}</template>
       </el-table-column>
+      <el-table-column label="操作员" prop="operator_name" align="center" width="100" />
       <el-table-column label="收款时间" align="center" width="170">
         <template #default="{ row }">{{ row.paid_at }}</template>
       </el-table-column>

+ 4 - 2
internal/modules/payment/repository/repo.go

@@ -31,6 +31,7 @@ type PaymentListResult struct {
 	PaidAmount    float64 `json:"paid_amount"`
 	ChangeAmount  float64 `json:"change_amount"`
 	OperatorID    uint    `json:"operator_id"`
+	OperatorName  string  `json:"operator_name"`
 	PaidAt        string  `json:"paid_at"`
 	EntryTime     string  `json:"entry_time"`
 	ExitTime      string  `json:"exit_time"`
@@ -42,11 +43,12 @@ func (r *PaymentRepository) List(q PaymentListQuery) ([]PaymentListResult, int64
 	db := global.GVA_DB.Table("payment_record").
 		Select(`payment_record.id, vehicle_record.plate_number, vehicle_type.name as vehicle_type, payment_record.payment_method,
 			payment_record.amount, payment_record.paid_amount, payment_record.change_amount,
-			payment_record.operator_id, payment_record.paid_at,
+			payment_record.operator_id, sys_user.nick_name as operator_name, payment_record.paid_at,
 			vehicle_record.entry_time, vehicle_record.exit_time, vehicle_record.stay_time`).
 		Joins("LEFT JOIN vehicle_record ON vehicle_record.id = payment_record.record_id").
 		Joins("LEFT JOIN vehicle ON vehicle.plate_number = vehicle_record.plate_number").
-		Joins("LEFT JOIN vehicle_type ON vehicle_type.id = vehicle.vehicle_type_id")
+		Joins("LEFT JOIN vehicle_type ON vehicle_type.id = vehicle.vehicle_type_id").
+		Joins("LEFT JOIN sys_user ON sys_user.id = payment_record.operator_id")
 
 	if q.PlateNumber != "" {
 		db = db.Where("vehicle_record.plate_number LIKE ?", "%"+q.PlateNumber+"%")