根据项目名称获取到对应的运维单位(乙方)

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java

@@ -5,7 +5,6 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.platform.domain.ContractInfo;
 import org.dromara.platform.domain.vo.ProjectSelectVo;
@@ -134,4 +133,10 @@ public class ProjectInfoController extends BaseController {
         return R.ok(rs);
     }
 
+
+    @GetMapping("/getContractPartyBNameByProjectName")
+    public R<String> getContractPartyBNameByProjectName(String projectName) {
+        String partyB = projectInfoService.getContractPartyBNameByProjectName(projectName);
+        return R.ok("乙方单位",partyB);
+    }
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.platform.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -92,6 +93,22 @@ public class PointInfo extends TenantEntity {
      */
     private String ip;
 
+
+    /**
+     * 链路维护单位
+     */
+    private String linkUnit;
+
+
+    /**
+     * 建设项目
+     */
+    private String buildProject;
+
+    /**
+     * 建设时间
+     */
+    private String buildTime;
     /**
      * 当前状态
      */
@@ -103,5 +120,4 @@ public class PointInfo extends TenantEntity {
     @TableLogic
     private String delFlag;
 
-
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.platform.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.platform.domain.PointInfo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -32,6 +33,22 @@ public class PointInfoBo extends BaseEntity {
     //@NotBlank(message = "编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String code;
 
+
+    /**
+     * 链路维护单位
+     */
+    private String linkUnit;
+
+    /**
+     * 建设项目
+     */
+    private String buildProject;
+
+    /**
+     * 建设时间
+     */
+    private String buildTime;
+
     /**
      * 点位名称
      */

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

@@ -65,6 +65,27 @@ public class PointInfoVo extends TenantEntity implements Serializable {
     @ExcelProperty(value = "维护单位")
     private String maintenanceUnit;
 
+
+    /**
+     * 链路维护单位
+     */
+    @ExcelProperty(value = "链路维护单位")
+    private String linkUnit;
+
+
+    /**
+     * 建设项目
+     */
+    @ExcelProperty(value = "建设项目")
+    private String buildProject;
+
+    /**
+     * 建设时间
+     */
+    @ExcelProperty(value = "建设时间")
+    private String buildTime;
+
+
     /**
      * 摄像机类型
      */

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

@@ -97,11 +97,17 @@ public interface IProjectInfoService {
      */
 
     /**
-     * 根据项目名称查询合同乙方单位名称(巡检单位)
+     * 根据项目名称查询合同甲方单位名称(业主单位)
      * @param projectName
      * @return
      */
     String getContractPartyANameByProjectName(String projectName);
+    /**
+     * 根据项目名称查询合同乙方单位名称(巡检单位)
+     * @param projectName
+     * @return
+     */
+    String getContractPartyBNameByContractName(String projectName);
 
     String getContractPartyBNameByProjectName(String projectName);
 }

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

@@ -216,11 +216,20 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
     }
 
     @Override
-    public String getContractPartyBNameByProjectName(String contractName) {
+    public String getContractPartyBNameByContractName(String contractName) {
         LambdaQueryWrapper<ContractInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ContractInfo::getContractName, contractName);
         ContractInfo contractInfo = contractInfoMapper.selectOne(queryWrapper);
         String partyB = contractInfo.getPartyB();
         return partyB;
     }
+
+    @Override
+    public String getContractPartyBNameByProjectName(String projectName) {
+        LambdaQueryWrapper<ContractInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ContractInfo::getProjectName, projectName);
+        ContractInfo contractInfo = contractInfoMapper.selectOne(queryWrapper);
+        String partyB = contractInfo.getPartyB();
+        return partyB;
+    }
 }

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

@@ -22,11 +22,8 @@ import org.dromara.platform.domain.bo.*;
 import org.dromara.platform.domain.vo.WorkOrderDelayVo;
 import org.dromara.platform.mapper.*;
 import org.dromara.platform.service.*;
-import org.dromara.workflow.domain.bo.StartProcessBo;
 import org.dromara.workflow.domain.bo.TaskBo;
-import org.dromara.workflow.domain.bo.TestLeaveBo;
 import org.dromara.workflow.domain.vo.TaskVo;
-import org.flowable.engine.RuntimeService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -216,7 +213,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         add.setRepairer(nickname);
         // 设置维护单位
         String contractName = bo.getContractName();
-        String partyB = projectInfoService.getContractPartyBNameByProjectName(contractName);
+        String partyB = projectInfoService.getContractPartyBNameByContractName(contractName);
         add.setMaintenanceUnit(partyB);
 
         boolean flag = baseMapper.insert(add) > 0;
@@ -1220,9 +1217,9 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         List<WorkOrderInfoVo> records = result.getRecords();
         List<WorkOrderInfoVo> filterRecords = records.stream()
             .filter(record -> record.getStatus() != null
-                && ( record.getStatus() == 2 || record.getStatus() == 7)
+                && ( record.getStatus() == 1 || record.getStatus() == 2 || record.getStatus() == 7)
             )
-            // TODO 角色过滤
+
             .filter(item -> "admin".equals(username) || item.getMaintenanceUnit().equals(loginUser.getDeptName()))
             .collect(Collectors.toList());