Commit f2ebd2d3 authored by hongguangwu's avatar hongguangwu

MVP1.7.17-离职待办-派单暂存

parent 9ef88f9a
...@@ -94,6 +94,18 @@ public class TEmpContractAlertController { ...@@ -94,6 +94,18 @@ public class TEmpContractAlertController {
setAuth(searchVo); setAuth(searchVo);
return R.ok(tEmpContractAlertService.getAutoContractCount(searchVo)); return R.ok(tEmpContractAlertService.getAutoContractCount(searchVo));
} }
/**
* 不分页查询
* @param searchVo 员工合同续签待办
* @return
*/
@Operation(summary = "给自动化用的-导出-不分页查询", description = "不分页查询")
@PostMapping("/noPageToAuto" )
public R<List<TEmpContractAlert>> noPageToAuto(@RequestBody ContractAlertSearchVo searchVo) {
setAuth(searchVo);
return R.ok(tEmpContractAlertService.noPageToAuto(searchVo));
}
/** /**
* 不分页查询 * 不分页查询
* @param searchVo 员工合同续签待办 * @param searchVo 员工合同续签待办
......
...@@ -46,6 +46,7 @@ public interface TEmpContractAlertService extends IService<TEmpContractAlert> { ...@@ -46,6 +46,7 @@ public interface TEmpContractAlertService extends IService<TEmpContractAlert> {
// 合同待续签数量查询 // 合同待续签数量查询
long getAutoContractCount(ContractAlertSearchVo searchVo); long getAutoContractCount(ContractAlertSearchVo searchVo);
List<TEmpContractAlert> noPageToAuto(ContractAlertSearchVo searchVo);
List<TEmpContractAlert> listDiy(ContractAlertSearchVo searchVo); List<TEmpContractAlert> listDiy(ContractAlertSearchVo searchVo);
void listExport(HttpServletResponse response, ContractAlertSearchVo searchVo); void listExport(HttpServletResponse response, ContractAlertSearchVo searchVo);
......
...@@ -160,6 +160,35 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -160,6 +160,35 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
return baseMapper.selectPage(page,wrapper); return baseMapper.selectPage(page,wrapper);
} }
@Override
public List<TEmpContractAlert> noPageToAuto(ContractAlertSearchVo searchVo) {
LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
List<String> idList = Common.getList(searchVo.getIds());
wrapper.isNotNull(TEmpContractAlert::getId);
List<String> deptList = tAutoMainRelMapper.getAutoDeptNo();
if (deptList != null && !deptList.isEmpty()) {
wrapper.in(TEmpContractAlert::getProjectNo, deptList);
}
if (Common.isNotNull(idList)){
wrapper.in(TEmpContractAlert::getId,idList);
}
if (Common.isNotNull(searchVo.getContractEndStart())){
wrapper.ge(TEmpContractAlert::getContractEnd,searchVo.getContractEndStart());
}
if (Common.isNotNull(searchVo.getContractEndEnd())){
wrapper.le(TEmpContractAlert::getContractEnd,searchVo.getContractEndEnd());
}
if (Common.isNotNull(searchVo.getAuthSql())) {
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("a.", " "));
}
wrapper.last(searchVo.getAuthSql());
}
return baseMapper.selectList(wrapper);
}
@Override @Override
public List<TEmpContractAlert> listDiy(ContractAlertSearchVo searchVo) { public List<TEmpContractAlert> listDiy(ContractAlertSearchVo searchVo) {
LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo); LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
......
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