新增

jwtech-pc-page/src/api/home.js

@@ -221,3 +221,11 @@ export function getPersonInfo(data) {
     data:data
   })
 }
+
+export function getOnePersonInfo(id,enterpriseId) {
+  return request({
+    url: '/enterprise/personInfo/idNo/'+id+"/"+enterpriseId,
+    method: 'get',
+  })
+}
+

jwtech-pc-page/src/views/enterpriseInformation/components/personnelBasicList.vue

@@ -273,7 +273,8 @@ export default {
       this.$router.push({
         path: "/personDetail",
         query: {
-          enterpriseId: row.enterpriseId
+          enterpriseId: row.enterpriseId,
+          idNo:row.idNo
         }
       });
     }

jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue

@@ -34,25 +34,30 @@
                 {{ item.val }}
               </el-descriptions-item> -->
             <el-descriptions-item label="姓名">
-              1
-            </el-descriptions-item>
-            <el-descriptions-item label="性别">
-              2
+              {{ personInfo.name }}
             </el-descriptions-item>
+<!--            <el-descriptions-item label="性别">-->
+<!--              {{ personInfo.name }}-->
+<!--            </el-descriptions-item>-->
             <el-descriptions-item label="聘用单位" :span="2">
-              3
+              {{ personInfo.name }}
+
             </el-descriptions-item>
             <el-descriptions-item label="职称">
-              4
+              {{ personInfo.professionalPost }}
+
             </el-descriptions-item>
             <el-descriptions-item label="职务">
-              5
+              {{ personInfo.job }}
+
             </el-descriptions-item>
             <el-descriptions-item label="职称专业">
-              6
+              {{ personInfo.jobSpecialty }}
+
             </el-descriptions-item>
             <el-descriptions-item label="从业开始年份">
-              7
+              {{ personInfo.commencementYear }}
+
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -63,22 +68,22 @@
               执业资格信息或岗位信息
             </span>
           </div>
-          <el-table :data="dataList" style="width: 100%">
+          <el-table :data="zsList" style="width: 100%">
             <el-table-column
-              prop="enterpriseName"
+              prop="certificateName"
               label="资格名称/岗位名称"
               width="150"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="qualificationCategory"
+              prop="certificateNo"
               label="证书编号/资格证书编号"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="professionalCategory"
+              prop="registrationCertificateNumber"
               label="注册证号"
               width="130"
               align="center"
@@ -86,28 +91,28 @@
             </el-table-column>
 
             <el-table-column
-              prop="level"
+              prop="personType"
               label="注册类型及专业"
               width="130"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="certificateNo"
+              prop="certificateSpeciality"
               label="证书专业"
               width="130"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="issuedBy"
+              prop="validityPeriod"
               label="有效期至/批准目期"
               width="150"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="issuanceDate"
+              prop="issuedBy"
               label="核发单位"
               width="150"
               align="center"
@@ -137,13 +142,13 @@
             >
             </el-table-column>
             <el-table-column
-              prop="qualificationCategory"
+              prop="enterTime"
               label="开始时间"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="professionalCategory"
+              prop="exitTime"
               label="离职时间"
               align="center"
             >
@@ -164,6 +169,10 @@ import projectAwardTable from "./components/projectAwardTable";
 import realTimeCredit from "./components/realTimeCredit";
 import actionList from "./components/actionList";
 import { enterpriseInfo } from "../../api/enterpriseInformation";
+import { personInfoList, personInfo } from "@/api/enterpriseInformation";
+
+import {getOnePersonInfo} from "../../api/home";
+
 export default {
   components: {
     descriptionsEnterpriseTable,
@@ -176,10 +185,40 @@ export default {
   },
   data() {
     return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        data: {
+          enterpriseId: null,
+          name: null,
+          idNo:null
+        }
+      },
+      dataList:[],
+      zsList:[],
+      personInfo:{},
       activeName: "qualification"
     };
   },
-  created() {},
+  created() {
+    if (this.$route.query.idNo&&this.$route.query.enterpriseId){
+      this.queryParams.data.idNo=this.$route.query.idNo
+      this.queryParams.data.enterpriseId=this.$route.query.enterpriseId
+      personInfoList(this.queryParams).then(res=>{
+        this.zsList=res.data.records
+      })
+      getOnePersonInfo(this.$route.query.idNo,this.$route.query.enterpriseId).then(res=>{
+        console.log(res.data.data,55555)
+        this.personInfo=res.data.data
+      })
+    }
+    if (this.$route.query.idNo){
+      getOnePersonInfo(this.$route.query.idNo,null).then(res=>{
+        console.log(res.data.data,55555)
+        this.dataList=res.data.data
+      })
+    }
+  },
   mounted() {},
   methods: {}
 };

jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdPersonnelInfoController.java

@@ -3,6 +3,7 @@ package com.kms.enterprise.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -164,6 +165,40 @@ public class BsSgcYxjdPersonnelInfoController extends BaseController
         return AjaxResult.success(bsSgcYxjdPersonnelInfoService.getById(id));
     }
 
+    @ApiOperation(" 人员基本信息详情")
+    @GetMapping(value = "/idNo/{id}/{enterpriseId}")
+    public AjaxResult getInfoByIdNo(@PathVariable("id") String id,@PathVariable("enterpriseId") String enterpriseId)
+    {
+        BsSgcYxjdPersonnelInfo bsSgcYxjdPersonnelInfo=new BsSgcYxjdPersonnelInfo();
+        LambdaQueryWrapper<BsSgcYxjdPersonnelInfo>lw=new LambdaQueryWrapper<>();
+        lw.eq(BsSgcYxjdPersonnelInfo::getIdNo,id);
+        if (StringUtils.isNotBlank(enterpriseId)&&!enterpriseId.equals("null")) {
+            lw.eq(BsSgcYxjdPersonnelInfo::getEnterpriseId, enterpriseId);
+        }else {
+            List<BsSgcYxjdPersonnelInfo> list = bsSgcYxjdPersonnelInfoService.list(lw);
+            for (BsSgcYxjdPersonnelInfo person:list){
+                LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>enLw=new LambdaQueryWrapper<>();
+                enLw.eq(BsSgcYxjdEnterpriseInfo::getId,person.getEnterpriseId());
+                BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo = bsSgcYxjdEnterpriseInfoMapper.selectOne(enLw);
+                if (ObjectUtils.isNotEmpty(bsSgcYxjdEnterpriseInfo)){
+                    person.setEnterpriseName(bsSgcYxjdEnterpriseInfo.getEnterpriseName());
+                }
+            }
+            return AjaxResult.success(list);
+        }
+        List<BsSgcYxjdPersonnelInfo> list = bsSgcYxjdPersonnelInfoService.list(lw);
+        if (CollectionUtil.isNotEmpty(list)){
+            bsSgcYxjdPersonnelInfo = list.get(0);
+            LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>enLw=new LambdaQueryWrapper<>();
+            enLw.eq(BsSgcYxjdEnterpriseInfo::getId,enterpriseId);
+            BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo = bsSgcYxjdEnterpriseInfoMapper.selectOne(enLw);
+            if (ObjectUtils.isNotEmpty(bsSgcYxjdEnterpriseInfo)){
+                bsSgcYxjdPersonnelInfo.setEnterpriseName(bsSgcYxjdEnterpriseInfo.getEnterpriseName());
+            }
+        }
+        return AjaxResult.success(bsSgcYxjdPersonnelInfo);
+    }
+
     /**
      * 新增人员基本信息
      */