by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

保洁订单详情

Browse Source
This commit is contained in:
dy 2025-07-03 12:04:51 +08:00
parent 147c67b5ad
commit 4a20ec11db
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java
View File

@ -35,7 +35,7 @@ public class CleanOrder extends TenantEntity {
/** /**
* 位置 * 位置
*/ */
private String location; private Long location;
/** /**
* 面积 * 面积

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java
View File

@ -38,7 +38,7 @@ public class CleanOrderBo extends BaseEntity {
* 位置 * 位置
*/ */
// @NotBlank(message = "位置不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "位置不能为空", groups = { AddGroup.class, EditGroup.class })
private String location; private Long location;
/** /**
* 面积 * 面积

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java
View File

@ -43,7 +43,7 @@ public class CleanOrderVo implements Serializable {
* 位置 * 位置
*/ */
@ExcelProperty(value = "位置") @ExcelProperty(value = "位置")
private String location; private Long location;
/** /**
* 面积 * 面积
@ -126,5 +126,7 @@ public class CleanOrderVo implements Serializable {
private List<Clean> cleanList; private List<Clean> cleanList;
private String unitName;
} }

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java
View File

@ -110,7 +110,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CleanOrder::getId); lqw.orderByAsc(CleanOrder::getId);
lqw.eq(StringUtils.isNotBlank(bo.getLocation()), CleanOrder::getLocation, bo.getLocation()); // lqw.eq(StringUtils.isNotBlank(bo.getLocation()), CleanOrder::getLocation, bo.getLocation());
// lqw.eq(StringUtils.isNotBlank(bo.getArea()), CleanOrder::getArea, bo.getArea()); // lqw.eq(StringUtils.isNotBlank(bo.getArea()), CleanOrder::getArea, bo.getArea());
// lqw.eq(bo.getCleanIds() != null, CleanOrder::getCleanId, bo.getCleanIds()); // lqw.eq(bo.getCleanIds() != null, CleanOrder::getCleanId, bo.getCleanIds());

2
ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml
View File

@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT SELECT
co.*, co.*,
c.*, c.*,
ru.name name,ru.id unitId ru.name unitName,ru.id unitId
FROM FROM
clean_order co clean_order co
LEFT JOIN clean c ON co.clean_id = c.id LEFT JOIN clean c ON co.clean_id = c.id