点位上报,工单信息 巡检日报字段调整

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderDelay.java

@@ -104,7 +104,7 @@ public class WorkOrderDelay extends TenantEntity {
     /**
      * 所属机构
      */
-    private String institution;
+    private String organizationName;
 
     /**
      * 故障地点

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java

@@ -107,7 +107,7 @@ public class WorkOrderInfo extends TenantEntity {
     /**
      * 所属机构
      */
-    private String institution;
+    private String organizationName;
 
     /**
      * 故障地点

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java

@@ -92,7 +92,7 @@ public class DailyInspectionReportBo extends BaseEntity {
     /**
      * 问题处理描述
      */
-    @NotBlank(message = "问题处理描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "问题处理描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String problemHandleDesc;
 
     /**

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderDelayBo.java

@@ -75,7 +75,7 @@ public class WorkOrderDelayBo extends BaseEntity {
     /**
      * 报修人员ID
      */
-    @NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairerId;
 
     /**
@@ -118,7 +118,7 @@ public class WorkOrderDelayBo extends BaseEntity {
      * 所属机构
      */
     @NotBlank(message = "所属机构不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String institution;
+    private String organizationName;
 
     /**
      * 故障地点

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java

@@ -48,7 +48,7 @@ public class WorkOrderInfoBo extends BaseEntity {
     /**
      * 报修人员ID
      */
-    @NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairerId;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -88,7 +88,7 @@ public class WorkOrderInfoBo extends BaseEntity {
      * 所属机构
      */
     @NotBlank(message = "所属机构不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String institution;
+    private String organizationName;
 
     /**
      * 故障地点

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java

@@ -118,5 +118,6 @@ public class PointInfoVo implements Serializable {
     @ExcelProperty(value = "当前状态")
     private Long status;
 
-
+    @ExcelProperty(value = "故障地点")
+    private String faultLocation;
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderDelayVo.java

@@ -128,7 +128,7 @@ public class WorkOrderDelayVo implements Serializable {
      * 所属机构
      */
     @ExcelProperty(value = "所属机构")
-    private String institution;
+    private String organizationName;
 
     /**
      * 故障地点

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java

@@ -93,7 +93,7 @@ public class WorkOrderInfoVo implements Serializable {
      * 所属机构
      */
     @ExcelProperty(value = "所属机构")
-    private String institution;
+    private String organizationName;
 
     /**
      * 故障地点

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java

@@ -39,7 +39,9 @@ public class PointInfoServiceImpl implements IPointInfoService {
      */
     @Override
     public PointInfoVo queryById(String id){
-        return baseMapper.selectVoById(id);
+        PointInfoVo pointInfoVo = baseMapper.selectVoById(id);
+        pointInfoVo.setFaultLocation(pointInfoVo.getPointName());
+        return pointInfoVo;
     }
 
     /**

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java

@@ -85,7 +85,7 @@ public class WorkOrderDelayServiceImpl implements IWorkOrderDelayService {
         lqw.eq(bo.getResponseTime() != null, WorkOrderDelay::getResponseTime, bo.getResponseTime());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), WorkOrderDelay::getFaultCategory, bo.getFaultCategory());
         lqw.eq(bo.getFaultSubcategory() != null, WorkOrderDelay::getFaultSubcategory, bo.getFaultSubcategory());
-        lqw.eq(StringUtils.isNotBlank(bo.getInstitution()), WorkOrderDelay::getInstitution, bo.getInstitution());
+        lqw.eq(StringUtils.isNotBlank(bo.getOrganizationName()), WorkOrderDelay::getOrganizationName, bo.getOrganizationName());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderDelay::getFaultLocation, bo.getFaultLocation());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderDelay::getFaultDescription, bo.getFaultDescription());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultImage()), WorkOrderDelay::getFaultImage, bo.getFaultImage());

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

@@ -81,7 +81,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         lqw.eq(bo.getResponseTime() != null, WorkOrderInfo::getResponseTime, bo.getResponseTime());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), WorkOrderInfo::getFaultCategory, bo.getFaultCategory());
         lqw.eq(bo.getFaultSubcategory() != null, WorkOrderInfo::getFaultSubcategory, bo.getFaultSubcategory());
-        lqw.eq(StringUtils.isNotBlank(bo.getInstitution()), WorkOrderInfo::getInstitution, bo.getInstitution());
+        lqw.eq(StringUtils.isNotBlank(bo.getOrganizationName()), WorkOrderInfo::getOrganizationName, bo.getOrganizationName());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderInfo::getFaultLocation, bo.getFaultLocation());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderInfo::getFaultDescription, bo.getFaultDescription());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultImage()), WorkOrderInfo::getFaultImage, bo.getFaultImage());
@@ -91,6 +91,9 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), WorkOrderInfo::getLatitude, bo.getLatitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), WorkOrderInfo::getLongitude, bo.getLongitude());
         lqw.eq(bo.getStatus() != null, WorkOrderInfo::getStatus, bo.getStatus());
+
+        // 添加按创建时间降序排序
+        lqw.orderByDesc(WorkOrderInfo::getCreateTime);
         return lqw;
     }