人员信息列表可查看证书

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

@@ -74,7 +74,11 @@ public class CmcProjectController extends BaseController
     public TableDataInfo list(CmcProject cmcProject)
     {
         startPage();
-        List<CmcProject> list = cmcProjectService.selectCmcAllProjectList(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));
@@ -86,10 +90,10 @@ public class CmcProjectController extends BaseController
      * 模糊查询cmc项目列表
      */
     @GetMapping("/listFuzzy")
-    public TableDataInfo listFuzzy(String queryString)
+    public TableDataInfo listFuzzy(CmcProject cmcProject)
     {
         startPage();
-        List<CmcProject> list = cmcProjectService.selectCmcProjectListFuzzy(queryString);
+        List<CmcProject> list = cmcProjectService.selectCmcProjectListFuzzy(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -194,6 +194,9 @@ public class CmcProject extends BaseEntity
     /** 参与部门 */
     private String joinDept;
 
+    /** 查询字符 */
+    private String queryString;
+
     private SysUser projectLeaderUser;
 
     private SysUser technicalDirectorUser;
@@ -641,6 +644,14 @@ public class CmcProject extends BaseEntity
     {
         return contract;
     }
+    public void setQueryString(String queryString)
+    {
+        this.queryString = queryString;
+    }
+    public String getQueryString()
+    {
+        return queryString;
+    }
 
     @Override
     public String toString() {

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

@@ -38,10 +38,10 @@ public interface CmcProjectMapper
     /**
      * 模糊查询cmc测绘项目列表
      *
-     * @param queryString 查询字符
+     * @param cmcProject cmc项目
      * @return cmc项目集合
      */
-    public List<CmcProject> selectCmcProjectListFuzzy(String queryString);
+    public List<CmcProject> selectCmcProjectListFuzzy(CmcProject cmcProject);
 
     /**
      * 查询cmc勘察项目列表

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

@@ -39,10 +39,10 @@ public interface ICmcProjectService
     /**
      * 模糊查询cmc测绘项目列表
      *
-     * @param queryString 查询字符
+     * @param cmcProject cmc项目
      * @return cmc项目集合
      */
-    public List<CmcProject> selectCmcProjectListFuzzy(String queryString);
+    public List<CmcProject> selectCmcProjectListFuzzy(CmcProject cmcProject);
 
     /**
      * 查询cmc勘察项目列表

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

@@ -61,12 +61,12 @@ public class CmcProjectServiceImpl implements ICmcProjectService
     /**
      * 模糊查询cmc测绘项目列表
      *
-     * @param queryString 查询字符
+     * @param cmcProject cmc项目
      * @return cmc项目集合
      */
-    public List<CmcProject> selectCmcProjectListFuzzy(String queryString)
+    public List<CmcProject> selectCmcProjectListFuzzy(CmcProject cmcProject)
     {
-        return cmcProjectMapper.selectCmcProjectListFuzzy(queryString);
+        return cmcProjectMapper.selectCmcProjectListFuzzy(cmcProject);
     }
 
     /**

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

@@ -146,7 +146,7 @@
         order by p.register_time desc, p.project_number desc
     </select>
 
-    <select id="selectCmcProjectListFuzzy" parameterType="String" resultMap="CmcProjectResult">
+    <select id="selectCmcProjectListFuzzy" 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 NOT (p.project_number REGEXP '[/\\*-]')
@@ -154,7 +154,30 @@
             when p.undertaking_dept is null then p.undertaking_dept is null
             when p.undertaking_dept like concat('%', '113', '%') then p.undertaking_dept like concat('%', ',', '%')
             end)
-            and concat(p.project_number, p.project_name, pa.party_a_name, p.contact_person, p.telephone) like concat('%', #{param}, '%')
+            and (pa.party_a_name like concat('%', #{queryString}, '%') or
+            p.contact_person like concat('%', #{queryString}, '%') or
+            p.telephone like concat('%', #{queryString}, '%') or
+            p.project_type like concat('%', #{queryString}, '%'))
+            <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>
+            <if test="projectLeader != null "> and p.project_leader = #{projectLeader}</if>
+            <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>
+            <if test="isComplete != null  and isComplete != ''"> and p.is_complete = #{isComplete}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="partyAId != null  and partyAId != ''"> and p.party_a_id = #{partyAId}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and p.contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and p.telephone = #{telephone}</if>
+            <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>
+            <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>
         group by p.project_id
         order by p.register_time desc, p.project_number desc

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

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2024-01-30 16:37:46
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-14 16:50:24
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-12-09 17:36:56
  */
 import request from '@/utils/request'
 
@@ -15,6 +15,15 @@ export function listProject(query) {
   })
 }
 
+// 模糊查询项目管理列表
+export function listProjectFuzzy(query) {
+  return request({
+    url: '/oa/project/listFuzzy',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询cmc项目详细
 export function getProject(projectId) {
   return request({

oa-ui/src/utils/ruoyi.js

@@ -70,7 +70,7 @@ export function addDateRange(params, dateRange, propName) {
 
 // 回显数据字典
 export function selectDictLabel(datas, value) {
-  if (value === undefined) {
+  if (value === undefined || value === null) {
     return "";
   }
   var actions = [];
@@ -88,7 +88,8 @@ export function selectDictLabel(datas, value) {
 
 // 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined || value.length === 0) {
+  console.log(value);
+  if (value === undefined || value === null || value.length === 0) {
     return "";
   }
   if (Array.isArray(value)) {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-09 16:25:24
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-12-09 17:42:50
 -->
 <template>
   <div class="project-wrapper">
@@ -19,7 +19,7 @@
         </el-form-item>
         <el-form-item label="项目负责人" prop="projectLeader">
           <el-select v-model="queryParams.projectLeader" clearable filterable placeholder="请输入项目负责人" size="large"
-            style="width: 240px" @keyup.enter.native="handleQuery">
+            style="width: 160px" @keyup.enter.native="handleQuery">
             <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
           </el-select>
         </el-form-item>
@@ -30,6 +30,10 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="其他关键字" prop="queryString">
+          <el-input v-model="queryParams.queryString" placeholder="请输入关键字" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
         <!-- <el-form-item label="状态" prop="isFinished">
           <el-select v-model="queryParams.isFinished" clearable>
             <el-option label="进行中" value="0"></el-option>
@@ -250,7 +254,7 @@
 </template>
 
 <script>
-import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { listProject, listProjectFuzzy, 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';
@@ -276,6 +280,7 @@ export default {
         projectNumber: '',
         projectLeader: undefined,
         projectName: '',
+        queryString: undefined,
       },
       projectList: [],
       total: 0,
@@ -320,26 +325,50 @@ export default {
           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 (this.queryParams.queryString == '' || this.queryParams.queryString == undefined || this.queryParams.queryString == null) {
+        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)
+                }
               }
-              if (project.isFinished == '1') {
-                this.$set(project, 'percentage', 100)
+            })
+          }
+        })
+      }
+      else {
+        listProjectFuzzy(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() {
       listDept({

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

@@ -23,12 +23,12 @@
             <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="isFinished">
+        <!-- <el-form-item label="状态" prop="isFinished">
           <el-select v-model="queryParams.isFinished" clearable>
             <el-option label="进行中" value="0"></el-option>
             <el-option label="已结束" value="1"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         </el-form-item>

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

@@ -113,7 +113,9 @@
             <template slot-scope="scope">
               {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
             </template>
-          </el-table-column>
+          </el-table-column>          
+          <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[18].visible"
+          :formatter="formatterCertificates" />
           <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
             v-if="columns[10].visible" sortable="custom" />
           <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
@@ -440,6 +442,7 @@ export default {
         { key: 15, label: `民族`, visible: false },
         { key: 16, label: `入职时间`, visible: true },
         { key: 17, label: `职务`, visible: false },
+        { key: 18, label: `执业证书`, visible: false },
       ],
       // 表单校验
       rules: {
@@ -892,6 +895,10 @@ export default {
       let v = this.selectDictLabels(this.dict.type.sys_user_political, row.politicalAffiliation, ',')
       return v
     },
+    formatterCertificates(row) {
+      let v = this.selectDictLabels(this.dict.type.sys_user_certificates, row.certificates, ',')
+      return v
+    },
     async getPostByUser(row) {
       const userId = row.userId || this.ids;
       let resData = await getUser(userId);