From b14e20bb3aa3b24a7b4e615f3863f976398d4dbf Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Wed, 14 Jun 2023 22:00:28 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8814=E6=97=A522:00:14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectDatabaseController.java |  4 +--
 .../mapper/ProjectDatabaseMapper.java         |  4 +++
 .../database/mapper/ProjectDatabaseMapper.xml | 10 +++++++
 .../service/IProjectDatabaseService.java      |  5 ++++
 .../impl/ProjectDatabaseServiceImpl.java      |  8 ++++++
 .../service/impl/WorkOrderServiceImpl.java    | 26 +++++++++----------
 6 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/ProjectDatabaseController.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/ProjectDatabaseController.java
index 5b102f8..18a866b 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/ProjectDatabaseController.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/ProjectDatabaseController.java
@@ -397,9 +397,7 @@ public class ProjectDatabaseController extends BladeController {
     public R allProject() {
         Map<String, Object> map = new HashMap<>();
         // 数据库/系统名称集合
-//        QueryWrapper<ProjectDatabase> wrapper = new QueryWrapper<>();
-//        wrapper.select("id,database_project_name");
-        map.put("dataBaseProjectNames", dataBaseService.list());
+        map.put("dataBaseProjectNames", dataBaseService.getAll());
 
         // 运维公司
         List<User> users = userClient.listRolebyId("运维公司").getData();
diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.java
index f82d75f..9797591 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.java
@@ -3,6 +3,9 @@ package org.springblade.plugin.operation.database.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springblade.plugin.operation.database.entity.ProjectDatabase;
+import org.springblade.plugin.operation.database.entity.ProjectDatabaseVo;
+
+import java.util.List;
 
 /**
  *  Mapper 接口
@@ -11,4 +14,5 @@ import org.springblade.plugin.operation.database.entity.ProjectDatabase;
  */
 public interface ProjectDatabaseMapper extends BaseMapper<ProjectDatabase> {
 
+    List<ProjectDatabaseVo> getAll();
 }
diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.xml b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.xml
index 72a06dd..215e935 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.xml
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/mapper/ProjectDatabaseMapper.xml
@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.plugin.operation.database.mapper.ProjectDatabaseMapper">
 
+    <select id="getAll" resultType="org.springblade.plugin.operation.database.entity.ProjectDatabaseVo">
+        SELECT
+        a.*,
+        u.name as companyName
+        FROM t_project_database a
+        left join lims.blade_user u ON u.id = a.company
+        WHERE a.is_deleted = 0
+        order by a.create_time DESC
+    </select>
+
 </mapper>
diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/IProjectDatabaseService.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/IProjectDatabaseService.java
index 410acd5..6bb1088 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/IProjectDatabaseService.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/IProjectDatabaseService.java
@@ -4,8 +4,11 @@ package org.springblade.plugin.operation.database.service;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.plugin.operation.database.entity.ProjectDatabase;
 import org.springblade.plugin.operation.database.entity.ProjectDatabasePo;
+import org.springblade.plugin.operation.database.entity.ProjectDatabaseVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  *  服务类
  *
@@ -16,4 +19,6 @@ public interface IProjectDatabaseService extends BaseService<ProjectDatabase> {
     String dataImport(MultipartFile file);
 
     boolean saveProAndMod(ProjectDatabasePo dataBase) ;
+
+    List<ProjectDatabaseVo> getAll();
 }
diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/ProjectDatabaseServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/ProjectDatabaseServiceImpl.java
index be2f465..17a9e80 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/ProjectDatabaseServiceImpl.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/ProjectDatabaseServiceImpl.java
@@ -12,6 +12,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.plugin.operation.database.entity.ProjectDatabase;
 import org.springblade.plugin.operation.database.entity.ModuleDatatable;
 import org.springblade.plugin.operation.database.entity.ProjectDatabasePo;
+import org.springblade.plugin.operation.database.entity.ProjectDatabaseVo;
 import org.springblade.plugin.operation.database.excel.DatabaseExcel;
 import org.springblade.plugin.operation.database.mapper.ProjectDatabaseMapper;
 import org.springblade.plugin.operation.database.service.IProjectDatabaseService;
@@ -38,6 +39,8 @@ public class ProjectDatabaseServiceImpl extends BaseServiceImpl<ProjectDatabaseM
 
     private final IModuleDatatableService dataTableService;
 
+    private final ProjectDatabaseMapper databaseMapper;
+
     private final ISysClient sysClient;
 
     private final IUserClient userClient;
@@ -180,4 +183,9 @@ public class ProjectDatabaseServiceImpl extends BaseServiceImpl<ProjectDatabaseM
         return dataTableService.saveBatch(moduleDatatableList);
     }
 
+    @Override
+    public List<ProjectDatabaseVo> getAll() {
+        return databaseMapper.getAll();
+    }
+
 }
diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
index dd56154..499c668 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
@@ -457,15 +457,15 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             varMap.put(var.getVariableName(), var.getValue()));
 
 //                    // 任务父类
-//                    varMap.put("renwufulei", DictBizCache.getById(Long.parseLong(varMap.get("renwufulei").toString())).getDictValue());
-//
-//                    ProjectDatabase byId = dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString());
-//                    if (byId != null) {
-//                        varMap.put("xitongmingchengshujuku", byId.getDatabaseProjectName());
-//                    }
-//
+                    varMap.put("renwufulei", DictBizCache.getById(Long.parseLong(varMap.get("renwufulei").toString())).getDictValue());
+
+                    ProjectDatabase byId = dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString());
+                    if (byId != null) {
+                        varMap.put("xitongmingchengshujuku", byId.getDatabaseProjectName());
+                    }
+
 //                    // 运维公司
-//                    varMap.put("yunweigongsi", userClient.userInfoById(Long.parseLong(varMap.get("yunweigongsi").toString())).getData().getRealName());
+                    varMap.put("yunweigongsi", userClient.userInfoById(Long.parseLong(varMap.get("yunweigongsi").toString())).getData().getRealName());
 
                     Task task = taskService.createTaskQuery().processInstanceId(historicProcessInstance.getId()).singleResult();
                     if (task != null) {
@@ -487,7 +487,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     }
                     varMap.put("startTime", historicProcessInstance.getStartTime());
                     varMap.put("endTime", historicProcessInstance.getEndTime());
-//                    varMap.put("startUserId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName());
+                    varMap.put("startUserId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName());
 //                    varMap.put("processInstanceId", historicProcessInstance.getId());
 //                    varMap.put("taskId", "");
                     workOrders.add(varMap);
@@ -499,13 +499,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             for (Map<String, Object> order : workOrders) {
                 WorkOrderExcel excel = new WorkOrderExcel();
                 excel.setTaskType(order.get("$renwuzhonglei").toString());
-//                excel.setTaskParent(order.get("renwufulei").toString());
-//                excel.setOperationModule(order.get("xitongmingchengshujuku").toString());
+                excel.setTaskParent(order.get("renwufulei").toString());
+                excel.setOperationModule(order.get("xitongmingchengshujuku").toString());
                 excel.setCurrentResponsiblePerson(order.get("currentResponsiblePerson").toString());
                 excel.setDept(order.get("$guanlibumen").toString());
                 excel.setLevel(order.get("$renwudengji").toString());
-//                excel.setCompany(order.get("yunweigongsi").toString());
-//                excel.setSponsor(order.get("startUserId").toString());
+                excel.setCompany(order.get("yunweigongsi").toString());
+                excel.setSponsor(order.get("startUserId").toString());
                 excel.setApprovalStatus(order.get("status").toString());
                 excel.setCreateTime(format.format(order.get("startTime")));