From 416ccd57a6efc6e7cd6ff41cc4c9f29895f98d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 25 Apr 2022 14:51:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=80=83=E5=8B=A4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacollection/bo/AttendQuoteDataBO.java | 2 +- .../remote/attend/entity/Attend4Salary.java | 9 +++++ .../service/RemoteAttend4SalaryService.java | 2 +- .../impl/RemoteAttend4SalaryServiceImpl.java | 34 +++++++------------ .../impl/AttendQuoteDataServiceImpl.java | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/com/engine/salary/entity/datacollection/bo/AttendQuoteDataBO.java b/src/com/engine/salary/entity/datacollection/bo/AttendQuoteDataBO.java index afcb821ad..d046b9207 100644 --- a/src/com/engine/salary/entity/datacollection/bo/AttendQuoteDataBO.java +++ b/src/com/engine/salary/entity/datacollection/bo/AttendQuoteDataBO.java @@ -26,7 +26,7 @@ public class AttendQuoteDataBO { /** * 根据考勤模块来构建考勤数据 */ - public static void buildAttendDataFromRemote( List> list, List attendQuoteFields, List> attendQuoteSyncData) { + public static void buildAttendDataFromRemote( List> list, List attendQuoteFields, List> attendQuoteSyncData) { if (CollectionUtils.isEmpty(list)) { return; } diff --git a/src/com/engine/salary/remote/attend/entity/Attend4Salary.java b/src/com/engine/salary/remote/attend/entity/Attend4Salary.java index 7178f37a5..701d82f69 100644 --- a/src/com/engine/salary/remote/attend/entity/Attend4Salary.java +++ b/src/com/engine/salary/remote/attend/entity/Attend4Salary.java @@ -1,5 +1,6 @@ package com.engine.salary.remote.attend.entity; +import com.engine.salary.util.valid.DataCheck; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,9 +13,17 @@ import java.util.Map; @NoArgsConstructor @AllArgsConstructor public class Attend4Salary { + + @DataCheck(require = true,message = "开始日期为空！") private Date beginDate; + + @DataCheck(require = true,message = "结束日期为空！") private Date endDate; + private String unit; + + @DataCheck(require = true,message = "考勤人员为空！") private List onlyEmpIds; + private Map extendParam; } diff --git a/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java b/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java index 9b0336da0..fde7fea78 100644 --- a/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java +++ b/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java @@ -10,7 +10,7 @@ public interface RemoteAttend4SalaryService { List> getColumns(); - List> getDatas(Attend4Salary attend4Salary); + List> getDatas(Attend4Salary attend4Salary); diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java index c959e9dfb..891c21824 100644 --- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java +++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java @@ -2,22 +2,20 @@ package com.engine.salary.remote.attend.service.impl; import com.alibaba.fastjson.JSONObject; import com.engine.core.impl.Service; -import com.engine.salary.mapper.attend.AttendDataMapper; import com.engine.salary.remote.attend.cmd.GetKQReportCmd; import com.engine.salary.remote.attend.entity.Attend4Salary; import com.engine.salary.remote.attend.service.RemoteAttend4SalaryService; -import com.engine.salary.util.db.MapperProxyFactory; +import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.*; +import java.util.stream.Collectors; public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAttend4SalaryService { - private AttendDataMapper getAttendDataMapper() { - return MapperProxyFactory.getProxy(AttendDataMapper.class); - } @Override public List> getColumns() { @@ -25,10 +23,7 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt paramsMap.put("pageIndex", 1); paramsMap.put("pageSize", 10); paramsMap.put("typeselect", "6"); -// paramsMap.put("fromDate","2021-01-01"); -// paramsMap.put("toDate","2023-01-01"); paramsMap.put("viewScope", "3"); -// paramsMap.put("resourceId","22"); paramsMap.put("isNoAccount", "1"); paramsMap.put("attendanceSerial", ""); paramsMap.put("isFromMyAttendance", "1"); @@ -72,22 +67,18 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt } @Override - public List> getDatas(Attend4Salary attend4Salary) { - -// List onlyEmpIds = attend4Salary.getOnlyEmpIds(); - -// List> attendData = getAttendDataMapper().getAttendData(); -// -// return attendData; + public List> getDatas(Attend4Salary attend4Salary) { + ValidUtil.doValidator(attend4Salary); Map paramsMap = new HashMap(); paramsMap.put("pageIndex", 1); - paramsMap.put("pageSize", 10); + paramsMap.put("pageSize", 500); paramsMap.put("typeselect", "6"); - paramsMap.put("fromDate", "2021-01-01"); - paramsMap.put("toDate", "2023-01-01"); + paramsMap.put("fromDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getBeginDate())); + paramsMap.put("toDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getEndDate())); paramsMap.put("viewScope", "3"); - paramsMap.put("resourceId", "22"); + List resourceIds = attend4Salary.getOnlyEmpIds().stream().map(String::valueOf).collect(Collectors.toList()); + paramsMap.put("resourceId", String.join(",", resourceIds)); paramsMap.put("isNoAccount", "1"); paramsMap.put("attendanceSerial", ""); paramsMap.put("isFromMyAttendance", "1"); @@ -96,10 +87,9 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt temp.put("reportType", "month"); - Object datas = commandExecutor.execute(new GetKQReportCmd(temp, user)).get("datas"); - System.out.println(datas); + List> list = (List>)commandExecutor.execute(new GetKQReportCmd(temp, user)).get("datas"); - return null; + return list; } diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index 52c52fb5c..665b27312 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -413,7 +413,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa attend4Salary.setBeginDate(attendCycleRange.getFromDate()); attend4Salary.setEndDate(attendCycleRange.getEndDate()); attend4Salary.setOnlyEmpIds(part); - List> attendResult = getRemoteAttend4SalaryService(user).getDatas(attend4Salary); + List> attendResult = getRemoteAttend4SalaryService(user).getDatas(attend4Salary); log.info("考勤数据:{}", JSONUtils.toJSONString(attendResult)); AttendQuoteDataBO.buildAttendDataFromRemote(attendResult, attendQuoteFields, attendQuoteSyncData); // attend4Salary.setUnit("day");