Commit f7a5357a authored by huyuchen's avatar huyuchen

导出优化

parent 1b478bee
...@@ -144,7 +144,7 @@ implements TVacationMonitorService { ...@@ -144,7 +144,7 @@ implements TVacationMonitorService {
if (R.isSuccess(listR) && Common.isNotNull(listR.getData()) && Common.isNotNull(listR.getData().getExtendVO())) { if (R.isSuccess(listR) && Common.isNotNull(listR.getData()) && Common.isNotNull(listR.getData().getExtendVO())) {
List<BusinessEmployeeExtendVO> list = listR.getData().getExtendVO(); List<BusinessEmployeeExtendVO> list = listR.getData().getExtendVO();
List<TVacationMonitor> collect = list.stream().map(vo -> { List<TVacationMonitor> collect = list.stream().map(vo -> {
TVacationMonitor monitor = null; TVacationMonitor monitor;
if (null != vo.getBusinessEnjoinDate()) { if (null != vo.getBusinessEnjoinDate()) {
String curentYear = String.valueOf(LocalDate.now().getYear()); String curentYear = String.valueOf(LocalDate.now().getYear());
monitor = this.lambdaQuery() monitor = this.lambdaQuery()
......
...@@ -369,7 +369,7 @@ public class ArchivesDaprUtil { ...@@ -369,7 +369,7 @@ public class ArchivesDaprUtil {
* @return * @return
**/ **/
public R<TBusinessDataListVo> getNotLeaveExtendList() { public R<TBusinessDataListVo> getNotLeaveExtendList() {
R<TBusinessDataListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/customerBusiness/temployeeBusiness/inner/getNotLeaveExtendList" , "", TBusinessEmployeeExtendInfo.class, SecurityConstants.FROM_IN); R<TBusinessDataListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/customerBusiness/temployeeBusiness/inner/getNotLeaveExtendList" , "", TBusinessDataListVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){ if (Common.isEmpty(res)){
return R.failed("获取所有非离职员工拓展表信息失败!"); return R.failed("获取所有非离职员工拓展表信息失败!");
} }
......
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