Commit 7a471189 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2

parents 87488125 cad93bb2
...@@ -341,58 +341,6 @@ public class TEmployeeProjectController { ...@@ -341,58 +341,6 @@ public class TEmployeeProjectController {
return tEmployeeProjectService.updateEmployeeSalaryStatus(vo); return tEmployeeProjectService.updateEmployeeSalaryStatus(vo);
} }
/**
* 查询项目档案在档人数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation(summary = "查询项目档案在档人数", description = "查询项目档案在档人数")
@PostMapping("/selectInUseEmployeeProjectCount")
public R selectInUseEmployeeProjectCount(@RequestBody String deptNo) {
return tEmployeeProjectService.selectInUseEmployeeProjectCount(deptNo);
}
/**
* 查询项目员工合同在用数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation(summary = "查询项目员工合同在用数", description = "查询项目员工合同在用数")
@PostMapping("/selectInUseEmployeeContractCount")
public R selectInUseEmployeeContractCount(@RequestBody String deptNo) {
return tEmployeeProjectService.selectInUseEmployeeContractCount(deptNo);
}
/**
* 查询社保在保人数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation(summary = "查询社保在保人数", description = "查询社保在保人数")
@PostMapping("/selectInUseSocialCount")
public R selectInUseSocialCount(@RequestBody String deptNo) {
return tEmployeeProjectService.selectInUseSocialCount(deptNo);
}
/**
* 查询公积金在保人数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation(summary = "查询公积金在保人数", description = "查询公积金在保人数")
@PostMapping("/selectInUseFundCount")
public R selectInUseFundCount(@RequestBody String deptNo) {
return tEmployeeProjectService.selectInUseFundCount(deptNo);
}
/** /**
* 查询项目对应的数据 * 查询项目对应的数据
* @author hyc * @author hyc
......
...@@ -226,14 +226,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -226,14 +226,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
**/ **/
void everyDayUpdateEmployeContractStatus(); void everyDayUpdateEmployeContractStatus();
R selectInUseEmployeeProjectCount(String deptNo);
R selectInUseEmployeeContractCount(String deptNo);
R selectInUseSocialCount(String deptNo);
R selectInUseFundCount(String deptNo);
R<List<TSettleDomainDataVo>> selectSettleMentData(List<String> deptNoList); R<List<TSettleDomainDataVo>> selectSettleMentData(List<String> deptNoList);
} }
...@@ -1416,49 +1416,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1416,49 +1416,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
baseMapper.everyDayUpdateEmployeContractStatus(); baseMapper.everyDayUpdateEmployeContractStatus();
} }
@Override
public R selectInUseEmployeeProjectCount(String deptNo) {
//查询项目档案在档人数
return R.ok(baseMapper.selectCount(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getDeptNo,deptNo)
.eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT)
.eq(TEmployeeProject::getDeleteFlag,CommonConstants.ZERO_STRING)));
}
@Override
public R selectInUseEmployeeContractCount(String deptNo) {
//项目员工合同在用数
return R.ok(baseMapper.selectCount(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getDeptNo,deptNo)
.eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT)
.eq(TEmployeeProject::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(TEmployeeProject::getContractStatus,CommonConstants.ONE_INT)));
}
@Override
public R selectInUseSocialCount(String deptNo) {
//查询社保在保人数
return R.ok(baseMapper.selectCount(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getDeptNo,deptNo)
.eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT)
.eq(TEmployeeProject::getDeleteFlag,CommonConstants.ZERO_STRING)
.and(obj -> obj.eq(TEmployeeProject::getSocialStatus, CommonConstants.ONE_INT)
.or().eq(TEmployeeProject::getSocialStatus, CommonConstants.TWO_INT)
.or().eq(TEmployeeProject::getSocialStatus, CommonConstants.THREE_INT))));
}
@Override
public R selectInUseFundCount(String deptNo) {
//查询公积金在保人数
return R.ok(baseMapper.selectCount(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getDeptNo,deptNo)
.eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT)
.eq(TEmployeeProject::getDeleteFlag,CommonConstants.ZERO_STRING)
.and(obj -> obj.eq(TEmployeeProject::getFundStatus, CommonConstants.ONE_INT)
.or().eq(TEmployeeProject::getFundStatus, CommonConstants.TWO_INT)
.or().eq(TEmployeeProject::getFundStatus, CommonConstants.THREE_INT))));
}
@Override @Override
public R<List<TSettleDomainDataVo>> selectSettleMentData(List<String> deptNoList) { public R<List<TSettleDomainDataVo>> selectSettleMentData(List<String> deptNoList) {
List<TSettleDomainDataVo> list = new ArrayList<>(); List<TSettleDomainDataVo> list = new ArrayList<>();
......
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