Commit 21ccf6c1 authored by huyuchen's avatar huyuchen

假勤管理修改

parent 2a8e6d99
...@@ -221,8 +221,8 @@ public class EmployeeBusinessController { ...@@ -221,8 +221,8 @@ public class EmployeeBusinessController {
* @date: 2021/8/17 * @date: 2021/8/17
*/ */
@Inner @Inner
@GetMapping("/inner/getNotLeaveExtendList") @PostMapping("/inner/getNotLeaveExtendList")
public R<List<BusinessEmployeeExtendVO>> getNotLeaveExtendList() { public TBusinessDataListVo getNotLeaveExtendList() {
return this.businessEmployeeExtendInfoService.getNotLeaveExtendList(); return this.businessEmployeeExtendInfoService.getNotLeaveExtendList();
} }
...@@ -308,8 +308,8 @@ public class EmployeeBusinessController { ...@@ -308,8 +308,8 @@ public class EmployeeBusinessController {
*/ */
@Inner @Inner
@PostMapping("/inner/getAllExtendList") @PostMapping("/inner/getAllExtendList")
public TSettleDomainListVo getAllExtendList() { public TBusinessDataListVo getAllExtendList() {
TSettleDomainListVo vo = new TSettleDomainListVo(); TBusinessDataListVo vo = new TBusinessDataListVo();
List<TBusinessEmployeeExtendInfo> list = this.businessEmployeeExtendInfoService.list(); List<TBusinessEmployeeExtendInfo> list = this.businessEmployeeExtendInfoService.list();
vo.setExtendInfo(list); vo.setExtendInfo(list);
return vo; return vo;
...@@ -323,12 +323,11 @@ public class EmployeeBusinessController { ...@@ -323,12 +323,11 @@ public class EmployeeBusinessController {
*/ */
@Inner @Inner
@PostMapping("/inner/getExtendByBusinessTelecomNumber") @PostMapping("/inner/getExtendByBusinessTelecomNumber")
R<TBusinessEmployeeExtendInfo> getExtendByBusinessTelecomNumber(@RequestParam("businessTelecomNumber") String businessTelecomNumber) { public TBusinessEmployeeExtendInfo getExtendByBusinessTelecomNumber(@RequestBody String businessTelecomNumber) {
TBusinessEmployeeExtendInfo businessEmployeeExtendInfo = this.businessEmployeeExtendInfoService.lambdaQuery() return this.businessEmployeeExtendInfoService.lambdaQuery()
.eq(TBusinessEmployeeExtendInfo::getBusinessTelecomNumber, businessTelecomNumber) .eq(TBusinessEmployeeExtendInfo::getBusinessTelecomNumber, businessTelecomNumber)
.last(CommonConstants.LAST_ONE_SQL) .last(CommonConstants.LAST_ONE_SQL)
.one(); .one();
return R.ok(businessEmployeeExtendInfo,CommonConstants.SEARCH_SUCCESS);
} }
/** /**
...@@ -427,7 +426,7 @@ public class EmployeeBusinessController { ...@@ -427,7 +426,7 @@ public class EmployeeBusinessController {
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrms.api.entity.basic.TBusinessEmployeeExtendInfo> * @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrms.api.entity.basic.TBusinessEmployeeExtendInfo>
**/ **/
@Operation(description = "根据电信编号,获取附属信息") @Operation(description = "根据电信编号,获取附属信息")
@GetMapping("/getByBusinessTelecomNumber") @PostMapping("/getByBusinessTelecomNumber")
public R<TBusinessEmployeeExtendInfo> getByBusinessTelecomNumber(@RequestParam String businessTelecomNumber) { public R<TBusinessEmployeeExtendInfo> getByBusinessTelecomNumber(@RequestParam String businessTelecomNumber) {
return new R<>(businessEmployeeExtendInfoService.getByBusinessTelecomNumber(businessTelecomNumber)); return new R<>(businessEmployeeExtendInfoService.getByBusinessTelecomNumber(businessTelecomNumber));
} }
......
...@@ -3,10 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.archives.service; ...@@ -3,10 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendByLeave; import com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendByLeave;
import com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendVO; import com.yifu.cloud.plus.v1.yifu.archives.vo.TBusinessDataListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmployeeExtendRedundancyDTO; import com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmployeeExtendRedundancyDTO;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...@@ -76,7 +75,7 @@ public interface TBusinessEmployeeExtendInfoService extends IService<TBusinessEm ...@@ -76,7 +75,7 @@ public interface TBusinessEmployeeExtendInfoService extends IService<TBusinessEm
* @author: wangweiguo * @author: wangweiguo
* @date: 2021/8/17 * @date: 2021/8/17
*/ */
R<List<BusinessEmployeeExtendVO>> getNotLeaveExtendList(); TBusinessDataListVo getNotLeaveExtendList();
/** /**
* @param * @param
......
...@@ -14,10 +14,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo; ...@@ -14,10 +14,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TBusinessEmployeeExtendInfoMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TBusinessEmployeeExtendInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TBusinessEmployeeExtendInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TBusinessEmployeeExtendInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendByLeave; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateBusinessEmployeeExtendDTO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmployeeExtendRedundancyDTO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...@@ -357,9 +354,11 @@ implements TBusinessEmployeeExtendInfoService { ...@@ -357,9 +354,11 @@ implements TBusinessEmployeeExtendInfoService {
* @date: 2021/8/17 * @date: 2021/8/17
*/ */
@Override @Override
public R<List<BusinessEmployeeExtendVO>> getNotLeaveExtendList() { public TBusinessDataListVo getNotLeaveExtendList() {
List<BusinessEmployeeExtendVO> list = this.baseMapper.getNotLeaveExtendList(); List<BusinessEmployeeExtendVO> list = this.baseMapper.getNotLeaveExtendList();
return R.ok(list); TBusinessDataListVo vo = new TBusinessDataListVo();
vo.setExtendVO(list);
return vo;
} }
/** /**
......
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