人员信息负责项目，参与项目

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -107,15 +107,6 @@ public class CmcProjectController extends BaseController
         return success(cmcProject);
     }
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     */
-    @GetMapping("/projectLeader")
-    public AjaxResult getListByProjectLeader(String projectLeader)
-    {
-        return success(cmcProjectService.selectCmcProjectListByProjectLeader(projectLeader));
-    }
-
     /**
      * 新增cmc项目
      */

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectMapper.java

@@ -27,14 +27,6 @@ public interface CmcProjectMapper
      */
     public CmcProject selectCmcProjectByProjectNumber(String projectNumber);
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     *
-     * @param projectLeader cmc项目负责人
-     * @return cmc项目集合
-     */
-    public List<CmcProject> selectCmcProjectListByProjectLeader(String projectLeader);
-
     /**
      * 查询cmc项目列表
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectService.java

@@ -28,14 +28,6 @@ public interface ICmcProjectService
      */
     public CmcProject selectCmcProjectByProjectNumber(String projectNumber);
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     *
-     * @param projectLeader cmc项目负责人
-     * @return cmc项目集合
-     */
-    public List<CmcProject> selectCmcProjectListByProjectLeader(String projectLeader);
-
     /**
      * 查询cmc项目列表
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectServiceImpl.java

@@ -46,17 +46,6 @@ public class CmcProjectServiceImpl implements ICmcProjectService
         return cmcProjectMapper.selectCmcProjectByProjectNumber(projectNumber);
     }
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     *
-     * @param projectLeader cmc项目负责人
-     * @return cmc项目集合
-     */
-    @Override
-    public List<CmcProject> selectCmcProjectListByProjectLeader(String projectLeader) {
-        return cmcProjectMapper.selectCmcProjectListByProjectLeader(projectLeader);
-    }
-
     /**
      * 查询cmc项目列表
      * 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -79,6 +79,7 @@
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>
+            (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') and p.project_number REGEXP '^((?![\\\/\\*\\-]).)*$'
             <if test="projectId != null  and projectId != ''"> and p.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
@@ -97,6 +98,7 @@
             <if test="planTime != null "> and p.plan_time = #{planTime}</if>
             <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
             <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
+            <if test="participates != null  and participates != ''"> and find_in_set(#{participates}, p.participates)</if>
         </where>
         order by p.register_time desc
     </select>
@@ -108,7 +110,8 @@
 
     <select id="selectCmcProjectByProjectNumber" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
-        where p.project_number = #{projectNumber}
+        where
+        (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') and p.project_number REGEXP '^((?![\\\/\\*\\-]).)*$' and p.project_number = #{projectNumber}
     </select>
 
     <insert id="insertCmcProject" parameterType="CmcProject">

oa-ui/src/api/oa/project/project.js

@@ -23,15 +23,6 @@ export function getProject(projectId) {
   })
 }
 
-// 获取项目负责人负责的项目详细信息
-export function getListByProjectLeader(projectLeader) {
-  return request({
-    url: '/oa/project/projectLeader',
-    method: 'get',
-    params: projectLeader
-  })
-}
-
 // 新增cmc项目
 export function addProject(data) {
   return request({

oa-ui/src/views/oa/staff/info.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-14 16:18:31
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-25 15:21:12
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -81,9 +81,12 @@
       </el-col>
       <el-col :span="15" class="stateInfo">
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <!-- <el-tab-pane label="负责项目" name="1">
+          <el-tab-pane label="负责项目" name="0">
             <projectInfo></projectInfo>
-          </el-tab-pane> -->
+          </el-tab-pane>
+          <el-tab-pane label="参与项目" name="1">
+            <participate></participate>
+          </el-tab-pane>
           <el-tab-pane label="变更记录" name="2">
             <changeRecord></changeRecord>
           </el-tab-pane>
@@ -97,9 +100,10 @@
 import userAvatar from "@/views/system/user/profile/userAvatar.vue"
 import { getUser } from "@/api/system/user"
 import projectInfo from './projectInfo'
+import participate from './participate'
 import changeRecord from './changeRecord'
 export default {
-  components: { userAvatar, projectInfo, changeRecord },
+  components: { userAvatar, projectInfo, participate, changeRecord },
   dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel',
     'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree', 'sys_user_engineerlevel', 'sys_user_operatorlevel'],
   created() {

oa-ui/src/views/oa/staff/participate.vue

@@ -0,0 +1,92 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-03-25 17:38:39
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-25 16:02:48
+-->
+<template>
+  <div>
+    <!-- <el-table :data="tableData" style="width: 100%" height="660px" :row-style="{height: '60px'}"> -->
+    <!-- <el-table-column type="expand">
+        <template slot-scope="props">
+          <div style="background-color: #F0F2F5;">
+            <el-descriptions direction="vertical" :column="3" border>
+              <el-descriptions-item label="工作内容">XXXXXX</el-descriptions-item>
+              <el-descriptions-item label="工作量">XXXXXX</el-descriptions-item>
+              <el-descriptions-item label="单位" :span="2">km²</el-descriptions-item>
+            </el-descriptions>
+          </div>
+        </template>
+      </el-table-column> -->
+    <!-- <el-table-column label="项目编号" width="100px" prop="projectNumber">
+      </el-table-column>
+      <el-table-column label="项目名称" prop="projectName">
+      </el-table-column>
+      <el-table-column label="项目负责人" width="100px" prop="projectLeaderUser.nickName">
+      </el-table-column>
+      <el-table-column label="承担部门" prop="undertakingDeptName">
+      </el-table-column>
+    </el-table> -->
+    <el-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse-item :name="item.projectNumber" v-for="item in tableData" :key="item.projectNumber">
+        <template slot="title">
+          <div>
+            <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon>
+            {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeaderUser.nickName }}
+          </div>
+        </template>
+        <div style="background-color: #F0F2F5;">
+          <el-descriptions direction="vertical" :column="3" border>
+            <el-descriptions-item label="工作内容">暂无信息，敬请期待</el-descriptions-item>
+            <el-descriptions-item label="工作量">暂无信息，敬请期待</el-descriptions-item>
+            <el-descriptions-item label="单位" :span="2">暂无信息，敬请期待</el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </el-collapse-item>
+    </el-collapse>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getListByPaticipates" />
+  </div>
+</template>
+
+<script>
+
+import { listProject } from "@/api/oa/project/project";
+export default {
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        participates: null
+      },
+      // 总条数
+      total: 0,
+      tableData: [],
+      activeNames: ['1'],
+    }
+  },
+  created() {
+    this.getListByPaticipates();
+  },
+  methods: {
+    handleChange(val) {
+
+    },
+    getListByPaticipates() {
+      this.queryParams.participates = this.$route.query.userId;
+      listProject(this.queryParams).then(res => {
+        this.tableData = res.rows
+        this.total = res.total
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-icon {
+  font-size: 20px;
+}
+</style>

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -2,12 +2,12 @@
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-17 14:56:12
+ * @LastEditTime: 2024-07-25 15:57:16
 -->
 <template>
   <div>
-    <!-- <el-table :data="tableData" style="width: 100%">
-      <el-table-column type="expand">
+    <el-table :data="tableData" style="width: 100%" height="660px" :row-style="{ height: '60px' }">
+      <!-- <el-table-column type="expand">
         <template slot-scope="props">
           <div style="background-color: #F0F2F5;">
             <el-descriptions direction="vertical" :column="3" border>
@@ -17,70 +17,62 @@
             </el-descriptions>
           </div>
         </template>
-</el-table-column>
-<el-table-column label="项目编号" prop="projectNumber">
-</el-table-column>
-<el-table-column label="项目名称" prop="projectName">
-</el-table-column>
-<el-table-column label="项目负责人" prop="projectLeader">
-</el-table-column>
-</el-table> -->
-    <el-collapse v-model="activeNames" @change="handleChange">
+      </el-table-column> -->
+      <el-table-column label="项目编号" width="100px" prop="projectNumber">
+      </el-table-column>
+      <el-table-column label="项目名称" prop="projectName">
+      </el-table-column>
+      <el-table-column label="项目负责人" width="100px" prop="projectLeaderUser.nickName">
+      </el-table-column>
+      <el-table-column label="承担部门" prop="undertakingDeptName">
+      </el-table-column>
+    </el-table>
+    <!-- <el-collapse v-model="activeNames" @change="handleChange">
       <el-collapse-item :name="item.projectNumber" v-for="item in tableData" :key="item.projectNumber">
         <template slot="title">
           <div>
-            <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon>
-            <!-- {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeaderUser.nickName }} -->
-          </div>
+            <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon> -->
+    <!-- {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeaderUser.nickName }} -->
+    <!-- </div>
         </template>
         <div>暂无信息，敬请期待</div>
       </el-collapse-item>
-    </el-collapse>
+    </el-collapse> -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getListByProjectLeader" />
   </div>
 </template>
 
 <script>
 
-import { listProject, getProject, getListByProjectLeader, delProject, addProject, updateProject } from "@/api/oa/project/project";
+import { listProject } from "@/api/oa/project/project";
 export default {
   data() {
     return {
-
-      tableData: [
-        {
-          projectNumber: '2021C40',
-          projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
-          projectLeader: 'XXX'
-        },
-        {
-          projectNumber: '2021C50',
-          projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
-          projectLeader: 'XXX'
-        },
-        {
-          projectNumber: '2021C60',
-          projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
-          projectLeader: 'XXX'
-        }
-      ],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectLeader: null
+      },
+      // 总条数
+      total: 0,
+      tableData: [],
       activeNames: ['1'],
     }
   },
   created() {
-    // this.getListByProjectLeader();
-    if(this.$route.query){
-      let userId = this.$route.query.userId
-      // this.getUserInfo(userId)
-    }
+    this.getListByProjectLeader();
   },
   methods: {
     handleChange(val) {
 
     },
     getListByProjectLeader() {
-      let projectLeader = this.$route.query.userId;
-      getListByProjectLeader({ projectLeader: projectLeader }).then(res => {
-        this.tableData = res.data
+      this.queryParams.projectLeader = this.$route.query.userId;
+      listProject(this.queryParams).then(res => {
+        this.tableData = res.rows
+        this.total = res.total
       });
     }
   }