修改了保洁bug

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

@@ -101,6 +101,10 @@ public class ServiceWorkOrders extends TenantEntity {
      * 图片
      */
     private String imgUrl;
+    /**
+     * 工单图片
+     */
+    private String orderImgUrl;
     /**
      * 备注
      */

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

@@ -90,11 +90,6 @@ public class CleanOrderBo extends BaseEntity {
     @NotBlank(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class})
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private String endTime;
-
-    /**
-     * 单位id
-     */
-    @NotNull(message = "单位id不能为空", groups = {AddGroup.class, EditGroup.class})
     /**
      * 评价
      */

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

@@ -48,6 +48,11 @@ public class ServiceWorkOrdersInfoVo implements Serializable {
      */
     @ExcelProperty(value = "工单类型")
     private Long type;
+    /**
+     * 权重
+     */
+    @ExcelProperty(value = "权重")
+    private String processingWeight;
 
     /**
      * 状态
@@ -127,6 +132,22 @@ public class ServiceWorkOrdersInfoVo implements Serializable {
      */
     @ExcelProperty(value = "创建时间")
     private Date createTime;
+    /**
+     * 评价文本
+     */
+    private String serviceEvaluaText;
+    /**
+     * 工单图片
+     */
+    private String orderImgUrl;
+    /**
+     * 图片
+     */
+    private String imgUrl;
+    /**
+     * 备注
+     */
+    private String remark;
     /**
      *工单记录
      */

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

@@ -131,6 +131,10 @@ public class ServiceWorkOrdersVo implements Serializable {
      * 评价文本
      */
     private String serviceEvaluaText;
+    /**
+     * 工单图片
+     */
+    private String orderImgUrl;
     /**
      * 图片
      */

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

@@ -216,6 +216,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
      * 修改前的数据校验
      */
     private void validEntityBeforeUpdate(ServiceWorkOrders entity) {
+        Assert.isTrue(ObjectUtil.isNotEmpty(entity.getStatus()),"状态不能为空!");
         LambdaQueryWrapper<ServiceWorkOrdersRecord> ordersLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ordersLambdaQueryWrapper.eq(ServiceWorkOrdersRecord::getOrderId, entity.getId());
         ordersLambdaQueryWrapper.eq(ServiceWorkOrdersRecord::getStatus, entity.getStatus());