勘察项目查询

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

@@ -63,22 +63,11 @@ public class CmcProjectController extends BaseController
     public TableDataInfo list(CmcProject cmcProject)
     {
         startPage();
-        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
-        for (CmcProject project : list) {
-            project.setUndertakingDeptName(deptIdToName(project));
-            project.setQualityInspectorName(inspectorIdToName(project));
-        }
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询cmc项目列表
-     */
-    @GetMapping("/listInvest")
-    public TableDataInfo listInvest(CmcProject cmcProject)
-    {
-        startPage();
-        List<CmcProject> list = cmcProjectService.selectCmcInvestProjectList(cmcProject);
+        List<CmcProject> list = new ArrayList<>();
+        if (cmcProject.getUndertakingDept() != null && cmcProject.getUndertakingDept().equals("113"))
+            list = cmcProjectService.selectCmcInvestProjectList(cmcProject);
+        else
+            list = cmcProjectService.selectCmcProjectList(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));
@@ -93,7 +82,11 @@ public class CmcProjectController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcProject cmcProject)
     {
-        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        List<CmcProject> list = new ArrayList<>();
+        if (cmcProject.getUndertakingDept() != null && cmcProject.getUndertakingDept().equals("113"))
+            list = cmcProjectService.selectCmcInvestProjectList(cmcProject);
+        else
+            list = cmcProjectService.selectCmcProjectList(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));

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

@@ -160,6 +160,7 @@
             <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
             <if test="projectLevel != null  and projectLevel != ''"> and p.project_level = #{projectLevel}</if>
             <if test="projectRegistrant != null "> and p.project_registrant = #{projectRegistrant}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept like concat('%', #{undertakingDept}, '%')</if>
             <if test="projectPlanner != null "> and p.project_planner = #{projectPlanner}</if>
             <if test="siteLeader != null "> and p.site_leader = #{siteLeader}</if>
             <if test="planTime != null "> and p.plan_time = #{planTime}</if>

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-01-30 16:37:46
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-20 16:36:46
+ * @LastEditTime: 2024-09-20 17:09:29
  */
 import request from '@/utils/request'
 
@@ -15,15 +15,6 @@ export function listProject(query) {
   })
 }
 
-// 查询cmc勘察项目列表
-export function listInvestProject(query) {
-  return request({
-    url: '/oa/project/listInvest',
-    method: 'get',
-    params: query
-  })
-}
-
 // 查询cmc项目详细
 export function getProject(projectId) {
   return request({

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-20 16:55:07
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-20 17:11:35
 -->
 <template>
   <div class="project-wrapper">
@@ -243,7 +243,7 @@
 </template>
 
 <script>
-import { listInvestProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
 import { listDept } from '@/api/system/dept';
 import { listUser, getUser } from '@/api/system/user';
@@ -269,6 +269,7 @@ export default {
         projectNumber: '',
         projectLeader: undefined,
         projectName: '',
+        undertakingDept: '113'
       },
       projectList: [],
       total: 0,
@@ -313,7 +314,7 @@ export default {
           this.queryParams.undertakingDept = this.deptId
         }
       }
-      listInvestProject(this.queryParams).then(response => {
+      listProject(this.queryParams).then(response => {
         this.projectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -484,6 +485,7 @@ export default {
     },
     handleExport() {
       this.queryParams.pageSize = 99999
+      this.queryParams.undertakingDept = '113'
       this.download('oa/project/export', {
         ...this.queryParams
       }, `project_${new Date().getTime()}.xlsx`).then(() => {