From 76136770bc3fb04f1f5158f73a22d4022ce83c38 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 4 Jul 2025 17:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=B0=B4=E5=8C=97=E6=96=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rkerDailyAttendanceStatisticsV2Controller.java | 3 +++ .../worker/entity/vo/StatisticsListVo.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java index 4372616cf..063488029 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java @@ -202,6 +202,9 @@ public class WorkerDailyAttendanceStatisticsV2Controller { for (WorkerInfo workerInfo : workerInfoList.getRecords()) { List statisticsV2Vos = personSnMap.get(workerInfo.getPersonSn()); StatisticsListVo vo = new StatisticsListVo(); + vo.setWorkerId(workerInfo.getId()); + vo.setDeptId(workerInfo.getPersonType() == 1 ? workerInfo.getTeamId() : workerInfo.getDepartmentId()); + vo.setEnterpriseId(workerInfo.getEnterpriseId()); vo.setPersonType(workerInfo.getPersonType()); vo.setEnterpriseName(workerInfo.getEnterpriseName()); vo.setWorkerName(workerInfo.getWorkerName()); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/StatisticsListVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/StatisticsListVo.java index 74df243b5..f608363d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/StatisticsListVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/StatisticsListVo.java @@ -18,16 +18,31 @@ public class StatisticsListVo { */ @ApiModelProperty(value = "合作单位名称") private java.lang.String enterpriseName; + /** + * 合作单位ID + */ + @ApiModelProperty(value = "合作单位ID") + private java.lang.Long enterpriseId; /** * 姓名 */ @ApiModelProperty(value = "姓名") private String workerName; + /** + * 人员ID + */ + @ApiModelProperty(value = "人员ID") + private Long workerId; /** * 班组/部门 */ @ApiModelProperty(value = "班组/部门") private String deptName; + /** + * 班组/部门ID + */ + @ApiModelProperty(value = "班组/部门ID") + private Long deptId; /** * 总考勤天数 */