diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/WorkerStatisticsController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/WorkerStatisticsController.java index 1de19bd..a8b0183 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/WorkerStatisticsController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/WorkerStatisticsController.java @@ -1,9 +1,7 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.po.HomePagePo; -import com.bonus.bmw.domain.vo.HomePageSubProVo; -import com.bonus.bmw.domain.vo.PmWorker; -import com.bonus.bmw.domain.vo.PmWorkerVo; +import com.bonus.bmw.domain.vo.*; import com.bonus.bmw.service.WorkerStatisticsService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -71,23 +69,43 @@ public class WorkerStatisticsController extends BaseController { } } -/* *//** + /** * 考勤信息 * @param pmWorker * @return - *//* + */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:statistics:query")) @GetMapping("/getWorkerEinDayRecordDetail") @SysLog(title = "考勤信息", businessType = OperaType.QUERY, logType = 0, module = "人员统计->考勤信息", details = "考勤信息") - public AjaxResult getWorkerEinDayRecordDetail(PmWorker pmWorker) { + public TableDataInfo getWorkerEinDayRecordDetail(PmWorker pmWorker) { try { - PmWorkerVo pmWorkerVo = service.getWorkerEinDayRecordDetail(pmWorker); - return success(pmWorkerVo); + startPage(); + List bmWorkerEinDayRecordList = service.getWorkerEinDayRecordDetail(pmWorker); + return getDataTable(bmWorkerEinDayRecordList); } catch (Exception e) { logger.error(e.toString(), e); - return error("查询身份证信息失败!"); + return getDataTable(new ArrayList<>()); } - }*/ + } + + /** + * 考勤信息 + * @param pmWorker + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:statistics:query")) + @GetMapping("/getMonthTableDetail") + @SysLog(title = "考勤信息", businessType = OperaType.QUERY, logType = 0, module = "人员统计->考勤信息", details = "考勤信息") + public TableDataInfo getMonthTableDetail(PmWorker pmWorker) { + try { + startPage(); + List bmWorkerEinDayRecordList = service.getMonthTableDetail(pmWorker); + return getDataTable(bmWorkerEinDayRecordList); + } catch (Exception e) { + logger.error(e.toString(), e); + return getDataTable(new ArrayList<>()); + } + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerEinDayRecordVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerEinDayRecordVo.java index 803a636..c0092e4 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerEinDayRecordVo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerEinDayRecordVo.java @@ -1,9 +1,12 @@ package com.bonus.bmw.domain.vo; +import lombok.Data; + /** * @author 马三炮 * @date 2025/10/11 */ +@Data public class BmWorkerEinDayRecordVo { /** @@ -12,7 +15,7 @@ public class BmWorkerEinDayRecordVo { public String attDay; /** - * 考勤状态 + * 考勤状态 0 未打卡 1已打卡 */ public String attStatus; @@ -20,4 +23,24 @@ public class BmWorkerEinDayRecordVo { * 考勤时间 */ public String attTime; + + /** + * 工程名称 + */ + public String proName; + + /** + * 考勤机设备名称 + */ + public String devName; + + /** + * 设备编码 + */ + public String deviceCode; + + /** + * 是否补卡 0 不是 1 是 + */ + public String isRepair; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerVo.java index 45a9cc8..3732582 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerVo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerVo.java @@ -136,4 +136,8 @@ public class PmWorkerVo { private String facePhotoBase64; + private String proId; + + private String subId; + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/WorkerStatisticsMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/WorkerStatisticsMapper.java index 75e83a8..c7b66c0 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/WorkerStatisticsMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/WorkerStatisticsMapper.java @@ -10,14 +10,53 @@ import java.util.List; public interface WorkerStatisticsMapper { + /** + * 人员统计 + * @param o + * @return + */ List getWorkerStatisticsTable(HomePagePo o); + /** + * 身份证信息 + * @param pmWorker + * @return + */ PmWorkerVo getWorkerDetail(PmWorker pmWorker); + /** + * 出入场信息 + * @param pmWorkerVo + * @return + */ List getBmWorkerEinProRecordList(PmWorkerVo pmWorkerVo); + /** + * 获取合同信息 + * @param pmWorkerVo + * @return + */ List getBmWorkerContractList(PmWorkerVo pmWorkerVo); + /** + * 工资卡信息 + * @param pmWorkerVo + * @return + */ BmWorkerWageCard getBmWorkerWageCard(PmWorkerVo pmWorkerVo); + + /** + * 考勤信息 + * @param pmWorker + * @return + */ + List getWorkerEinDayRecordDetail(PmWorker pmWorker); + + /** + * 考勤信息 + * @param pmWorker + * @return + */ + List getMonthTableDetail(PmWorker pmWorker); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/WorkerStatisticsService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/WorkerStatisticsService.java index e4397ae..bfdcac9 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/WorkerStatisticsService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/WorkerStatisticsService.java @@ -1,9 +1,7 @@ package com.bonus.bmw.service; import com.bonus.bmw.domain.po.HomePagePo; -import com.bonus.bmw.domain.vo.HomePageSubProVo; -import com.bonus.bmw.domain.vo.PmWorker; -import com.bonus.bmw.domain.vo.PmWorkerVo; +import com.bonus.bmw.domain.vo.*; import java.util.List; @@ -16,5 +14,24 @@ public interface WorkerStatisticsService { */ List getWorkerStatisticsTable(HomePagePo o); + /** + * 身份证信息 + * @param pmWorker + * @return + */ PmWorkerVo getWorkerDetail(PmWorker pmWorker); + + /** + * 考勤信息 + * @param pmWorker + * @return + */ + List getWorkerEinDayRecordDetail(PmWorker pmWorker); + + /** + * 考勤信息 + * @param pmWorker + * @return + */ + List getMonthTableDetail(PmWorker pmWorker); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java index 08320a7..8d7f5ec 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java @@ -20,11 +20,21 @@ public class WorkerStatisticsServiceImpl implements WorkerStatisticsService { @Resource private FileUploadUtils fileUploadUtils; + /** + * 人员统计 + * @param o + * @return + */ @Override public List getWorkerStatisticsTable(HomePagePo o) { return mapper.getWorkerStatisticsTable(o); } + /** + * 身份证信息 + * @param pmWorker + * @return + */ @Override public PmWorkerVo getWorkerDetail(PmWorker pmWorker) { PmWorkerVo pmWorkerVo = mapper.getWorkerDetail(pmWorker); @@ -32,10 +42,10 @@ public class WorkerStatisticsServiceImpl implements WorkerStatisticsService { if(pmWorkerVo != null){ pmWorkerVo.setFiles(fileUploadUtils.getFileList("", pmWorkerVo.getId().toString(), Constants.FILE_UPLOAD_WORKER, "")); } - //获取合同信息 + //出入场信息 List bmWorkerEinProRecordList = mapper.getBmWorkerEinProRecordList(pmWorkerVo); pmWorkerVo.setBmWorkerEinProRecordList(bmWorkerEinProRecordList); - //获取合同信息 + // List bmWorkerContractList = mapper.getBmWorkerContractList(pmWorkerVo); if (bmWorkerContractList.size()>0){ for (BmWorkerContract bmWorkerContract:bmWorkerContractList) { @@ -53,4 +63,24 @@ public class WorkerStatisticsServiceImpl implements WorkerStatisticsService { return pmWorkerVo; } + /** + * 考勤信息 + * @param pmWorker + * @return + */ + @Override + public List getWorkerEinDayRecordDetail(PmWorker pmWorker) { + return mapper.getWorkerEinDayRecordDetail(pmWorker); + } + + /** + * 考勤信息 + * @param pmWorker + * @return + */ + @Override + public List getMonthTableDetail(PmWorker pmWorker) { + return mapper.getMonthTableDetail(pmWorker); + } + } diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml index 53e82fa..6b1d271 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml @@ -47,15 +47,59 @@ + +