diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java index b248292..6134cba 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java @@ -76,7 +76,7 @@ public class DeviceInfo extends TenantEntity { /** * 监理公司 */ - private String superviseCompany; + private String monitorCompany; /** * 状态 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/OrderManagementInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/OrderManagementInfo.java index d1f3f3f..946d96b 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/OrderManagementInfo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/OrderManagementInfo.java @@ -53,7 +53,7 @@ public class OrderManagementInfo extends TenantEntity { /** * 监理类型 */ - private String superviseType; + private String monitorType; /** * 核查人员 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/StationInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/StationInfo.java index 036e266..e54504d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/StationInfo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/StationInfo.java @@ -65,7 +65,7 @@ public class StationInfo extends TenantEntity { /** * 监理公司 */ - private String superviseCompany; + private String monitorCompany; /** * 状态 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/OrderManagementInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/OrderManagementInfoBo.java index 0ae86f5..cf188a2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/OrderManagementInfoBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/OrderManagementInfoBo.java @@ -59,7 +59,7 @@ public class OrderManagementInfoBo extends BaseEntity { * 监理类型 */ //@NotBlank(message = "监理类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private String superviseType; + private String monitorType; /** * 核查人员 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/StationInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/StationInfoBo.java index 20201cf..698f84a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/StationInfoBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/StationInfoBo.java @@ -72,7 +72,7 @@ public class StationInfoBo extends BaseEntity { * 监理公司 */ //@NotBlank(message = "监理公司不能为空", groups = { AddGroup.class, EditGroup.class }) - private String superviseCompany; + private String monitorCompany; /** * 状态 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java index 2d5cbdc..08ca124 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java @@ -95,6 +95,6 @@ public class DeviceInfoVo implements Serializable { private String status; @ExcelProperty(value = "监理公司") - private String superviseCompany; + private String monitorCompany; } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/OrderManagementInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/OrderManagementInfoVo.java index 842e0cb..ddbb156 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/OrderManagementInfoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/OrderManagementInfoVo.java @@ -65,7 +65,7 @@ public class OrderManagementInfoVo implements Serializable { * 监理类型 */ @ExcelProperty(value = "监理类型") - private String superviseType; + private String monitorType; /** * 核查人员 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationInfoVo.java index c1a342b..e18b630 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationInfoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationInfoVo.java @@ -81,7 +81,7 @@ public class StationInfoVo implements Serializable { * 监理公司 */ @ExcelProperty(value = "监理公司") - private String superviseCompany; + private String monitorCompany; /** * 状态 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/OrderManagementInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/OrderManagementInfoServiceImpl.java index 8cdaf7c..2f1f958 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/OrderManagementInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/OrderManagementInfoServiceImpl.java @@ -86,7 +86,7 @@ public class OrderManagementInfoServiceImpl implements IOrderManagementInfoServi lqw.eq(StringUtils.isNotBlank(bo.getStation()), OrderManagementInfo::getStation, bo.getStation()); lqw.eq(StringUtils.isNotBlank(bo.getArea()), OrderManagementInfo::getArea, bo.getArea()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), OrderManagementInfo::getStatus, bo.getStatus()); - lqw.eq(StringUtils.isNotBlank(bo.getSuperviseType()), OrderManagementInfo::getSuperviseType, bo.getSuperviseType()); + lqw.eq(StringUtils.isNotBlank(bo.getMonitorType()), OrderManagementInfo::getMonitorType, bo.getMonitorType()); lqw.eq(StringUtils.isNotBlank(bo.getCheckPerson()), OrderManagementInfo::getCheckPerson, bo.getCheckPerson()); lqw.eq(bo.getCheckScore() != null, OrderManagementInfo::getCheckScore, bo.getCheckScore()); // 添加时间范围查询 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java index 7939932..7a94400 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java @@ -80,7 +80,7 @@ public class StationInfoServiceImpl implements IStationInfoService { lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), StationInfo::getLatitude, bo.getLatitude()); lqw.eq(StringUtils.isNotBlank(bo.getIoCompany()), StationInfo::getIoCompany, bo.getIoCompany()); lqw.eq(StringUtils.isNotBlank(bo.getIoPerson()), StationInfo::getIoPerson, bo.getIoPerson()); - lqw.eq(StringUtils.isNotBlank(bo.getSuperviseCompany()), StationInfo::getSuperviseCompany, bo.getSuperviseCompany()); + lqw.eq(StringUtils.isNotBlank(bo.getMonitorCompany()), StationInfo::getMonitorCompany, bo.getMonitorCompany()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), StationInfo::getStatus, bo.getStatus()); return lqw; }