Browse Source

定义字段里含supervise全部替换为monitor

aqm-ops-supervision-platform
gjh 2 weeks ago
parent
commit
31729716c8
  1. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java
  2. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/OrderManagementInfo.java
  3. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/StationInfo.java
  4. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/OrderManagementInfoBo.java
  5. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/StationInfoBo.java
  6. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java
  7. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/OrderManagementInfoVo.java
  8. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationInfoVo.java
  9. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/OrderManagementInfoServiceImpl.java
  10. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java

2
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;
/**
* 状态

2
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;
/**
* 核查人员

2
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;
/**
* 状态

2
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;
/**
* 核查人员

2
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;
/**
* 状态

2
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;
}

2
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;
/**
* 核查人员

2
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;
/**
* 状态

2
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());
// 添加时间范围查询

2
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;
}

Loading…
Cancel
Save