修改保洁订单字段问题

.gitea/workflows/dev.yml

@@ -18,7 +18,7 @@ jobs:
       - name: cp
         run: copy ./ruoyi-modules/Property/target/Property.jar C:\devtool\server
       - name: kill
-        run: Get-NetTCPConnection -LocalPort 10001 -State Listening -ErrorAction SilentlyContinue | ForEach-Object -Process { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }
+        run: Get-NetTCPConnection -LocalPort 10001 -State Listen -ErrorAction SilentlyContinue | Where-Object { $_.OwningProcess -ne $null } | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }
       - name: run
         run: java -jar C:\devtool\server\Property.jar
 

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

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

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

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

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

@@ -55,11 +55,11 @@ public class CleanOrderVo implements Serializable {
     @ExcelProperty(value = "保洁")
     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")
     private Long unitId;
 
-    /**
+//    /**
-     * 申请单位
+//     * 申请单位
-     */
+//     */
-    @ExcelProperty(value = "申请单位")
+//    @ExcelProperty(value = "申请单位")
-    private String unit;
+//    private String unit;
 
     /**
      * 联系人

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

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