From 7e423bf296703de5f96cbefc6cd54429f2765e6f Mon Sep 17 00:00:00 2001 From: zt Date: Sat, 22 Feb 2025 17:22:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=EF=BC=8C=E6=97=A5=E6=8A=A5?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bgt/AppBgtDailyClockController.java | 66 +++++++++++++++++ .../bgt/AppBgtPayCalculationController.java | 67 +++++++++++++++++ .../bgt/AppBgtReissueacardController.java | 62 ++++++++++++++++ .../bgt/domain/dto/BgtDailyClockListDTO.java | 48 +++++++++++++ .../domain/dto/BgtDailyClockUpdateDTO.java | 25 +++++++ .../domain/dto/BgtPayCalculationListDTO.java | 45 ++++++++++++ .../dto/BgtPayCalculationUpdateDTO.java | 32 +++++++++ .../domain/dto/BgtReissueacardListDTO.java | 42 +++++++++++ .../domain/dto/BgtReissueacardUpdateDTO.java | 24 +++++++ .../bgt/domain/vo/BgtDailyClockDetailVO.java | 72 +++++++++++++++++++ .../bgt/domain/vo/BgtDailyClockListVO.java | 37 ++++++++++ ...gzAppApplyForPayrollSettlementListRes.java | 7 +- .../bo/res/WgzReplacementCardRecordRes.java | 2 + .../ruoyi/wgz/domain/WgzPayCalculation.java | 21 +++--- .../ruoyi/wgz/mapper/WgzDailyClockMapper.java | 10 ++- .../wgz/mapper/WgzPayCalculationMapper.java | 13 ++-- .../wgz/mapper/WgzReissueacardMapper.java | 4 ++ .../wgz/service/IWgzDailyClockService.java | 28 +++++++- .../service/IWgzPayCalculationService.java | 24 ++++++- .../wgz/service/IWgzReissueacardService.java | 23 ++++-- .../impl/WgzDailyClockServiceImpl.java | 61 +++++++++++++--- .../impl/WgzPayCalculationServiceImpl.java | 53 +++++++++----- .../impl/WgzReissueacardServiceImpl.java | 36 +++++++--- .../mapper/wgz/WgzDailyClockMapper.xml | 22 ++++++ .../mapper/wgz/WgzPayCalculationMapper.xml | 57 +++++++++++++++ .../mapper/wgz/WgzReissueacardMapper.xml | 24 +++++++ 26 files changed, 837 insertions(+), 68 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtDailyClockController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtReissueacardController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockUpdateDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationListDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationUpdateDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardListDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardUpdateDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockDetailVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockListVO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtDailyClockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtDailyClockController.java new file mode 100644 index 0000000..64877e2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtDailyClockController.java @@ -0,0 +1,66 @@ +package com.ruoyi.web.controller.bgt; + +import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO; +import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO; +import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO; +import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.wgz.service.IWgzDailyClockService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; + +/** + * 日报打卡Controller + * + * @author ruoyi + * @date 2025-02-18 + */ +@Api(value = "App包工头日报审核控制器", tags = {"App包工头日报审核"}) +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/app/bgt/clock") +public class AppBgtDailyClockController extends BaseController { + + private final IWgzDailyClockService iWgzDailyClockService; + + /** + * 查询日报打卡列表 + */ + @ApiOperation("查询日报打卡列表") + @GetMapping("/list") + public TableDataInfo list(@Validated BgtDailyClockListDTO dto) { + return iWgzDailyClockService.appQueryPageList(dto); + } + /** + * 获取日报打卡详细信息 + */ + @ApiOperation("获取日报打卡详细信息") + @GetMapping("/{id}") + public AjaxResult getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return AjaxResult.success(iWgzDailyClockService.appQueryById(id)); + } + + /** + * 修改日报打卡 + */ + @ApiOperation("已读和审批日报") + @Log(title = "已读和审批日报", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PutMapping() + public AjaxResult edit(@Validated @RequestBody BgtDailyClockUpdateDTO dto) { + return toAjax(iWgzDailyClockService.appUpdate(dto) ? 1 : 0); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java new file mode 100644 index 0000000..d381283 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java @@ -0,0 +1,67 @@ +package com.ruoyi.web.controller.bgt; + +import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO; +import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes; +import com.ruoyi.wgz.service.IWgzPayCalculationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; + +/** + * 工资结算Controller + * + * @author ruoyi + * @date 2025-02-21 + */ +@Api(value = "App包工头工资结算审核控制器", tags = {"App包工头工资结算审核"}) +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/app/bgt/calculation") +public class AppBgtPayCalculationController extends BaseController { + + private final IWgzPayCalculationService iWgzPayCalculationService; + + /** + * 查询工资结算列表 + */ + @ApiOperation("查询工资结算审核列表") + @GetMapping("/list") + public TableDataInfo list(@Validated BgtPayCalculationListDTO dto) { + return iWgzPayCalculationService.appQueryPageList(dto); + } + + /** + * 获取工资结算详细信息 + */ + @ApiOperation("获取工资结算详细信息") + @GetMapping("/{id}") + public AjaxResult getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return AjaxResult.success(iWgzPayCalculationService.appQueryById(id)); + } + + /** + * 修改工资结算 + */ + @ApiOperation("审核工资结算") + @Log(title = "审核工资结算", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PutMapping() + public AjaxResult edit(@Validated @RequestBody BgtPayCalculationUpdateDTO dto) { + return toAjax(iWgzPayCalculationService.appUpdate(dto) ? 1 : 0); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtReissueacardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtReissueacardController.java new file mode 100644 index 0000000..e260b46 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtReissueacardController.java @@ -0,0 +1,62 @@ +package com.ruoyi.web.controller.bgt; + +import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO; +import com.ruoyi.bgt.domain.dto.BgtReissueacardUpdateDTO; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes; +import com.ruoyi.wgz.domain.WgzReissueacard; +import com.ruoyi.wgz.service.IWgzReissueacardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; + +/** + * 补卡申请Controller + * + * @author ruoyi + * @date 2025-02-20 + */ +@Api(value = "App包工头补卡审批控制器", tags = {"App包工头补卡审批"}) +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/app/bgt/reissueacard") +public class AppBgtReissueacardController extends BaseController { + + private final IWgzReissueacardService iWgzReissueacardService; + + /** + * 查询补卡申请列表 + */ + @ApiOperation("查询补卡申请列表") + @GetMapping("/list") + public TableDataInfo list(@Validated BgtReissueacardListDTO dto) { + return iWgzReissueacardService.appQueryPageList(dto); + } + + + @ApiOperation("获取补卡申请详细信息") + @GetMapping("/{id}") + public AjaxResult getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return AjaxResult.success(iWgzReissueacardService.queryById(id)); + } + + @ApiOperation("补卡审核") + @Log(title = "补卡审核", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PutMapping() + public AjaxResult edit(@Validated @RequestBody BgtReissueacardUpdateDTO dto) { + return toAjax(iWgzReissueacardService.appUpdate(dto) ? 1 : 0); + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java new file mode 100644 index 0000000..c125743 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockListDTO.java @@ -0,0 +1,48 @@ +package com.ruoyi.bgt.domain.dto; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("App包工头看日报查询对象") +public class BgtDailyClockListDTO { + + /** 分页大小 */ + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("任务Id") + private Long taskId; + + @ApiModelProperty("招工ID") + private Long recruitId; + + @ApiModelProperty("审核状态（0未读 1未审核 2已审核）") + private String auditorType; + + @ApiModelProperty("日报时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate dilyTime; + + @ApiModelProperty("姓名") + private String username; + + @ApiModelProperty(value = "审核人Id",hidden = true) + private Long auditorUserId; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockUpdateDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockUpdateDTO.java new file mode 100644 index 0000000..290860c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtDailyClockUpdateDTO.java @@ -0,0 +1,25 @@ +package com.ruoyi.bgt.domain.dto; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("App包工头看已读和审批对象") +public class BgtDailyClockUpdateDTO { + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("审核状态（0未读 1未审核 2已审核）") + private String auditorType; + + @ApiModelProperty("审核意见") + private String auditorOpinion; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationListDTO.java new file mode 100644 index 0000000..ca2f4e9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationListDTO.java @@ -0,0 +1,45 @@ +package com.ruoyi.bgt.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * 工资结算分页查询对象 wgz_pay_calculation + * + * @author ruoyi + * @date 2025-02-21 + */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("包工头工资结算审核分页查询对象") +public class BgtPayCalculationListDTO { + + /** 分页大小 */ + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("任务Id") + private Long taskId; + + @ApiModelProperty("申请人名称") + private String userName; + + /** 审核状态（0未读 1待审核 2已同意 3已拒绝） */ + @ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）") + private List auditorTypes; + + @ApiModelProperty(value = "审核人Id",hidden = true) + private Long auditorUserId; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationUpdateDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationUpdateDTO.java new file mode 100644 index 0000000..511c47d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationUpdateDTO.java @@ -0,0 +1,32 @@ +package com.ruoyi.bgt.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +/** + * 工资结算分页查询对象 wgz_pay_calculation + * + * @author ruoyi + * @date 2025-02-21 + */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("包工头工资结算审核对象") +public class BgtPayCalculationUpdateDTO { + + @ApiModelProperty("主键自增ID") + private Long id; + /** 审核状态（0未读 1待审核 2已同意 3已拒绝） */ + @ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）") + private String auditorType; + + @ApiModelProperty("审核意见") + private String auditorOpinion; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardListDTO.java new file mode 100644 index 0000000..ba70f8e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardListDTO.java @@ -0,0 +1,42 @@ +package com.ruoyi.bgt.domain.dto; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("App包工头补卡记录查询对象") +public class BgtReissueacardListDTO { + + /** 分页大小 */ + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("任务ID") + private Long taskId; + + @ApiModelProperty("审核状态（0待审核 1审核中 2已同意 3已拒绝）") + private String auditorType; + + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate nowTime; + + @ApiModelProperty(value = "审核人Id",hidden = true) + private Long auditorUserId; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardUpdateDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardUpdateDTO.java new file mode 100644 index 0000000..dd1bc41 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtReissueacardUpdateDTO.java @@ -0,0 +1,24 @@ +package com.ruoyi.bgt.domain.dto; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("App包工头补卡审核对象") +public class BgtReissueacardUpdateDTO { + + + @ApiModelProperty("主键ID") + private Long id; + + @ApiModelProperty("审核状态（0待审核 1审核中 2已同意 3已拒绝）") + private String auditorType; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockDetailVO.java new file mode 100644 index 0000000..ccba905 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockDetailVO.java @@ -0,0 +1,72 @@ +package com.ruoyi.bgt.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("App包工头看日报视图对象") +public class BgtDailyClockDetailVO { + + @ApiModelProperty("主键") + private Long id; + + /** 项目ID */ + @ApiModelProperty("项目ID") + private Long recruitId; + /** 项目ID */ + @ApiModelProperty("招工主题") + private String recruitName; + /** 人员ID */ + @ApiModelProperty("人员ID") + private Long userId; + + @ApiModelProperty("头像地址") + private String avatarName; + + @ApiModelProperty("姓名") + private String username; + /** 日报时间 */ + @ApiModelProperty("日报时间") + private LocalDateTime dilyTime; + /** 日报标记 */ + @ApiModelProperty("日报标记") + private Integer dailyMark; + /** 日报位置 */ + @ApiModelProperty("日报位置") + private String pnchOsition; + /** 今日完成工作 */ + @ApiModelProperty("今日完成工作") + private String finishToday; + /** 未完成工作 */ + @ApiModelProperty("未完成工作") + private String unfinished; + /** 明日工作 */ + @ApiModelProperty("明日工作") + private String workTomorrow; + /** 协调与帮助 */ + @ApiModelProperty("协调与帮助") + private String coordinate; + /** 附件，多个逗号分隔 */ + @ApiModelProperty("附件，多个逗号分隔") + private String attachment; + /** 审核人ID */ + @ApiModelProperty("审核人ID") + private Long auditorUserId; + /** 审核状态（0未读 1未审核 2已审核） */ + @ApiModelProperty("审核状态（0未读 1未审核 2已审核）") + private String auditorType; + /** 审核意见 */ + @ApiModelProperty("审核意见") + private String auditorOpinion; + /** 已读|审核时间 */ + @ApiModelProperty("已读|审核时间") + private LocalDateTime auditorTime; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockListVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockListVO.java new file mode 100644 index 0000000..fae3ff3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtDailyClockListVO.java @@ -0,0 +1,37 @@ +package com.ruoyi.bgt.domain.vo; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("App包工头看日报视图对象") +public class BgtDailyClockListVO { + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("今日完成工作") + private String finishToday; + + @ApiModelProperty("审核状态（0未读 1未审核 2已审核）") + private String auditorType; + + @ApiModelProperty("日报时间") + private LocalDateTime dilyTime; + + @ApiModelProperty("头像地址") + private String avatarName; + + @ApiModelProperty("姓名") + private String username; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppApplyForPayrollSettlementListRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppApplyForPayrollSettlementListRes.java index 3b5be42..949f242 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppApplyForPayrollSettlementListRes.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppApplyForPayrollSettlementListRes.java @@ -1,9 +1,5 @@ package com.ruoyi.wgz.bo.res; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.wgz.domain.WgzPayCalculationFiles; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -74,6 +70,9 @@ public class WgzAppApplyForPayrollSettlementListRes implements Serializable { @ApiModelProperty("审核人ID") private Long auditorUserId; + @ApiModelProperty("审核人名字") + private String auditorUserName; + @ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）") private String auditorType; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzReplacementCardRecordRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzReplacementCardRecordRes.java index 8e5aaaf..c0a8e00 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzReplacementCardRecordRes.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzReplacementCardRecordRes.java @@ -17,6 +17,8 @@ import java.time.LocalDateTime; @ApiModel("补卡申请历史记录返回对象") public class WgzReplacementCardRecordRes implements Serializable { + @ApiModelProperty("主键ID") + private Long id; @ApiModelProperty("项目ID") private Long recruitId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzPayCalculation.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzPayCalculation.java index 7110ac7..b02521a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzPayCalculation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzPayCalculation.java @@ -1,21 +1,20 @@ package com.ruoyi.wgz.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; /** * 工资结算对象 wgz_pay_calculation @@ -77,6 +76,9 @@ public class WgzPayCalculation implements Serializable { @ApiModelProperty("进场时间") private LocalDate entryTime; + @ApiModelProperty("离场时间") + private LocalDate leaveTime; + /** 工资金额 */ @Excel(name = "工资金额") @ApiModelProperty("工资金额") @@ -112,6 +114,9 @@ public class WgzPayCalculation implements Serializable { @ApiModelProperty("审核人ID") private Long auditorUserId; + @ApiModelProperty("审核人名字") + private String auditorUserName; + /** 审核状态（0未读 1待审核 2已同意 3已拒绝） */ @Excel(name = "审核状态" , readConverterExp = "0=未读,1=待审核,2=已同意,3=已拒绝") @ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）") diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java index 612e07f..e16a0c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java @@ -1,13 +1,15 @@ package com.ruoyi.wgz.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO; +import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO; +import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; +import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq; -import com.ruoyi.wgz.bo.res.WgzAppLeaveHistoryListPageRes; import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.domain.WgzDailyClock; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; import org.apache.ibatis.annotations.CacheNamespace; +import org.apache.ibatis.annotations.Param; /** * 日报打卡Mapper接口 @@ -24,4 +26,6 @@ public interface WgzDailyClockMapper extends BaseMapperPlus { * @return 分页查询结果 */ Page userDailyRecordListPage(Page page); + + Page appQueryPageList(@Param("page") Page page, @Param("dto") BgtDailyClockListDTO dto); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzPayCalculationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzPayCalculationMapper.java index 916a835..565ff2c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzPayCalculationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzPayCalculationMapper.java @@ -1,13 +1,12 @@ package com.ruoyi.wgz.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq; -import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq; -import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes; -import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes; -import com.ruoyi.wgz.domain.WgzPayCalculation; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO; import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; +import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq; +import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes; +import com.ruoyi.wgz.domain.WgzPayCalculation; import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Param; @@ -21,4 +20,6 @@ import org.apache.ibatis.annotations.Param; @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class) public interface WgzPayCalculationMapper extends BaseMapperPlus { Page userApplyForPayrollSettlementList (@Param("page") Page page); + + Page appQueryPageList (@Param("page") Page page, @Param("dto") BgtPayCalculationListDTO dto); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzReissueacardMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzReissueacardMapper.java index ab73864..6658d31 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzReissueacardMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzReissueacardMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.wgz.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO; import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq; import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes; import com.ruoyi.wgz.domain.WgzReissueacard; @@ -24,4 +25,7 @@ public interface WgzReissueacardMapper extends BaseMapperPlus { * @return 分页查询结果 */ Page userReplacementCardRecordListPage(@Param("page") Page page,@Param("userId") Long userId); + + Page appQueryPageList(@Param("page") Page page,@Param("dto") BgtReissueacardListDTO dto); + } 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 0af06fb..b06b9b4 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,13 +1,17 @@ package com.ruoyi.wgz.service; +import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO; +import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO; +import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO; +import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO; +import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.wgz.bo.WgzDailyClockQueryBo; 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; -import com.ruoyi.wgz.bo.WgzDailyClockQueryBo; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; -import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.validation.annotation.Validated; import java.util.Collection; @@ -79,4 +83,22 @@ public interface IWgzDailyClockService extends IServicePlus { * 日报日历·查看日报 */ WgzDailyClock userCheckDailyNewspaper(Long id); + + + /** + * 查询列表 + */ + TableDataInfo appQueryPageList(BgtDailyClockListDTO dto); + + + /** + * 查询单个 + * @return + */ + BgtDailyClockDetailVO appQueryById(Long id); + + /** + * 查看和审核 + */ + Boolean appUpdate(BgtDailyClockUpdateDTO dto); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java index 6ddc7e5..bd11cf5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java @@ -1,12 +1,14 @@ package com.ruoyi.wgz.service; +import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO; +import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO; +import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo; import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq; import com.ruoyi.wgz.bo.req.WgzApplyForPayrollSettlementAddReq; import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes; import com.ruoyi.wgz.domain.WgzPayCalculation; -import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; -import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.validation.annotation.Validated; import java.util.Collection; @@ -79,4 +81,20 @@ public interface IWgzPayCalculationService extends IServicePlus appQueryPageList(BgtPayCalculationListDTO dto); + + /** + * 查询单个 + */ + WgzAppApplyForPayrollSettlementListRes appQueryById(Long id); + + /** + * 审核工资结算 + */ + Boolean appUpdate(BgtPayCalculationUpdateDTO dto); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java index 4828252..31d1e3f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java @@ -1,13 +1,14 @@ package com.ruoyi.wgz.service; -import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq; -import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq; -import com.ruoyi.wgz.bo.res.WgzAppCardReplacementApplicationRes; -import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes; -import com.ruoyi.wgz.domain.WgzReissueacard; -import com.ruoyi.wgz.bo.WgzReissueacardQueryBo; +import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO; +import com.ruoyi.bgt.domain.dto.BgtReissueacardUpdateDTO; import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.wgz.bo.WgzReissueacardQueryBo; +import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq; +import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq; +import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes; +import com.ruoyi.wgz.domain.WgzReissueacard; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; @@ -76,4 +77,14 @@ public interface IWgzReissueacardService extends IServicePlus { */ TableDataInfo userReplacementCardRecord(@Validated WgzAppReplacementCardRecordReq req); + /** + * 补卡记录审核(分页) + */ + TableDataInfo appQueryPageList(BgtReissueacardListDTO dto); + + /** + * 审核 + */ + Boolean appUpdate(BgtReissueacardUpdateDTO dto); + } 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 e75a820..d48aeef 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 @@ -2,27 +2,37 @@ package com.ruoyi.wgz.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.bgt.domain.BgtProjectRecruit; +import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO; +import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO; +import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO; +import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO; +import com.ruoyi.bgt.service.IBgtProjectRecruitService; +import com.ruoyi.bgt.service.IBgtUserService; +import com.ruoyi.common.core.domain.entity.BgtUser; +import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.wgz.bo.WgzDailyClockQueryBo; 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; -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.WgzDailyClockQueryBo; import com.ruoyi.wgz.domain.WgzDailyClock; import com.ruoyi.wgz.mapper.WgzDailyClockMapper; import com.ruoyi.wgz.service.IWgzDailyClockService; +import com.ruoyi.wgz.service.IWgzLeaveService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.temporal.TemporalAdjusters; import java.util.*; @@ -37,6 +47,12 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl appQueryPageList(BgtDailyClockListDTO dto) { + dto.setAuditorUserId(SecurityUtils.getAppUserId()); + Page queryDTOPage = new Page<>(); + queryDTOPage.setCurrent(dto.getPageNum()); + queryDTOPage.setSize(dto.getPageSize()); + Page queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto); + return PageUtils.buildDataInfo(queryVOPage); + } + + @Override + public BgtDailyClockDetailVO appQueryById(Long id) { + WgzDailyClock dailyClock = getById(id); + BgtDailyClockDetailVO detailVO = BeanUtil.copyProperties(dailyClock, BgtDailyClockDetailVO.class); + BgtUser bgtUser = userService.getById(dailyClock.getUserId()); + detailVO.setUsername(bgtUser.getUsername()); + detailVO.setAvatarName(bgtUser.getAvatarName()); + BgtProjectRecruit recruit = recruitService.getById(dailyClock.getRecruitId()); + detailVO.setRecruitName(recruit.getRecruitName()); + return detailVO; + } + + @Override + public Boolean appUpdate(BgtDailyClockUpdateDTO dto) { + WgzDailyClock dailyClock = BeanUtil.copyProperties(dto, WgzDailyClock.class); + dailyClock.setAuditorTime(LocalDateTime.now()); + return updateById(dailyClock); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java index a22980e..38a51c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java @@ -2,41 +2,38 @@ package com.ruoyi.wgz.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.bgt.domain.BgtProjectRecruit; import com.ruoyi.bgt.domain.BgtProjectRecruitApply; +import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO; +import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; import com.ruoyi.bgt.service.IBgtProjectRecruitService; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.domain.Annex; -import com.ruoyi.common.domain.dto.AnnexDTO; -import com.ruoyi.common.service.IAnnexService; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.core.page.PagePlus; +import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo; import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq; -import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq; import com.ruoyi.wgz.bo.req.WgzApplyForPayrollSettlementAddReq; import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes; +import com.ruoyi.wgz.domain.WgzPayCalculation; +import com.ruoyi.wgz.domain.WgzPayCalculationFiles; +import com.ruoyi.wgz.mapper.WgzPayCalculationMapper; import com.ruoyi.wgz.service.IWgzPayCalculationFilesService; +import com.ruoyi.wgz.service.IWgzPayCalculationService; import org.springframework.beans.BeanUtils; 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.WgzPayCalculationQueryBo; -import com.ruoyi.wgz.domain.WgzPayCalculation; -import com.ruoyi.wgz.mapper.WgzPayCalculationMapper; -import com.ruoyi.wgz.service.IWgzPayCalculationService; import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.reactive.TransactionalOperator; -import java.util.ArrayList; +import java.time.LocalDateTime; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 工资结算Service业务层处理 @@ -172,4 +169,28 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl appQueryPageList(BgtPayCalculationListDTO dto) { + dto.setAuditorUserId(SecurityUtils.getAppUserId()); + Page pe = new Page<>(); + pe.setCurrent(dto.getPageNum()); + pe.setSize(dto.getPageSize()); + return PageUtils.buildDataInfo(baseMapper.appQueryPageList(pe,dto)); + } + + @Override + public WgzAppApplyForPayrollSettlementListRes appQueryById(Long id) { + WgzPayCalculation payCalculation = getById(id); + WgzAppApplyForPayrollSettlementListRes res = BeanUtil.copyProperties(payCalculation, WgzAppApplyForPayrollSettlementListRes.class); + List list = iWgzPayCalculationFilesService.list(Wrappers.lambdaQuery().eq(WgzPayCalculationFiles::getCalculationId, id)); + res.setPayCalculation(list); + return res; + } + + @Override + public Boolean appUpdate(BgtPayCalculationUpdateDTO dto) { + WgzPayCalculation payCalculation = BeanUtil.copyProperties(dto, WgzPayCalculation.class); + payCalculation.setAuditorTime(LocalDateTime.now()); + return updateById(payCalculation); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java index 0745042..9f14e18 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java @@ -2,35 +2,36 @@ package com.ruoyi.wgz.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.bgt.domain.BgtProjectRecruit; import com.ruoyi.bgt.domain.BgtProjectRecruitApply; +import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO; +import com.ruoyi.bgt.domain.dto.BgtReissueacardUpdateDTO; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; import com.ruoyi.bgt.service.IBgtProjectRecruitService; -import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq; +import com.ruoyi.wgz.bo.WgzReissueacardQueryBo; import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq; -import com.ruoyi.wgz.bo.res.WgzAppCardReplacementApplicationRes; +import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq; import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes; import com.ruoyi.wgz.domain.WgzAttendance; -import com.ruoyi.wgz.service.IWgzAttendanceService; -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.WgzReissueacardQueryBo; import com.ruoyi.wgz.domain.WgzReissueacard; import com.ruoyi.wgz.mapper.WgzReissueacardMapper; +import com.ruoyi.wgz.service.IWgzAttendanceService; import com.ruoyi.wgz.service.IWgzReissueacardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.format.DateTimeFormatter; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; import java.util.Objects; /** @@ -170,4 +171,17 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl appQueryPageList(BgtReissueacardListDTO dto) { + dto.setAuditorUserId(SecurityUtils.getAppUserId()); + Page queryDTOPage = new Page<>(); + queryDTOPage.setCurrent(dto.getPageNum()); + queryDTOPage.setSize(dto.getPageSize()); + return PageUtils.buildDataInfo(baseMapper.appQueryPageList(queryDTOPage,dto)); + } + + @Override + public Boolean appUpdate(BgtReissueacardUpdateDTO dto) { + return updateById(BeanUtil.copyProperties(dto,WgzReissueacard.class)); + } } diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml index 5ececce..68cb9a3 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml @@ -47,5 +47,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.id DESC + + diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml index 47d3e15..fa2e984 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml @@ -137,4 +137,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml index da68de2..bf89c75 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml @@ -42,4 +42,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.id DESC + + +