From d67c2d80717422c302e2b7a743b3a42b7c9845f9 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Sun, 10 Nov 2024 17:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysDepartController.java       |   9 +-
 .../system/controller/SysUserController.java  |  21 +-
 .../views/declarantUnit/declarantUnitList.vue |   4 +-
 .../views/declarantUnit/depart.user.data.ts   |  10 +-
 .../project/ProjectList.vue                   | 448 ++++++++++--------
 5 files changed, 277 insertions(+), 215 deletions(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index 384ecc6..9880192 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -151,7 +151,7 @@ public class SysDepartController {
 	/**
 	 * @description: 根据当前登录角色查询 下级部门数据
 	 * @param: [parentId, ids, primaryKey]
-	 * @return: org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.system.model.SysDepartTreeModel>>
+	 * @return: org.jeecg.common.api.vo.Result<java.util.List < org.jeecg.modules.system.model.SysDepartTreeModel>>
 	 * @author: z.h.c
 	 * @date: 24/11/9 16:07
 	 */
@@ -174,7 +174,7 @@ public class SysDepartController {
 	/**
 	 * @description: 法人注册时，只显示市和县区科技局，不显示下属单位
 	 * @param: [parentId, ids, primaryKey]
-	 * @return: org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.system.model.SysDepartTreeModel>>
+	 * @return: org.jeecg.common.api.vo.Result<java.util.List < org.jeecg.modules.system.model.SysDepartTreeModel>>
 	 * @author: z.h.c
 	 * @date: 24/11/9 16:07
 	 */
@@ -244,8 +244,11 @@ public class SysDepartController {
 		//单位法人角色时，只查询自己部门
 		if ("faren_admin".equals(user.getRoleCode())) {
 			queryWrapper.eq("id", user.getOrgId());
-		} else { // 查询下级部门
+		} else if ("quxian_admin".equals(user.getRoleCode())) {
 			queryWrapper.eq("parent_id", user.getOrgId());
+		} else if ("kejiju_admin".equals(user.getRoleCode())) {// 查询所有法人级部门
+			queryWrapper.ne("depart_name_abbr","null");
+			queryWrapper.ne("depart_name_abbr","");
 		}
 		return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo);
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 6d14a6e..1c2c097 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -166,7 +165,7 @@ public class SysUserController {
     /**
      * @description: 根据用户角色查询下属用户
      * @param: [user, pageNo, pageSize, req]
-     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.system.entity.SysUser>>
+     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage < org.jeecg.modules.system.entity.SysUser>>
      * @author: z.h.c
      * @date: 24/11/8 15:19
      */
@@ -194,19 +193,15 @@ public class SysUserController {
     public Result<IPage<SysUser>> getDeclarantList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        user.setUserType("shenbaoren");
         String roleCode = loginUser.getRoleCode();
-        List<String> userIds = new LinkedList<>();
+//        List<String> userIds = new LinkedList<>();
         //申报人是只查询自己
-        if (StringUtils.equals(roleCode, "shenbaoren_role")) {
-            userIds.add(loginUser.getId());
-        } else if (StringUtils.equals(roleCode, "faren_admin")) {
-            List<SysUserDepart> departList = sysUserDepartService.list(new LambdaQueryWrapper<SysUserDepart>().eq(SysUserDepart::getDepId, loginUser.getOrgId()));
-            userIds = Optional.ofNullable(departList).orElse(new LinkedList<>()).stream().map(u -> u.getUserId()).collect(Collectors.toList());
-        }
-        user.setUserType("shenbaoren");
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-        if (ObjectUtil.isNotEmpty(userIds)) {
-            queryWrapper.in("id", userIds);
+        if (StringUtils.equals(roleCode, "shenbaoren_role")) {
+            queryWrapper.eq("org_code", loginUser.getOrgCode());
+        } else {
+            queryWrapper.likeRight("org_code", loginUser.getOrgCode());
         }
         return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo);
     }
@@ -1967,7 +1962,7 @@ public class SysUserController {
 
         SysDepart depart = sysDepartService.getById(departmentid);
         //所先部门状态为0时，说明该部门注册后未通过审核，申报人此时不能选择该部门注册
-        if(StringUtils.equals(depart.getStatus(),"0")){
+        if (StringUtils.equals(depart.getStatus(), "0")) {
             throw new JeecgBootException("该单位未通过审核,暂时不能注册为该单位申报人");
         }
 
diff --git a/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue b/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
index fc51348..7670268 100644
--- a/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
+++ b/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
@@ -182,7 +182,7 @@
       // },
       {
         label: '驳回',
-        ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 1,
+        ifShow: userStore.getUserInfo.roleCode =='quxian_admin' && record.status == 1,
         popConfirm: {
           title: '确定驳回吗?',
           confirm: handleFrozen.bind(null, record, 0),
@@ -190,7 +190,7 @@
       },
       {
         label: '通过',
-        ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 0,
+        ifShow: userStore.getUserInfo.roleCode =='quxian_admin' && record.status == 0,
         popConfirm: {
           title: '确定通过吗?',
           confirm: handleFrozen.bind(null, record, 1),
diff --git a/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts b/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts
index 2bb4dde..850434c 100644
--- a/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts
+++ b/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts
@@ -15,11 +15,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'departNameAbbr',
   },
-  {
-    title: '编码',
-    align:"center",
-    dataIndex: 'orgCode'
-  },
+  /* {
+     title: '编码',
+     align:"center",
+     dataIndex: 'orgCode'
+   },*/
   {
     title: '手机号',
     align:"center",
diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
index 125428a..738a8d5 100644
--- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
@@ -4,10 +4,10 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-<!--        <a-button type="primary" @click="go_xinjianshenbao" preIcon="ant-design:plus-outlined"> 新建审报书</a-button>-->
+        <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>-->
+        <!--        <a-button type="primary" @click="go_xinjianshenbao" preIcon="ant-design:plus-outlined"> 新建申报书</a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-<!--        <j-upload-button type="primary" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+        <!--        <j-upload-button type="primary" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown>
           <template #overlay>
             <a-menu>
@@ -15,13 +15,16 @@
                 <Icon icon="ant-design:plus-outlined"></Icon>
                 科技攻关
               </a-menu-item>
+              <!--              <a-menu-item v-for="opt of RANGE_OPTIONS" :key="opt.key">
+                              {{ opt.label }}
+                            </a-menu-item>-->
               <!--<a-menu-item key="1" @click="go_xinjianshenbao">
                 <Icon icon="ant-design:plus-outlined"></Icon>
                 xxx
               </a-menu-item>-->
             </a-menu>
           </template>
-          <a-button type="primary">新建审报
+          <a-button type="primary">新建申报
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -43,203 +46,264 @@
 
 <script lang="ts" name="project-project" setup>
   import {ref, reactive, computed, unref, onMounted} from 'vue';
-import {BasicTable, useTable, TableAction} from '/@/components/Table';
-import {useModal} from '/@/components/Modal';
-import { useListPage } from '/@/hooks/system/useListPage'
-import ProjectModal from './components/ProjectModal.vue'
-import {columns, searchFormSchema, superQuerySchema} from './Project.data';
-import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './Project.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import { useGo } from '/@/hooks/web/usePage';
-
-import { useUserStore } from '/@/store/modules/user';
-import {getUserData} from "@/views/system/usersetting/UserSetting.api";
-const go = useGo();
-
-const queryParam = reactive<any>({});
-const checkedKeys = ref<Array<string | number>>([]);
-const userStore = useUserStore();
-//注册model
-const [registerModal, {openModal}] = useModal();
-//注册table数据
-const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-  tableProps:{
-    title: '项目表',
-    api: list,
-    columns,
-    canResize:false,
-    formConfig: {
-      //labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter:true,
-      showAdvancedButton:true,
-      fieldMapToNumber: [
-      ],
-      fieldMapToTime: [
-      ],
-    },
-    actionColumn: {
-      width: 280,
-      fixed:'right'
-    },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
-    },
-  },
-  exportConfig: {
-    name:"项目表",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-})
-
-const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-// 高级查询配置
-const superQueryConfig = reactive(superQuerySchema);
-
-/**
- * 高级查询事件
- */
-function handleSuperQuery(params) {
-  Object.keys(params).map((k) => {
-    queryParam[k] = params[k];
-  });
-  reload();
-}
-/**
- * 新增事件
- */
-function handleAdd() {
-  openModal(true, {
-    isUpdate: false,
-    showFooter: true,
-  });
-}
-
-//跳转到新建申报页面
-function go_xinjianshenbao() {
-  // go('/comp/jeecg/basic');
-  go('/projectApplication/index');
-}
-
-//跳转到项目书页面
-function go_xiangmushu(record) {
-  // go('/comp/jeecg/basic?id=' +'666');
-  go('/projectApplication/kejigongguan/xiangmushu?id='+record.id);
-}
-
-//跳转到预算书页面
-function go_yusuanshu(record) {
-  // go('/comp/jeecg/basic?id=' +'666');
-  go('/projectApplication/kejigongguan/xiangmushu?id='+record.id);
-}
-
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  openModal(true, {
-    record,
-    isUpdate: true,
-    showFooter: true,
-  });
-}
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  openModal(true, {
-    record,
-    isUpdate: true,
-    showFooter: false,
-  });
-}
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({id: record.id}, handleSuccess);
-}
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
-}
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-}
-/**
- * 操作栏
- */
-function getTableAction(record){
-  const actions = [
-    {
-      label: '项目书',
-      onClick: go_xiangmushu.bind(null, record),
-      // auth: 'projecttype:project_type:edit'
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ProjectModal from './components/ProjectModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './Project.data';
+  import {
+    list,
+    deleteOne,
+    rollbackOne,
+    submitOne,
+    batchDelete,
+    getImportUrl,
+    getExportUrl,
+    getProjectTypeList
+  } from './Project.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useGo } from '/@/hooks/web/usePage';
+
+  import { useUserStore } from '/@/store/modules/user';
+  import {getUserData} from "@/views/system/usersetting/UserSetting.api";
+  import {useTimeoutFn} from "@/hooks/core/useTimeout";
+  const go = useGo();
+
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+    tableProps:{
+      title: '项目表',
+      api: list,
+      columns,
+      canResize:false,
+      formConfig: {
+        //labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter:true,
+        showAdvancedButton:true,
+        fieldMapToNumber: [
+        ],
+        fieldMapToTime: [
+        ],
+      },
+      actionColumn: {
+        width: 380,
+        fixed:'right'
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
     },
-    {
-      label: '预算书',
-      onClick: go_yusuanshu.bind(null, record),
-      // auth: 'projecttype:project_type:edit'
+    exportConfig: {
+      name:"项目表",
+      url: getExportUrl,
+      params: queryParam,
     },
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess
     },
-    {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-        placement: 'topLeft',
+  })
+
+  // 日期范围选项
+  // 日期范围选项
+  const RANGE_OPTIONS = [
+    {key: 'TODAY', label: '今天'},
+    {key: 'YESTERDAY', label: '昨天'},
+    {key: 'TOMORROW', label: '明天'},
+    {key: 'THIS_WEEK', label: '本周'},
+    {key: 'LAST_WEEK', label: '上周'},
+    {key: 'NEXT_WEEK', label: '下周'},
+    {key: 'LAST_7_DAYS', label: '过去七天'},
+    {key: 'THIS_MONTH', label: '本月'},
+    {key: 'LAST_MONTH', label: '上月'},
+    {key: 'NEXT_MONTH', label: '下月'},
+  ];
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
+  }
+
+  //跳转到新建申报页面
+  function go_xinjianshenbao() {
+    // go('/comp/jeecg/basic');
+    go('/projectApplication/index?projectTypeId='+'1846744340708184065');
+  }
+
+  //跳转到项目书页面
+  function go_xiangmushu(record) {
+    // go('/comp/jeecg/basic?id=' +'666');
+    go('/projectApplication/kejigongguan/xiangmushu?id='+record.id);
+  }
+
+  //跳转到预算书页面
+  function go_yusuanshu(record) {
+    // go('/comp/jeecg/basic?id=' +'666');
+    go('/projectApplication/kejigongguan/yusuanshu?id='+record.id);
+  }
+
+  function go_projectLog(record) {
+    // go('/comp/jeecg/basic?id=' +'666');
+    go('/projectLog/projectLogList?id='+record.id);
+  }
+
+
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({id: record.id}, handleSuccess);
+  }
+
+  //取回项目
+  async function handleSubmitOne(record) {
+    await submitOne({id: record.id}, handleSuccess);
+  }
+
+  //取回项目
+  async function handleRollbackOne(record) {
+    await rollbackOne({id: record.id}, handleSuccess);
+  }
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  /**
+   * 操作栏
+   */
+  function getTableAction(record){
+    const actions = [
+      {
+        label: '项目书',
+        onClick: go_xiangmushu.bind(null, record),
+        // auth: 'projecttype:project_type:edit'
       },
-      // auth: 'projecttype:project_type:delete'
-    }];
-  //申请人待提交时，可以修改
-  if (record.projectStatus == 5) {
-       actions.unshift({
-         label: '编辑',
-         onClick: handleEdit.bind(null, record),
-       });
-     }
-  return actions;
-}
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record){
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-        placement: 'topLeft',
+      {
+        label: '预算书',
+        onClick: go_yusuanshu.bind(null, record),
+        // auth: 'projecttype:project_type:edit'
       },
-      auth: 'project:project:delete'
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '日志查询',
+        onClick: go_projectLog.bind(null, record),
+      }
+    ];
+    //申请人待提交时可以删除(只有自己能删除)
+    if (record.projectStatus == 5) {
+      actions.unshift({
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+      });
+    }
+    if (record.projectStatus == 5) {
+      actions.unshift({
+        label: '提交项目',
+        onClick: handleSubmitOne.bind(null, record),
+      });
+    }
+    //projectStatus 项目书状态
+    //('科技主管部门待提交', '1');
+    //('科技主管部门已提交', '2');
+    //('不受理', '3');
+    //('已受理', '4');
+    //('申请人待提交', '5');
+    //('申请单位待提交', '6');
+    //('市科技局待提交', '7');
+    //('市科技局已提交', '8');
+    if (record.projectStatus ==6) {
+      actions.unshift({
+        label: '取回项目',
+        onClick: handleRollbackOne.bind(null, record),
+      });
     }
-  ]
-}
+    return actions;
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record){
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        auth: 'project:project:delete'
+      }
+    ]
+  }
 
 
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-picker),:deep(.ant-input-number){
-  width: 100%;
-}
+  :deep(.ant-picker),:deep(.ant-input-number){
+    width: 100%;
+  }
 </style>