待处理人修改

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

@@ -64,7 +64,7 @@ public class PointInfoVo extends TenantEntity implements Serializable {
     /**
      * 维护单位
      */
-    @ExcelProperty(value = "维护单位")
+    @ExcelProperty(value = "设备维护单位")
     private String maintenanceUnit;
 
 
@@ -75,15 +75,6 @@ public class PointInfoVo extends TenantEntity implements Serializable {
     private String linkUnit;
 
 
-
-
-
-    /**
-     * 摄像机类型
-     */
-    @ExcelProperty(value = "摄像机类型")
-    private String cameraType;
-
     /**
      * 经度
      */
@@ -120,6 +111,13 @@ public class PointInfoVo extends TenantEntity implements Serializable {
      */
     @ExcelProperty(value = "设备IP")
     private String ip;
+
+
+    /**
+     * 摄像机类型
+     */
+    @ExcelProperty(value = "摄像机类型")
+    private String cameraType;
     /**
      * 建设项目
      */

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

@@ -203,7 +203,6 @@ public class PointInfoServiceImpl implements IPointInfoService {
             CompletableFuture.runAsync(() -> {
                 try {
                     String organizationName = pointInfo.getOrganizationName();
-                    String projectName = pointInfo.getProjectName();
 
                     // 设置 projectId
                     String projectId = projectMap.get(organizationName);
@@ -212,10 +211,11 @@ public class PointInfoServiceImpl implements IPointInfoService {
                     }
 
                     // 调用远程服务获取单位信息（耗时操作）
+/*                    String projectName = pointInfo.getProjectName();
                     String unit = projectInfoService.getContractPartyBNameByProjectName(projectName);
                     if (unit != null) {
                         pointInfo.setMaintenanceUnit(unit);
-                    }
+                    }*/
                 } catch (Exception e) {
                     System.err.println("处理错误:Error processing PointInfo: " + e.getMessage());
                 }

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

@@ -1,5 +1,6 @@
 package org.dromara.platform.service.impl;
 
+import jakarta.annotation.Resource;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.platform.domain.Attachment;
 import org.dromara.platform.domain.AttachmentSerializer;
+import org.dromara.platform.service.IContractInfoService;
 import org.springframework.stereotype.Service;
 import org.dromara.platform.domain.bo.WorkOrderDelayBo;
 import org.dromara.platform.domain.vo.WorkOrderDelayVo;
@@ -33,6 +35,9 @@ public class WorkOrderDelayServiceImpl implements IWorkOrderDelayService {
 
     private final WorkOrderDelayMapper baseMapper;
 
+    @Resource
+    private IContractInfoService contractInfoService;
+
     /**
      * 查询工单延期审核
      *
@@ -42,7 +47,9 @@ public class WorkOrderDelayServiceImpl implements IWorkOrderDelayService {
     @Override
     public WorkOrderDelayVo queryById(Long id){
         WorkOrderDelayVo workOrderDelayVo = baseMapper.selectVoById(id);
-        workOrderDelayVo.setHandler("监理人员、业主人员");
+        String contractName = workOrderDelayVo.getContractName();
+        String ioCompany = contractInfoService.getIoCompany(contractName);
+        workOrderDelayVo.setHandler(ioCompany);
         String attachment = workOrderDelayVo.getAttachment();
         if (StringUtils.isNotBlank(attachment)) {
             AttachmentSerializer serializer = new AttachmentSerializer();

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

@@ -79,6 +79,9 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
     @Resource
     private WorkOrderDelayHistoryMapper workOrderDelayHistoryMapper;
 
+    @Resource
+    private IContractInfoService contractInfoService;
+
     /**
      * 查询工单信息
      *
@@ -88,7 +91,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
     @Override
     public WorkOrderInfoVo queryById(String id){
         WorkOrderInfoVo workOrderInfoVo = baseMapper.selectVoById(id);
-        workOrderInfoVo.setHandler("监理人员、业主人员");
+        workOrderInfoVo.setHandler(workOrderInfoVo.getMaintenanceUnit());
         String attachment = workOrderInfoVo.getAttachment();
         if (StringUtils.isNotBlank(attachment)) {
             AttachmentSerializer serializer = new AttachmentSerializer();