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

Compare commits

base: by2025:a585a1be265f7311fda588ac245b864c715c169a
Branches Tags
by2025:master
by2025:main
...
compare: by2025:72664a29668484bfec70d2e2f137300e9e6fdaca
Branches Tags
by2025:master
by2025:main

2 Commits
a585a1be26 ... 72664a2966

Author SHA1 Message Date
dy
72664a2966 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m14s
Details
2025-06-26 17:33:38 +08:00
lxj
a1f4f0a112 修改保洁订单字段问题 2025-06-26 17:33:17 +08:00
4 changed files with 32 additions and 32 deletions
Show Stats Expand all files Collapse all files

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

@ -44,10 +44,10 @@ public class CleanOrder extends TenantEntity {
*/ */
private Long cleanId; private Long cleanId;
/** // /**
* 名称 // * 名称
*/ // */
private String name; // private String name;
/** /**
* 单价 * 单价
@ -78,11 +78,11 @@ public class CleanOrder extends TenantEntity {
* 单位id * 单位id
*/ */
private Long unitId; private Long unitId;
//
/** // /**
* 申请单位 // * 申请单位
*/ // */
private String unit; // private String unit;
/** /**
* 联系人 * 联系人

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

@ -47,11 +47,11 @@ public class CleanOrderBo extends BaseEntity {
@NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class })
private List<Long> cleanIds; private List<Long> cleanIds;
/** // /**
* 名称 // * 名称
*/ // */
@NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String name; // private String name;
/** /**
* 单价 * 单价
@ -88,11 +88,11 @@ public class CleanOrderBo extends BaseEntity {
@NotNull(message = "单位id不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "单位id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long unitId; private Long unitId;
/** // /**
* 申请单位 // * 申请单位
*/ // */
@NotBlank(message = "申请单位不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "申请单位不能为空", groups = { AddGroup.class, EditGroup.class })
private String unit; // private String unit;
/** /**
* 联系人 * 联系人

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

@ -55,11 +55,11 @@ public class CleanOrderVo implements Serializable {
@ExcelProperty(value = "保洁") @ExcelProperty(value = "保洁")
private List<String> clean; private List<String> clean;
/** // /**
* 名称 // * 名称
*/ // */
@ExcelProperty(value = "名称") // @ExcelProperty(value = "名称")
private String name; // private String name;
/** /**
* 单价 * 单价
@ -97,11 +97,11 @@ public class CleanOrderVo implements Serializable {
@ExcelProperty(value = "单位id") @ExcelProperty(value = "单位id")
private Long unitId; private Long unitId;
/** // /**
* 申请单位 // * 申请单位
*/ // */
@ExcelProperty(value = "申请单位") // @ExcelProperty(value = "申请单位")
private String unit; // private String unit;
/** /**
* 联系人 * 联系人

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

@ -85,15 +85,15 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
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());
lqw.like(StringUtils.isNotBlank(bo.getName()), CleanOrder::getName, bo.getName()); // lqw.like(StringUtils.isNotBlank(bo.getName()), CleanOrder::getName, bo.getName());
lqw.eq(bo.getPrices() != null, CleanOrder::getPrices, bo.getPrices()); lqw.eq(bo.getPrices() != null, CleanOrder::getPrices, bo.getPrices());
lqw.eq(bo.getSumPeices() != null, CleanOrder::getSumPeices, bo.getSumPeices()); lqw.eq(bo.getSumPeices() != null, CleanOrder::getSumPeices, bo.getSumPeices());
lqw.eq(bo.getPayState() != null, CleanOrder::getPayState, bo.getPayState()); lqw.eq(bo.getPayState() != null, CleanOrder::getPayState, bo.getPayState());
lqw.eq(bo.getStarTime() != null, CleanOrder::getStarTime, bo.getStarTime()); lqw.eq(bo.getStarTime() != null, CleanOrder::getStarTime, bo.getStarTime());
lqw.eq(bo.getEndTime() != null, CleanOrder::getEndTime, bo.getEndTime()); lqw.eq(bo.getEndTime() != null, CleanOrder::getEndTime, bo.getEndTime());
lqw.eq(bo.getUnitId() != null, CleanOrder::getUnitId, bo.getUnitId()); lqw.eq(bo.getUnitId() != null, CleanOrder::getUnitId, bo.getUnitId());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getState, bo.getState()); // lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getState, bo.getState());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getUnit, bo.getUnit()); // lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getUnit, bo.getUnit());
lqw.eq(StringUtils.isNotBlank(bo.getPersion()), CleanOrder::getPersion, bo.getPersion()); lqw.eq(StringUtils.isNotBlank(bo.getPersion()), CleanOrder::getPersion, bo.getPersion());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CleanOrder::getPhone, bo.getPhone()); lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CleanOrder::getPhone, bo.getPhone());