diff --git a/jwtech-pc-page/src/api/home.js b/jwtech-pc-page/src/api/home.js index 0ae522cb..8dfcdaed 100644 --- a/jwtech-pc-page/src/api/home.js +++ b/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', + }) +} + diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/personnelBasicList.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/personnelBasicList.vue index 53370af6..605b9ea2 100644 --- a/jwtech-pc-page/src/views/enterpriseInformation/components/personnelBasicList.vue +++ b/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 } }); } diff --git a/jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue b/jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue index bf323bb8..85a10511 100644 --- a/jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue +++ b/jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue @@ -34,25 +34,30 @@ {{ item.val }} --> - 1 - - - 2 + {{ personInfo.name }} + + + - 3 + {{ personInfo.name }} + - 4 + {{ personInfo.professionalPost }} + - 5 + {{ personInfo.job }} + - 6 + {{ personInfo.jobSpecialty }} + - 7 + {{ personInfo.commencementYear }} + @@ -63,22 +68,22 @@ 执业资格信息或岗位信息 - + @@ -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: {} }; diff --git a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdPersonnelInfoController.java b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdPersonnelInfoController.java index b6d4864d..cdfb2d5f 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdPersonnelInfoController.java +++ b/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(); + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + lw.eq(BsSgcYxjdPersonnelInfo::getIdNo,id); + if (StringUtils.isNotBlank(enterpriseId)&&!enterpriseId.equals("null")) { + lw.eq(BsSgcYxjdPersonnelInfo::getEnterpriseId, enterpriseId); + }else { + List list = bsSgcYxjdPersonnelInfoService.list(lw); + for (BsSgcYxjdPersonnelInfo person:list){ + LambdaQueryWrapperenLw=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 list = bsSgcYxjdPersonnelInfoService.list(lw); + if (CollectionUtil.isNotEmpty(list)){ + bsSgcYxjdPersonnelInfo = list.get(0); + LambdaQueryWrapperenLw=new LambdaQueryWrapper<>(); + enLw.eq(BsSgcYxjdEnterpriseInfo::getId,enterpriseId); + BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo = bsSgcYxjdEnterpriseInfoMapper.selectOne(enLw); + if (ObjectUtils.isNotEmpty(bsSgcYxjdEnterpriseInfo)){ + bsSgcYxjdPersonnelInfo.setEnterpriseName(bsSgcYxjdEnterpriseInfo.getEnterpriseName()); + } + } + return AjaxResult.success(bsSgcYxjdPersonnelInfo); + } + /** * 新增人员基本信息 */