项目台账权限

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

@@ -1,12 +1,15 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -101,6 +104,31 @@ public class SysPostController extends BaseController
         return success(deptLeader);
     }
 
+    /**
+     * 通过deptId获取是否部门负责人
+     */
+    @GetMapping("/isDeptLeader")
+    public AjaxResult getIsDeptLeader()
+    {
+        boolean isLeader = false;
+        String deptId = getLoginUser().getDeptId().toString();
+        List<Long> userIdList = new ArrayList<>();
+        if (postService.selectDeptLeaderByDeptId(deptId) != null)
+            userIdList.add(postService.selectDeptLeaderByDeptId(deptId).getUserId());
+        if (postService.selectViceDeptLeaderListByDeptId(deptId) != null)
+            for(SysUser sysUser : postService.selectViceDeptLeaderListByDeptId(deptId))
+                userIdList.add(sysUser.getUserId());
+        if (postService.selectSubLeaderByDeptId(deptId) != null)
+            userIdList.add(postService.selectSubLeaderByDeptId(deptId).getUserId());
+        if (postService.selectSubGmByDeptId(deptId) != null)
+            userIdList.add(postService.selectSubGmByDeptId(deptId).getUserId());
+        if (postService.selectBranchLeaderByDeptId(deptId) != null)
+            userIdList.add(postService.selectBranchLeaderByDeptId(deptId).getUserId());
+        if (userIdList.contains(getLoginUser().getUserId()))
+            isLeader = true;
+        return success(isLeader);
+    }
+
     /**
      * 通过deptId获取部门副主任
      */

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

@@ -139,4 +139,12 @@ public interface SysUserPostMapper
      * @return 查询部门副主任
      */
     public SysUser selectViceDeptLeaderByDeptId(String deptId);
+
+    /**
+     * 查询部门副主任列表
+     *
+     * @param
+     * @return 查询部门副主任列表
+     */
+    public List<SysUser> selectViceDeptLeaderListByDeptId(String deptId);
 }

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

@@ -195,4 +195,12 @@ public interface ISysPostService
      * @return 查询部门副主任
      */
     public SysUser selectViceDeptLeaderByDeptId(String deptId);
+
+    /**
+     * 查询部门副主任列表
+     *
+     * @param
+     * @return 查询部门副主任列表
+     */
+    public List<SysUser> selectViceDeptLeaderListByDeptId(String deptId);
 }

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

@@ -309,4 +309,15 @@ public class SysPostServiceImpl implements ISysPostService
     public SysUser selectViceDeptLeaderByDeptId(String deptId) {
         return userPostMapper.selectViceDeptLeaderByDeptId(deptId);
     }
+
+    /**
+     * 查询部门副主任列表
+     *
+     * @param
+     * @return 查询部门副主任列表
+     */
+    @Override
+    public List<SysUser> selectViceDeptLeaderListByDeptId(String deptId) {
+        return userPostMapper.selectViceDeptLeaderListByDeptId(deptId);
+    }
 }

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

@@ -184,6 +184,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where p.post_name = '副主任' limit 1
 	</select>
 
+	<select id="selectViceDeptLeaderListByDeptId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '副主任'
+	</select>
+
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>

oa-back/sql/sql.sql

@@ -964,7 +964,7 @@ insert into `sys_role_menu` values (7, 15);
 insert into `sys_role_menu` values (7, 16);
 insert into `sys_role_menu` values (7, 17);
 insert into `sys_role_menu` values (7, 19);
-insert into `sys_role_menu` values (7, 21);
+-- insert into `sys_role_menu` values (7, 21);
 insert into `sys_role_menu` values (7, 118);
 insert into `sys_role_menu` values (7, 119);
 insert into `sys_role_menu` values (7, 120);
@@ -1948,7 +1948,7 @@ INSERT INTO `cmc_project` VALUES ('1648881410631270461', '2024W11', '国网拉
 INSERT INTO `cmc_project` VALUES ('1648881410631270462', '2024W12', '第六师106团兵准园区低碳转型新增负荷配套15万千瓦项目勘察工作', 117, '0', '1', '0240', '李忠', '18487123170', '勘察', '0', 13, '114', NULL, NULL, NULL, '2024-05-06', NULL, NULL, '2024-06-04', '2024-05-17', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270463', '2024W13', '雅砻江、大渡河重要栖息地河段地形监测项目断面测量工作', 76, '0', '1', '0091', '田开迪', '13783596070', '断面', '0', 13, '111', NULL, NULL, NULL, '2024-05-10', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270464', '2024W14', '金沙江金沙水电站2024年度泥沙淤积断面及生态流量监测断面测量服务项目合同', 65, '0', '1', '0170', '李女士', '18780188294', '泥沙监测', '0', 13, '111', NULL, NULL, NULL, '2024-05-22', NULL, NULL, '2024-05-05', '2024-05-11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('1648881410631270467', '2024W15', '水口集团公司水口电站2024年大坝控制网复测服务', NULL, '0', '1', '0065', '黄云挥', '18965039555', '施工测量控制网', '0', 23, NULL, NULL, NULL, NULL, '2024-06-21', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_project` VALUES ('1648881410631270467', '2024W15', '水口集团公司水口电站2024年大坝控制网复测服务', '102', '0', '1', '0065', '黄云挥', '18965039555', '施工测量控制网', '0', 23, '113', 33, 104, NULL, '2024-06-21', NULL, '2024-06-24', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410643853314', '2023W13', '拉萨水环境项目测绘工作', 75, '0', '1', '0183', '祝仁广、刘建', '13699402077、13880783828', '地形图测绘', '0', 13, '111', NULL, NULL, NULL, '2023-04-07', NULL, NULL, '2023-04-07', '2023-06-16', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410660630529', '2023C34', '阆中抽水蓄能电站规划阶段测绘工作', 145, '0', '0', '0230', '龙宇杰、徐敬武', '15198088143、13540266919', '地形图测绘', '0', 13, '108,117', NULL, NULL, NULL, '2023-03-29', NULL, NULL, '2023-04-03', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410677407746', '2023W12', '云南昭通激光数据采集项目', 38, '0', '1', '0259', '宁瑶', '', '激光扫描', '0', 13, '108', NULL, NULL, NULL, '2023-03-24', NULL, NULL, '2023-03-24', '2023-03-26', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -8785,6 +8785,11 @@ INSERT INTO `cmc_sub_contract` VALUES ('1648881410460945903', '青海黄河玛
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410462503511', '江油抽水蓄能电站预可阶段测绘项目技术劳务协议', 125254.00, '0184', NULL, NULL, 35, '2021-10-08', NULL, NULL, '2021-10-08', NULL, NULL, '2', NULL, NULL, '2021-10-08');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410465032714', '昭化区林权权籍补充调查项目技术服务协议', 2076800.00, '0094', NULL, NULL, 35, '2022-09-15', NULL, NULL, '2022-09-15', NULL, NULL, '2', NULL, NULL, '2022-09-15');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410465949634', '第六师106团兵准园区低碳转型新增负荷配套15万千瓦项目工程勘察工作检测协议', 21200.00, '0168', NULL, NULL, 35, '2024-06-19', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-06-19');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410401840031', '仪陇县林权数据整合建库采购项目数据入库技术服务合同', 50000.00, '0187', NULL, NULL, 33, '2024-06-24', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-06-24');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410401840032', '佛山国家高新区东部现代物流产业集聚区南海片区基础设施建设项目（佛山国家高新区东部现代物流产业集聚区南', 75000.00, '0040', NULL, NULL, 35, '2024-06-25', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-06-25');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410401840033', '佛山国家高新区东部现代物流产业集聚区南海片区基础设施建设项目（佛山国家高新区东部现代物流产业集聚区南', 119338.20, '0040', NULL, NULL, 35, '2024-06-25', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-06-25');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410401840034', '南海区桂澜路北延线工程一期（里水段）项目劳务合作协议', 0.00, '0040', NULL, NULL, 35, '2024-06-25', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-06-25');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410401840035', '南海区桂澜路北延线工程二期（里水段）项目劳务合作协议', 0.00, '0040', NULL, NULL, 35, '2024-06-25', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-06-25');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410469177171', '测绘成果质量检验数据采集委托协议补充协议', 65000.00, '0017', NULL, NULL, 35, '2022-10-27', NULL, NULL, '2022-10-27', NULL, NULL, '2', NULL, NULL, '2022-10-27');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410469691518', '叶巴滩混蓄预可研阶段无人机正射摄影采集项目劳务协议', 25000.00, '0032', NULL, NULL, 35, '2021-09-16', NULL, NULL, '2021-09-17', NULL, NULL, '2', NULL, NULL, '2021-09-17');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410474468560', '文殊坊周边环境综合提升工程测绘项目技术服务协议', 57590.00, '0025', NULL, NULL, 35, '2022-07-11', NULL, NULL, '2022-07-11', NULL, NULL, '2', NULL, NULL, '2022-07-11');
@@ -12594,6 +12599,7 @@ INSERT INTO `cmc_project_sub_contract` VALUES ('1648881419619663874', '164888141
 INSERT INTO `cmc_project_sub_contract` VALUES ('1648881419619663874', '1648881410320071921');
 INSERT INTO `cmc_project_sub_contract` VALUES ('1648881419619663874', '1648881410830963895');
 INSERT INTO `cmc_project_sub_contract` VALUES ('1648881410631270462', '1648881410465949634');
+INSERT INTO `cmc_project_sub_contract` VALUES ('1648881412040556545', '1648881410401840031');
 
 -- ----------------------------
 -- 70、cmc安全汇报表

oa-ui/src/api/system/post.js

@@ -58,6 +58,13 @@ export function delPost(postId) {
   })
 }
 
+// 通过deptId获取是否部门负责人
+export function getIsDeptLeader() {
+  return request({
+    url: '/system/post/isDeptLeader',
+    method: 'get'
+  })
+}
 
 // 查询当前用户的部门负责人
 export function getUsersDeptLeader(query) {

oa-ui/src/views/oa/project/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-18 14:13:03
+ * @LastEditTime: 2024-06-25 14:50:36
 -->
 <template>
   <div class="project-wrapper">
@@ -14,8 +14,7 @@
             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable
-            @keyup.enter.native="handleQuery" />
+          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="项目负责人" prop="projectLeader">
           <el-select v-model="queryParams.projectLeader" clearable filterable placeholder="请输入项目负责人" size="large"
@@ -98,7 +97,8 @@
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" />
         <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.projectLevel ? (scope.row.projectLevel === '0' ? 'info' : 'danger') : 'info'" disable-transitions>
+            <el-tag :type="scope.row.projectLevel ? (scope.row.projectLevel === '0' ? 'info' : 'danger') : 'info'"
+              disable-transitions>
               {{ scope.row.projectLevel ? (scope.row.projectLevel == '0' ? '一般项目' : '重大项目') : '一般项目' }}
             </el-tag>
           </template>
@@ -129,7 +129,7 @@
         <el-form-item label="项目负责人：" prop="projectLeader">
           <el-tag effect="plain" type="warning" style="margin-right: 10px;"
             v-if="addForm.projectLeaderName != undefined">{{
-        addForm.projectLeaderName }}</el-tag>
+              addForm.projectLeaderName }}</el-tag>
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
         </el-form-item>
         <el-form-item label="项目类型：" prop="projectType">
@@ -243,9 +243,10 @@ import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projec
 import { listDept } from '@/api/system/dept';
 import { listUser, getUser } from '@/api/system/user';
 import { mapGetters } from 'vuex';
+import { getIsDeptLeader } from '@/api/system/post.js'
 export default {
   computed: {
-    ...mapGetters(['deptId'])
+    ...mapGetters(['deptId', 'userId'])
   },
   data() {
     return {
@@ -295,28 +296,30 @@ export default {
     // 查询项目列表
     getList() {
       this.loading = true
-      if (this.deptId > 107) {
-        this.queryParams.undertakingDept = this.deptId
-      }
-      listProject(this.queryParams).then(response => {
-        this.projectList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        for (let project of this.projectList) {
-          getProjectProgress(project.projectId).then(res => {
-            if (res.data) {
-              let len = res.data.length
-              if (len != 0) {
-                this.$set(project, 'percentage', Number(res.data[len - 1].percentage))
-              } else {
-                this.$set(project, 'percentage', 0)
-              }
-              if(project.isFinished == '1'){
-                this.$set(project, 'percentage', 100)
-              }
-            }
-          })
+      getIsDeptLeader({ deptId: this.deptId }).then(res => {
+        if (this.deptId > 107 && res.data == false) {
+          this.queryParams.undertakingDept = this.deptId
         }
+        listProject(this.queryParams).then(response => {
+          this.projectList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+          for (let project of this.projectList) {
+            getProjectProgress(project.projectId).then(res => {
+              if (res.data) {
+                let len = res.data.length
+                if (len != 0) {
+                  this.$set(project, 'percentage', Number(res.data[len - 1].percentage))
+                } else {
+                  this.$set(project, 'percentage', 0)
+                }
+                if (project.isFinished == '1') {
+                  this.$set(project, 'percentage', 100)
+                }
+              }
+            })
+          }
+        })
       })
     },
     getDeptList() {