Skip to content

L
long-tern-care-service
Commit 3282f588 authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

新增评定人员信息详情接口

parent 363d0e99
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 33 deletions
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/AprEmpInfoVO.java 0 → 100644
View file @ 3282f588
package com.hungraim.ltc.pojo.vo.governance;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
import lombok.Data;
import java.util.List;
/**
* 评定人员信息详情VO
*/
@Data
public class AprEmpInfoVO extends ChAprEmp {
private List<ChFndAttach> fileDataList;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/AprOrganInfoVO.java
View file @ 3282f588
......@@ -7,7 +7,7 @@ import lombok.Data;
import java.util.List;
/**
* 评定人员信息详情VO
* 评定机构信息详情VO
*/
@Data
public class AprOrganInfoVO extends ChAprOrgan {
......
governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java
View file @ 3282f588
......@@ -2,12 +2,11 @@ package com.hungraim.ltc.governance.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.governance.service.AprOrganService;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
import com.hungraim.ltc.pojo.vo.governance.AprEmpInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
......@@ -220,26 +219,25 @@ public class AprOrganController {
}
/**
* 查询评定人员附件列表
* 获取评定机构人员信息
*
* @param empId 评定人员id
* @param aprEmpId 评定机构人员id
* @return 返回相关信息
*/
@RequestMapping("/empFileList")
public Result<List<ChFndAttach>> empFileList(Long empId) {
Result<List<ChFndAttach>> listResult = aprOrganService.empFileList(empId);
if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
return Result.failed("请求获取附件列表错误：错误码{" + listResult.getCode() + "},错误信息:{" + listResult.getMsg() + "}");
@GetMapping("/getAprEmpInfo")
public Result<AprEmpInfoVO> getAprEmpInfo(Long aprEmpId) {
if (null == aprEmpId) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
return listResult;
AprEmpInfoVO aprEmpInfoVO = aprOrganService.getAprEmpInfo(aprEmpId);
return Result.success(aprEmpInfoVO);
}
/**
* 新增评定机构人员或更新评定机构人员信息(有emp_id就更新,没有就新增)
*
* @param fileDataList 附件
*/
@DeleteMapping("/addOrUpdateAprEmp")
public Result addOrUpdateAprEmp(List<ChFndAttach> fileDataList, ChAprEmp chAprEmp) {
public Result addOrUpdateAprEmp(AprEmpInfoVO chAprEmp) {
if (chAprEmp == null) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
......@@ -290,7 +288,7 @@ public class AprOrganController {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
}
aprOrganService.addOrUpdateAprEmp(fileDataList, chAprEmp);
aprOrganService.addOrUpdateAprEmp(chAprEmp);
return Result.success();
}
......
governance/src/main/java/com/hungraim/ltc/governance/service/AprOrganService.java
View file @ 3282f588
package com.hungraim.ltc.governance.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
import com.hungraim.ltc.pojo.vo.governance.AprEmpInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
import com.hungraim.ltc.util.Result;
import org.springframework.stereotype.Service;
import java.util.List;
......@@ -36,13 +34,13 @@ public interface AprOrganService {
Page<AprEmpVO> aprEmpList(Page<AprEmpVO> page, Long organId, Boolean isIncluded, String organName, String realName, String tel, String certiCode, String isLock, String empType);
void addOrUpdateAprEmp(List<ChFndAttach> fileDataList, ChAprEmp chAprEmp);
void addOrUpdateAprEmp(AprEmpInfoVO chAprEmp);
List<ChCfgAprempType> cfgAprEmpType(String parAprempTypeId);
List<ChFndEducation> fndEducation();
Result<List<ChFndAttach>> empFileList(Long empId);
void updateAprEmpStatus(String empId, Integer isLock);
AprEmpInfoVO getAprEmpInfo(Long aprEmpId);
}
governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java
View file @ 3282f588
......@@ -13,6 +13,7 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
import com.hungraim.ltc.pojo.vo.governance.AprEmpInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
......@@ -149,7 +150,7 @@ public class AprOrganServiceImpl implements AprOrganService {
@Transactional(rollbackFor = Exception.class)
@Override
public void addOrUpdateAprEmp(List<ChFndAttach> fileDataList, ChAprEmp chAprEmp) {
public void addOrUpdateAprEmp(AprEmpInfoVO chAprEmp) {
if (chAprEmp.getEmpId() == null) {
//新增
chAprEmp.setEffTime(new Date());
......@@ -164,7 +165,7 @@ public class AprOrganServiceImpl implements AprOrganService {
aprEmpMapper.updateById(aprEmp);
chAprEmp.setEmpId(aprEmp.getEmpId());
}
updateAttachs(fileDataList, chAprEmp.getEmpId().longValue(), AttachType.APR_EMP.getUploadType());
updateAttachs(chAprEmp.getFileDataList(), chAprEmp.getEmpId().longValue(), AttachType.APR_EMP.getUploadType());
}
@Override
......@@ -186,11 +187,20 @@ public class AprOrganServiceImpl implements AprOrganService {
}
@Override
public Result<List<ChFndAttach>> empFileList(Long empId) {
public void updateAprEmpStatus(String empId, Integer isLock) {
ChAprEmp chAprEmp = aprEmpMapper.selectById(empId);
chAprEmp.setIsLock(isLock);
aprEmpMapper.updateById(chAprEmp);
}
@Override
public AprEmpInfoVO getAprEmpInfo(Long aprEmpId) {
ChAprEmp chAprEmp = aprEmpMapper.selectById(aprEmpId);
//查询附件列表
Result<List<ChFndAttach>> listResult = null;
try {
// 返回对应的附件列表
listResult = attachFeignService.selectAttachs(empId, AttachType.APR_EMP.getUploadType());
listResult = attachFeignService.selectAttachs(aprEmpId, AttachType.APR_EMP.getUploadType());
if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
}
......@@ -198,14 +208,10 @@ public class AprOrganServiceImpl implements AprOrganService {
log.error(e.getMessage());
e.printStackTrace();
}
return listResult;
}
@Override
public void updateAprEmpStatus(String empId, Integer isLock) {
ChAprEmp chAprEmp = aprEmpMapper.selectById(empId);
chAprEmp.setIsLock(isLock);
aprEmpMapper.updateById(chAprEmp);
AprEmpInfoVO aprEmpInfoVO = new AprEmpInfoVO();
BeanUtils.copyProperties(chAprEmp, aprEmpInfoVO);
aprEmpInfoVO.setFileDataList(listResult.getData());
return aprEmpInfoVO;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment