diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java index dd4b89d..e446e32 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java @@ -81,6 +81,9 @@ public class WgzAppController { @Autowired private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService; + @Autowired + private IWgzAttendanceService iWgzAttendanceService; + /** * 【注册】务工者注册 @@ -88,7 +91,7 @@ public class WgzAppController { @ApiOperation("APP务工者-注册") @PreAuthorize("@ss.hasPermi('wgzApp:user:register')") @PostMapping("/wgzRegister") - public AjaxResult userRegister(@Validated @RequestBody WgzAppUserRegisterReq bo) { + public AjaxResult userRegister(@Validated @RequestBody WgzAppRegisterReq bo) { return AjaxResult.success(iWgzUserService.userRegister(bo)); } @@ -215,7 +218,7 @@ public class WgzAppController { @ApiOperation("日报-日报日历") @PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyCalendar')") @GetMapping("/WgzUserDailyCalendar") - public AjaxResult userDailyCalendar(@Validated WgzAppUserDailyCalendarReq req) { + public AjaxResult userDailyCalendar(@Validated WgzAppDailyCalendarReq req) { WgzUserDailyCalendarRes wfzUserDailyCalendarRes = iWgzDailyClockService.userDailyCalendar(req); return AjaxResult.success(wfzUserDailyCalendarRes); } @@ -226,12 +229,12 @@ public class WgzAppController { @ApiOperation("日报-日报日历·日报记录") @PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyRecord')") @GetMapping("/WgzUserDailyRecord") - public TableDataInfo userDailyRecord(@Validated WgzAppUserDailyRecordReq req) { + public TableDataInfo userDailyRecord(@Validated WgzAppDailyRecordReq req) { return iWgzDailyClockService.userDailyRecord(req); } /** - * 【日报】日报日历·日报记录 + * 【日报】日报日历·查看日报 */ @ApiOperation("日报-日报日历·查看日报") @PreAuthorize("@ss.hasPermi('wgzApp:user:userCheckDailyNewspaper')") @@ -246,7 +249,7 @@ public class WgzAppController { @ApiOperation("【考勤打卡】【打卡】 提交上下班打卡）") @PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitTheClock')") @PostMapping("/WgzAppUserSubmitTheClock") - public AjaxResult userSubmitTheClock() { + public AjaxResult userSubmitTheClock(@Validated @RequestBody WgzAppSubmitTheClockReq req) { return AjaxResult.success(true); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAttendanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAttendanceController.java new file mode 100644 index 0000000..98dcbfe --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAttendanceController.java @@ -0,0 +1,108 @@ +package com.ruoyi.web.controller.wgz.controller; + +import java.util.List; +import java.util.Arrays; + +import com.ruoyi.wgz.domain.WgzAttendance; +import lombok.RequiredArgsConstructor; +import javax.validation.constraints.*; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.wgz.bo.WgzAttendanceQueryBo; +import com.ruoyi.wgz.service.IWgzAttendanceService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +/** + * 考勤打卡Controller + * + * @author ruoyi + * @date 2025-02-20 + */ +@Api(value = "考勤打卡控制器", tags = {"考勤打卡管理"}) +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/wgz/attendance") +public class WgzAttendanceController extends BaseController { + + private final IWgzAttendanceService iWgzAttendanceService; + + /** + * 查询考勤打卡列表 + */ + @ApiOperation("查询考勤打卡列表") + @PreAuthorize("@ss.hasPermi('wgz:attendance:list')") + @GetMapping("/list") + public TableDataInfo list(@Validated WgzAttendanceQueryBo bo) { + return iWgzAttendanceService.queryPageList(bo); + } + + /** + * 导出考勤打卡列表 + */ + @ApiOperation("导出考勤打卡列表") + @PreAuthorize("@ss.hasPermi('wgz:attendance:export')") + @Log(title = "考勤打卡", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(@Validated WgzAttendanceQueryBo bo) { + List list = iWgzAttendanceService.queryList(bo); + ExcelUtil util = new ExcelUtil(WgzAttendance.class); + return util.exportExcel(list, "考勤打卡"); + } + + /** + * 获取考勤打卡详细信息 + */ + @ApiOperation("获取考勤打卡详细信息") + @PreAuthorize("@ss.hasPermi('wgz:attendance:query')") + @GetMapping("/{id}") + public AjaxResult getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return AjaxResult.success(iWgzAttendanceService.queryById(id)); + } + + /** + * 新增考勤打卡 + */ + @ApiOperation("新增考勤打卡") + @PreAuthorize("@ss.hasPermi('wgz:attendance:add')") + @Log(title = "考勤打卡", businessType = BusinessType.INSERT) + @RepeatSubmit + @PostMapping() + public AjaxResult add(@Validated @RequestBody WgzAttendance bo) { + return toAjax(iWgzAttendanceService.insert(bo) ? 1 : 0); + } + + /** + * 修改考勤打卡 + */ + @ApiOperation("修改考勤打卡") + @PreAuthorize("@ss.hasPermi('wgz:attendance:edit')") + @Log(title = "考勤打卡", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PutMapping() + public AjaxResult edit(@Validated @RequestBody WgzAttendance bo) { + return toAjax(iWgzAttendanceService.update(bo) ? 1 : 0); + } + + /** + * 删除考勤打卡 + */ + @ApiOperation("删除考勤打卡") + @PreAuthorize("@ss.hasPermi('wgz:attendance:remove')") + @Log(title = "考勤打卡" , businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iWgzAttendanceService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java index 5010cef..b749498 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java @@ -9,6 +9,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.LocalTime; @@ -81,7 +82,7 @@ public class BgtProjectRecruit implements Serializable { */ @Excel(name = "招工金额") @ApiModelProperty("招工金额") - private Long recruitAmount; + private BigDecimal recruitAmount; /** * 招工数量 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/WgzAttendanceQueryBo.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/WgzAttendanceQueryBo.java new file mode 100644 index 0000000..c2300b5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/WgzAttendanceQueryBo.java @@ -0,0 +1,89 @@ +package com.ruoyi.wgz.bo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.LocalDate; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 考勤打卡分页查询对象 wgz_attendance + * + * @author ruoyi + * @date 2025-02-20 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("考勤打卡分页查询对象") +public class WgzAttendanceQueryBo extends BaseEntity { + + /** 分页大小 */ + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + /** 排序列 */ + @ApiModelProperty("排序列") + private String orderByColumn; + /** 排序的方向desc或者asc */ + @ApiModelProperty(value = "排序的方向", example = "asc,desc") + private String isAsc; + + + /** 项目ID */ + @ApiModelProperty("项目ID") + private Long recruitId; + /** 人员ID */ + @ApiModelProperty("人员ID") + private Long userId; + /** 请假ID */ + @ApiModelProperty("请假ID") + private Long leaveMarkId; + /** 日薪 */ + @ApiModelProperty("日薪") + private BigDecimal dailyWage; + /** 打卡日期 */ + @ApiModelProperty("打卡日期") + private LocalDate date; + /** 打卡位置 */ + @ApiModelProperty("打卡位置") + private String pnchOsition; + /** 上班时间 */ + @ApiModelProperty("上班时间") + private LocalDateTime clockInTime; + /** 下班时间 */ + @ApiModelProperty("下班时间") + private LocalDateTime clockOutTime; + /** 迟到标记 */ + @ApiModelProperty("迟到标记") + private Integer late; + /** 迟到时间 */ + @ApiModelProperty("迟到时间") + private LocalDateTime lateTime; + /** 早退标记 */ + @ApiModelProperty("早退标记") + private Integer earlyLeave; + /** 早退时间 */ + @ApiModelProperty("早退时间") + private LocalDateTime earlyLeaveTime; + /** 上班缺卡 */ + @ApiModelProperty("上班缺卡") + private Integer missedIn; + /** 下班缺卡 */ + @ApiModelProperty("下班缺卡") + private Integer missedOut; + /** 类型（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5补卡 6请假） */ + @ApiModelProperty("类型（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5补卡 6请假）") + private String exceptionType; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyCalendarReq.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarReq.java rename to ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyCalendarReq.java index 6158e37..bc92731 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyCalendarReq.java @@ -13,7 +13,7 @@ import java.io.Serializable; @NoArgsConstructor @Accessors(chain = true) @ApiModel("务工者APP-日报日历请求对象") -public class WgzAppUserDailyCalendarReq implements Serializable { +public class WgzAppDailyCalendarReq implements Serializable { @ApiModelProperty("年月日期：2025-02") @NotBlank(message = "年月不能为空") private String yearMonth; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyRecordReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java similarity index 59% rename from ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyRecordReq.java rename to ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java index 8f8aaa3..08765ea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyRecordReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java @@ -1,20 +1,15 @@ package com.ruoyi.wgz.bo.req; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.bo.PageReq; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import java.io.Serializable; -import java.time.LocalDateTime; - @Data @NoArgsConstructor @Accessors(chain = true) @ApiModel("日报打卡·日报记录请求对象") -public class WgzAppUserDailyRecordReq extends PageReq { +public class WgzAppDailyRecordReq extends PageReq { } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserLongInReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppLongInReq.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserLongInReq.java rename to ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppLongInReq.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserRegisterReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRegisterReq.java similarity index 82% rename from ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserRegisterReq.java rename to ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRegisterReq.java index dca9bbd..f47d07b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserRegisterReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRegisterReq.java @@ -1,10 +1,8 @@ package com.ruoyi.wgz.bo.req; -import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -16,7 +14,7 @@ import java.io.Serializable; @NoArgsConstructor @Accessors(chain = true) @ApiModel("务工者APP注册账号对象") -public class WgzAppUserRegisterReq implements Serializable { +public class WgzAppRegisterReq implements Serializable { @ApiModelProperty("联系电话") @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号码格式不正确") private String phone; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppSubmitTheClockReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppSubmitTheClockReq.java new file mode 100644 index 0000000..815f630 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppSubmitTheClockReq.java @@ -0,0 +1,28 @@ +package com.ruoyi.wgz.bo.req; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("考勤打卡·上下班打卡请求对象") +public class WgzAppSubmitTheClockReq implements Serializable { + @ApiModelProperty("上下班打卡标识（0上班 1下班）") + @NotBlank(message = "上下班打卡标识不能为空") + @Pattern(regexp = "[01]", message = "上下班打卡标识只能为 0 或 1") + private String type; + + @ApiModelProperty("打卡位置") + @NotBlank(message = "打卡位置不能为空") + private String pnchOsition; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java new file mode 100644 index 0000000..87526a9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java @@ -0,0 +1,149 @@ +package com.ruoyi.wgz.domain; + +import com.ruoyi.common.annotation.Excel; + +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.LocalDate; + +/** + * 考勤打卡对象 wgz_attendance + * + * @author ruoyi + * @date 2025-02-20 + */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("wgz_attendance") +@ApiModel("考勤打卡视图对象") +public class WgzAttendance implements Serializable { + + private static final long serialVersionUID=1L; + + /** 自增ID */ + @ApiModelProperty("自增ID") + @TableId(value = "id") + private Long id; + + /** 项目ID */ + @Excel(name = "项目ID") + @ApiModelProperty("项目ID") + private Long recruitId; + + /** 人员ID */ + @Excel(name = "人员ID") + @ApiModelProperty("人员ID") + private Long userId; + + /** 请假ID */ + @Excel(name = "请假ID") + @ApiModelProperty("请假ID") + private Long leaveMarkId; + + /** 日薪 */ + @Excel(name = "日薪") + @ApiModelProperty("日薪") + private BigDecimal dailyWage; + + /** 打卡日期 */ + @Excel(name = "打卡日期") + @ApiModelProperty("打卡日期") + private LocalDate date; + + /** 打卡位置 */ + @Excel(name = "打卡位置") + @ApiModelProperty("打卡位置") + private String pnchOsition; + + /** 上班时间 */ + @Excel(name = "上班时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("上班时间") + private LocalDateTime clockInTime; + + /** 下班时间 */ + @Excel(name = "下班时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("下班时间") + private LocalDateTime clockOutTime; + + /** 迟到标记 */ + @Excel(name = "迟到标记") + @ApiModelProperty("迟到标记") + private Integer late; + + /** 迟到时间 */ + @Excel(name = "迟到时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("迟到时间") + private LocalDateTime lateTime; + + /** 早退标记 */ + @Excel(name = "早退标记") + @ApiModelProperty("早退标记") + private Integer earlyLeave; + + /** 早退时间 */ + @Excel(name = "早退时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("早退时间") + private LocalDateTime earlyLeaveTime; + + /** 上班缺卡 */ + @Excel(name = "上班缺卡") + @ApiModelProperty("上班缺卡") + private Integer missedIn; + + /** 下班缺卡 */ + @Excel(name = "下班缺卡") + @ApiModelProperty("下班缺卡") + private Integer missedOut; + + /** 类型（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5补卡 6请假） */ + @Excel(name = "类型" , readConverterExp = "0=正常,1=迟到,2=早退,3=上班缺卡,4=下班缺卡,5=补卡,6=请假") + @ApiModelProperty("类型（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5补卡 6请假）") + private String exceptionType; + + /** 删除标志（0代表存在 2代表删除） */ + @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除") + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + /** 创建者 */ + @Excel(name = "创建者") + @ApiModelProperty("创建者") + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 创建时间 */ + @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 更新者 */ + @Excel(name = "更新者") + @ApiModelProperty("更新者") + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** 更新时间 */ + @Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("更新时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** 备注 */ + @Excel(name = "备注") + @ApiModelProperty("备注") + private String remark; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzAttendanceMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzAttendanceMapper.java new file mode 100644 index 0000000..7da7012 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzAttendanceMapper.java @@ -0,0 +1,18 @@ +package com.ruoyi.wgz.mapper; + +import com.ruoyi.wgz.domain.WgzAttendance; +import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; +import org.apache.ibatis.annotations.CacheNamespace; + +/** + * 考勤打卡Mapper接口 + * + * @author ruoyi + * @date 2025-02-20 + */ +// 如使需切换数据源 请勿使用缓存 会造成数据不一致现象 +@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class) +public interface WgzAttendanceMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java new file mode 100644 index 0000000..5af33ac --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java @@ -0,0 +1,76 @@ +package com.ruoyi.wgz.service; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.wgz.bo.req.WgzAppSubmitTheClockReq; +import com.ruoyi.wgz.domain.WgzAttendance; +import com.ruoyi.wgz.bo.WgzAttendanceQueryBo; +import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.Collection; +import java.util.List; + +/** + * 考勤打卡Service接口 + * + * @author ruoyi + * @date 2025-02-20 + */ +public interface IWgzAttendanceService extends IServicePlus { + /** + * 查询单个 + * @return + */ + WgzAttendance queryById(Long id); + + /** + * 查询列表 + */ + TableDataInfo queryPageList(WgzAttendanceQueryBo bo); + + /** + * 查询列表 + */ + List queryList(WgzAttendanceQueryBo bo); + + /** + * 根据新增业务对象插入考勤打卡 + * @param bo 考勤打卡新增业务对象 + * @return + */ + Boolean insert(WgzAttendance bo); + + /** + * 根据编辑业务对象修改考勤打卡 + * @param bo 考勤打卡编辑业务对象 + * @return + */ + Boolean update(WgzAttendance bo); + + /** + * 校验并删除数据 + * @param ids 主键集合 + * @param isValid 是否校验,true-删除前校验,false-不校验 + * @return + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP相关 + * ================================================================================================================= + * ================================================================================================================= + * ================================================================================================================= + */ + + /** + * 用户提交打卡 + */ + Boolean userSubmitTheClock(@Validated @RequestBody WgzAppSubmitTheClockReq req); + +// /** +// * 查看当前人、当前工地、当前日期的打卡记录 +// */ +// WgzAttendance findByUserIdWait(Long appUserId, Long recruitId, String date); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java index 10ff7b7..0af06fb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java @@ -1,7 +1,7 @@ package com.ruoyi.wgz.service; -import com.ruoyi.wgz.bo.req.WgzAppUserDailyCalendarReq; -import com.ruoyi.wgz.bo.req.WgzAppUserDailyRecordReq; +import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq; +import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq; import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes; import com.ruoyi.wgz.domain.WgzDailyClock; @@ -68,15 +68,15 @@ public interface IWgzDailyClockService extends IServicePlus { /** * 日报日历 */ - WgzUserDailyCalendarRes userDailyCalendar(@Validated WgzAppUserDailyCalendarReq req); + WgzUserDailyCalendarRes userDailyCalendar(@Validated WgzAppDailyCalendarReq req); /** * 日报日历·日报记录（历史记录分页查询） */ - TableDataInfo userDailyRecord(@Validated WgzAppUserDailyRecordReq req); + TableDataInfo userDailyRecord(@Validated WgzAppDailyRecordReq req); /** - * 日报日历·日报记录（历史记录分页查询） + * 日报日历·查看日报 */ WgzDailyClock userCheckDailyNewspaper(Long id); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java index 6d0ba3e..37f0952 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java @@ -85,7 +85,12 @@ public interface IWgzLeaveService extends IServicePlus { Boolean userCancelLeave(@Validated @RequestBody WgzAppCancelLeaveReq req); /* - * 查看指定人、指定项目、指定月是否请假 + * 查看指定人、指定项目、指定月是否请假（只传递年月） */ Map selectByUserCancelLeave(String yearMonth); + + /* + * 查看指定人、指定项目、指定日期是否请假 + */ + WgzLeave FindAskForLeaveOrNotInfo(Long appUserId, Long recruitId, String date); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java index 3a1d2fd..99b8d64 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java @@ -5,7 +5,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.wgz.bo.WgzUserQueryBo; import com.ruoyi.wgz.bo.req.WgzAppModifyingUserProfilePictureReq; import com.ruoyi.wgz.bo.req.WgzAppPersonalBasicInformationReq; -import com.ruoyi.wgz.bo.req.WgzAppUserRegisterReq; +import com.ruoyi.wgz.bo.req.WgzAppRegisterReq; import com.ruoyi.wgz.bo.req.WgzAppRealNameAuthenticationReq; import com.ruoyi.wgz.bo.res.WgzAppPersonalBasicInformationRes; import com.ruoyi.wgz.domain.WgzUser; @@ -71,7 +71,7 @@ public interface IWgzUserService extends IServicePlus { /** * 务工者APP注册账号 */ - Boolean userRegister(WgzAppUserRegisterReq bo); + Boolean userRegister(WgzAppRegisterReq bo); /** * 修改用户头像修改用户头像 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java new file mode 100644 index 0000000..5072ae8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java @@ -0,0 +1,196 @@ +package com.ruoyi.wgz.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.bgt.domain.BgtProjectRecruit; +import com.ruoyi.bgt.domain.BgtProjectRecruitApply; +import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; +import com.ruoyi.bgt.service.IBgtProjectRecruitService; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.common.core.page.PagePlus; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.wgz.bo.req.WgzAppSubmitTheClockReq; +import com.ruoyi.wgz.domain.WgzLeave; +import com.ruoyi.wgz.service.IWgzLeaveService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.wgz.bo.WgzAttendanceQueryBo; +import com.ruoyi.wgz.domain.WgzAttendance; +import com.ruoyi.wgz.mapper.WgzAttendanceMapper; +import com.ruoyi.wgz.service.IWgzAttendanceService; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.reactive.TransactionalOperator; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 考勤打卡Service业务层处理 + * + * @author ruoyi + * @date 2025-02-20 + */ +@Service +public class WgzAttendanceServiceImpl extends ServicePlusImpl implements IWgzAttendanceService { + + //上班打卡状态 0上 1下 + public static final String Clocking = "0"; + public static final String OffDuty= "1"; + + @Autowired + private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService; + + @Autowired + private IBgtProjectRecruitService iBgtProjectRecruitService; + + @Autowired + private IWgzLeaveService iWgzLeaveService; + + + @Override + public WgzAttendance queryById(Long id){ + return getById(id); + } + + @Override + public TableDataInfo queryPageList(WgzAttendanceQueryBo bo) { + Page result = page(PageUtils.buildPage(), buildQueryWrapper(bo)); + return PageUtils.buildDataInfo(result); + } + + @Override + public List queryList(WgzAttendanceQueryBo bo) { + return list(buildQueryWrapper(bo)); + } + + private LambdaQueryWrapper buildQueryWrapper(WgzAttendanceQueryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getRecruitId() != null, WgzAttendance::getRecruitId, bo.getRecruitId()); + lqw.eq(bo.getUserId() != null, WgzAttendance::getUserId, bo.getUserId()); + lqw.eq(bo.getLeaveMarkId() != null, WgzAttendance::getLeaveMarkId, bo.getLeaveMarkId()); + lqw.eq(bo.getDailyWage() != null, WgzAttendance::getDailyWage, bo.getDailyWage()); + lqw.eq(bo.getDate() != null, WgzAttendance::getDate, bo.getDate()); + lqw.eq(StrUtil.isNotBlank(bo.getPnchOsition()), WgzAttendance::getPnchOsition, bo.getPnchOsition()); + lqw.eq(bo.getClockInTime() != null, WgzAttendance::getClockInTime, bo.getClockInTime()); + lqw.eq(bo.getClockOutTime() != null, WgzAttendance::getClockOutTime, bo.getClockOutTime()); + lqw.eq(bo.getLate() != null, WgzAttendance::getLate, bo.getLate()); + lqw.eq(bo.getLateTime() != null, WgzAttendance::getLateTime, bo.getLateTime()); + lqw.eq(bo.getEarlyLeave() != null, WgzAttendance::getEarlyLeave, bo.getEarlyLeave()); + lqw.eq(bo.getEarlyLeaveTime() != null, WgzAttendance::getEarlyLeaveTime, bo.getEarlyLeaveTime()); + lqw.eq(bo.getMissedIn() != null, WgzAttendance::getMissedIn, bo.getMissedIn()); + lqw.eq(bo.getMissedOut() != null, WgzAttendance::getMissedOut, bo.getMissedOut()); + lqw.eq(StrUtil.isNotBlank(bo.getExceptionType()), WgzAttendance::getExceptionType, bo.getExceptionType()); + return lqw; + } + + @Override + public Boolean insert(WgzAttendance bo) { + WgzAttendance add = BeanUtil.toBean(bo, WgzAttendance.class); + validEntityBeforeSave(add); + return save(add); + } + + @Override + public Boolean update(WgzAttendance bo) { + WgzAttendance update = BeanUtil.toBean(bo, WgzAttendance.class); + validEntityBeforeSave(update); + return updateById(update); + } + + /** + * 保存前的数据校验 + * + * @param entity 实体类数据 + */ + private void validEntityBeforeSave(WgzAttendance entity){ + //TODO 做一些数据校验,如唯一约束 + } + + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return removeByIds(ids); + } + + + /** + * APP相关 + * ================================================================================================================= + * ================================================================================================================= + * ================================================================================================================= + */ + + @Override + @Transactional + public Boolean userSubmitTheClock(WgzAppSubmitTheClockReq req) { + //1、获取当前用户信息 + Long appUserId = SecurityUtils.getAppUserId(); + //2、获取当前用户所在的工地id + BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId); + //3、根据工地id得到完整的工地信息 + BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId()); + //4、查看当前用户是否有请假申请，有请假申请并且通过，那就无法进行打卡 + String formattedDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + WgzLeave wgzLeave = iWgzLeaveService.FindAskForLeaveOrNotInfo(appUserId, by.getId(), formattedDate); + if (wgzLeave != null) { //表示有请假申请 + LocalDateTime startTime = wgzLeave.getStartTime(); + LocalDate localDate = startTime.toLocalDate(); + throw new RuntimeException("您有已通过的请假申请，请假时间为："+localDate); + } + //5、查看当前人、当前工地、当天是否有打卡记录 + //4、组装完整的打卡信息 + WgzAttendance wgzAttendance = new WgzAttendance(). + setRecruitId(appById.getId()). + setUserId(appUserId). + setDailyWage(appById.getRecruitAmount()). + setDate(LocalDate.now()). + setPnchOsition(req.getPnchOsition()). + setDate(LocalDate.now()); + //设置打卡时间 + LocalDateTime now = LocalDateTime.now(); //当前完整年月日时分秒 + LocalTime localTime = now.toLocalTime(); //获取时分秒 + if (req.getType().equals(Clocking)) { + wgzAttendance.setClockInTime(now); + //判断当前打卡时间是否在上班时间之前 + LocalTime beginWorkTime = appById.getBeginWorkTime(); //上班 + if (!localTime.isBefore(beginWorkTime)) { + wgzAttendance.setLate(1); //迟到 + wgzAttendance.setLateTime(now); + wgzAttendance.setExceptionType("1,"); + } + } + if (req.getType().equals(OffDuty)) { + wgzAttendance.setClockOutTime(now); + //判断当前打卡时间是否在下班时间之后 + LocalTime endWorkTime = appById.getEndWorkTime(); //下班 + if (!localTime.isAfter(endWorkTime)) { + wgzAttendance.setEarlyLeave(1); //早退 + wgzAttendance.setEarlyLeaveTime(now); + wgzAttendance.setExceptionType("2,"); + } + } + return null; + } + +// @Override +// public WgzAttendance findByUserIdWait(Long appUserId, Long recruitId, String date) { +// LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); +// qw.eq(WgzAttendance::getRecruitId,recruitId); +// qw.eq(WgzAttendance::getUserId,appUserId); +// return null; +// } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java index 9efa370..d820624 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java @@ -6,9 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.wgz.bo.req.WgzAppUserDailyCalendarReq; -import com.ruoyi.wgz.bo.req.WgzAppUserDailyRecordReq; -import com.ruoyi.wgz.bo.res.WgzAppLeaveHistoryListPageRes; +import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq; +import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq; import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes; import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo; @@ -113,7 +112,7 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl userDailyRecord(WgzAppUserDailyRecordReq req) { + public TableDataInfo userDailyRecord(WgzAppDailyRecordReq req) { Page pe = new Page<>(); pe.setCurrent(req.getPageNum()); pe.setSize(req.getPageSize()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java index 6e9153e..84d963e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java @@ -175,7 +175,7 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl wgzLeaves = baseMapper.selectList(apply); wgzLeaves.forEach( leave -> { LocalDateTime startTime = leave.getStartTime(); @@ -184,4 +184,14 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl apply = new LambdaQueryWrapper(). + eq(WgzLeave::getUserId, appUserId). + eq(WgzLeave::getRecruitId, recruitId). + eq(WgzLeave::getAuditorType, "2") + .apply("date_format(start_time,'%Y-%m-%d') = {0}", date); + return baseMapper.selectOne(apply); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java index 0812704..1484cdd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java @@ -15,7 +15,7 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.wgz.bo.WgzUserQueryBo; import com.ruoyi.wgz.bo.req.WgzAppModifyingUserProfilePictureReq; import com.ruoyi.wgz.bo.req.WgzAppPersonalBasicInformationReq; -import com.ruoyi.wgz.bo.req.WgzAppUserRegisterReq; +import com.ruoyi.wgz.bo.req.WgzAppRegisterReq; import com.ruoyi.wgz.bo.req.WgzAppRealNameAuthenticationReq; import com.ruoyi.wgz.bo.res.WgzAppPersonalBasicInformationRes; import com.ruoyi.wgz.common.SnowflakeIdUtil; @@ -116,7 +116,7 @@ public class WgzUserServiceImpl extends ServicePlusImpl //注册 @Override - public Boolean userRegister(WgzAppUserRegisterReq bo) { + public Boolean userRegister(WgzAppRegisterReq bo) { WgzUser wgzUser = new WgzUser(); //1、查询手机号是否存在 Integer count = baseMapper.selectCount( diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzAttendanceMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzAttendanceMapper.xml new file mode 100644 index 0000000..799e6e3 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzAttendanceMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file