From 400431e56ba1000fc08ff58684087899cb7ec9d9 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 26 十二月 2025 16:54:08 +0800
Subject: [PATCH] fix ：修改
---
src/main/java/com/boying/entity/Repair.java | 7 +++
src/main/java/com/boying/entity/Inspection.java | 25 +++++++++++-
src/main/java/com/boying/controller/InspectionController.java | 16 +++++++
src/main/java/com/boying/controller/RepairController.java | 15 +++++++
4 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/boying/controller/InspectionController.java b/src/main/java/com/boying/controller/InspectionController.java
index fc9872d..dd2c98b 100644
--- a/src/main/java/com/boying/controller/InspectionController.java
+++ b/src/main/java/com/boying/controller/InspectionController.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
import com.boying.entity.Inspection;
+import com.boying.entity.Repair;
import com.boying.entity.WhiteList;
+import com.boying.service.BarrierService;
import com.boying.service.InspectionService;
import com.boying.service.ParkService;
import com.boying.service.WhiteListService;
@@ -17,6 +19,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@RestController
@@ -25,13 +28,24 @@
public class InspectionController {
private final InspectionService inspectionService;
+ private final ParkService parkService;
+ private final BarrierService barrierService;
@PostMapping("/findPage")
- public Object findPage(Page page) {
+ public Object findPage(Page page,Long parkId) {
QueryWrapper<Inspection> wrapper = new QueryWrapper<>();
wrapper.lambda()
+ .eq(parkId !=null,Inspection::getParkId,parkId)
.orderByDesc(Inspection::getId);
Page<Inspection> page1 = inspectionService.page(page, wrapper);
+ List<Inspection> records = page1.getRecords();
+ for (Inspection record : records) {
+ record.setParkName(parkService.getById(record.getParkId()).getName());
+ if(record.getBarrierId()!=null){
+ record.setBarrierName(barrierService.getById(record.getBarrierId()).getName());
+ }
+ }
+ page1.setRecords(records);
return R.ok(page1);
}
diff --git a/src/main/java/com/boying/controller/RepairController.java b/src/main/java/com/boying/controller/RepairController.java
index 25c3cbf..b1e30ce 100644
--- a/src/main/java/com/boying/controller/RepairController.java
+++ b/src/main/java/com/boying/controller/RepairController.java
@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
+import com.boying.entity.Inspection;
+import com.boying.entity.Park;
import com.boying.entity.Repair;
import com.boying.entity.WhiteList;
+import com.boying.service.BarrierService;
import com.boying.service.ParkService;
import com.boying.service.RepairService;
import com.boying.service.WhiteListService;
@@ -17,6 +20,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@RestController
@@ -25,13 +29,22 @@
public class RepairController {
private final RepairService repairService;
+ private final ParkService parkService;
+ private final BarrierService barrierService;
@PostMapping("/findPage")
- public Object findPage(Page page) {
+ public Object findPage(Page page,Long parkId) {
QueryWrapper<Repair> wrapper = new QueryWrapper<>();
wrapper.lambda()
+ .eq(parkId !=null, Repair::getParkId,parkId)
.orderByDesc(Repair::getId);
Page<Repair> page1 = repairService.page(page, wrapper);
+ List<Repair> records = page1.getRecords();
+ for (Repair record : records) {
+ record.setParkName(parkService.getById(record.getParkId()).getName());
+ record.setBarrierName(barrierService.getById(record.getBarrierId()).getName());
+ }
+ page1.setRecords(records);
return R.ok(page1);
}
diff --git a/src/main/java/com/boying/entity/Inspection.java b/src/main/java/com/boying/entity/Inspection.java
index 91fa17a..6a4b7c5 100644
--- a/src/main/java/com/boying/entity/Inspection.java
+++ b/src/main/java/com/boying/entity/Inspection.java
@@ -1,5 +1,6 @@
package com.boying.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.boying.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,6 +11,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Transient;
import java.time.LocalDateTime;
/**
@@ -31,9 +33,12 @@
@Column(columnDefinition = "varchar(100) comment '宸℃浜�'")
private String inspecUser;
- @ApiModelProperty(value = "宸℃鍋滆溅鍦�")
- @Column(columnDefinition = "varchar(100) comment '宸℃鍋滆溅鍦�'")
- private String inspecPark;
+ private Integer parkId;
+ private Integer barrierId;
+
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父1寮傚父")
+ @Column(columnDefinition = "int comment '鐘舵�� 0姝ｅ父1寮傚父'")
+ private Integer status;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -42,4 +47,18 @@
@ApiModelProperty(value = "宸℃璇︽儏")
@Column(columnDefinition = "varchar(100) comment '宸℃璇︽儏'")
private String content;
+
+ /**
+ * 鍋滆溅鍦�
+ */
+ @Transient
+ @TableField(exist = false)
+ private String parkName;
+
+ /**
+ * 閬撻椄
+ */
+ @Transient
+ @TableField(exist = false)
+ private String barrierName;
}
diff --git a/src/main/java/com/boying/entity/Repair.java b/src/main/java/com/boying/entity/Repair.java
index aae26a0..cd25cd3 100644
--- a/src/main/java/com/boying/entity/Repair.java
+++ b/src/main/java/com/boying/entity/Repair.java
@@ -5,9 +5,11 @@
import com.boying.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Transient;
import java.time.LocalDateTime;
@@ -29,10 +31,13 @@
private Integer parkId;
private Integer barrierId;
- private String username;
+ private String repairUser;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime repairTime;
+ @ApiModelProperty(value = "鐘舵�� 0缁翠慨1淇濆吇2鏇存崲")
+ @Column(columnDefinition = "int comment '鐘舵�� 0缁翠慨1淇濆吇2鏇存崲'")
+ private Integer status;
private String repairContent;
/**
--
Gitblit v1.9.1