中水北方修改
This commit is contained in:
parent
84cd5ac420
commit
76136770bc
@ -202,6 +202,9 @@ public class WorkerDailyAttendanceStatisticsV2Controller {
|
|||||||
for (WorkerInfo workerInfo : workerInfoList.getRecords()) {
|
for (WorkerInfo workerInfo : workerInfoList.getRecords()) {
|
||||||
List<WorkerDailyAttendanceStatisticsV2Vo> statisticsV2Vos = personSnMap.get(workerInfo.getPersonSn());
|
List<WorkerDailyAttendanceStatisticsV2Vo> statisticsV2Vos = personSnMap.get(workerInfo.getPersonSn());
|
||||||
StatisticsListVo vo = new StatisticsListVo();
|
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.setPersonType(workerInfo.getPersonType());
|
||||||
vo.setEnterpriseName(workerInfo.getEnterpriseName());
|
vo.setEnterpriseName(workerInfo.getEnterpriseName());
|
||||||
vo.setWorkerName(workerInfo.getWorkerName());
|
vo.setWorkerName(workerInfo.getWorkerName());
|
||||||
|
|||||||
@ -18,16 +18,31 @@ public class StatisticsListVo {
|
|||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "合作单位名称")
|
@ApiModelProperty(value = "合作单位名称")
|
||||||
private java.lang.String enterpriseName;
|
private java.lang.String enterpriseName;
|
||||||
|
/**
|
||||||
|
* 合作单位ID
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "合作单位ID")
|
||||||
|
private java.lang.Long enterpriseId;
|
||||||
/**
|
/**
|
||||||
* 姓名
|
* 姓名
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "姓名")
|
@ApiModelProperty(value = "姓名")
|
||||||
private String workerName;
|
private String workerName;
|
||||||
|
/**
|
||||||
|
* 人员ID
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "人员ID")
|
||||||
|
private Long workerId;
|
||||||
/**
|
/**
|
||||||
* 班组/部门
|
* 班组/部门
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "班组/部门")
|
@ApiModelProperty(value = "班组/部门")
|
||||||
private String deptName;
|
private String deptName;
|
||||||
|
/**
|
||||||
|
* 班组/部门ID
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "班组/部门ID")
|
||||||
|
private Long deptId;
|
||||||
/**
|
/**
|
||||||
* 总考勤天数
|
* 总考勤天数
|
||||||
*/
|
*/
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user