From 10db6568fc077a40fb19608310e0b45e9c3295d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Sat, 22 Feb 2025 16:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E3=80=90=E6=88=91=E7=9A=84?= =?UTF-8?q?=C2=B7=E5=B7=A5=E8=B5=84=E7=BB=93=E7=AE=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=91=E6=9D=BF=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgz/controller/WgzAppController.java | 9 ++++++--- .../mapper/BgtProjectRecruitApplyMapper.java | 2 +- .../BgtProjectRecruitApplyServiceImpl.java | 4 ++-- ...gzAppApplyForPayrollSettlementListReq.java | 2 +- .../ruoyi/wgz/bo/req/WgzAppUnderwayReq.java | 7 +++++++ .../WgzApplyForPayrollSettlementAddReq.java | 3 +++ ...gzAppApplyForPayrollSettlementListRes.java | 3 +++ .../ruoyi/wgz/bo/res/WgzAppUnderwayRes.java | 14 +++++++++++-- .../bgt/BgtProjectRecruitApplyMapper.xml | 20 +++++++++++++++---- .../mapper/wgz/WgzPayCalculationMapper.xml | 19 +++++++++++++++++- 10 files changed, 69 insertions(+), 14 deletions(-) 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 61f3494..3617df1 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 @@ -366,8 +366,9 @@ public class WgzAppController { /** * 【首页】【项目进行中】 项目进行中（分页，但是理论上这里始终只会有一条数据） + * 【首页】【已完成项目】 已完成项目 */ - @ApiOperation("【首页】【项目进行中】 项目进行中") + @ApiOperation("【首页】【项目进行中|已完成项目】 项目进行中") @PreAuthorize("@ss.hasPermi('wgzApp:user:userUnderway')") @GetMapping("/WgzAppUserUnderway") public TableDataInfo userUnderway(@Validated WgzAppUnderwayReq req) { @@ -376,8 +377,9 @@ public class WgzAppController { /** * 【首页】【项目进行中】 项目进行中·详情 + * 【首页】【已完成项目】 已完成项目·详情 */ - @ApiOperation("【首页】【项目进行中】 项目进行中·详情") + @ApiOperation("【首页】【项目进行中|已完成项目】 详情") @PreAuthorize("@ss.hasPermi('wgzApp:user:userProjectInProgressDetails')") @GetMapping("/WgzAppUserProjectInProgressDetails/{id}") public AjaxResult userProjectInProgressDetails(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -420,8 +422,9 @@ public class WgzAppController { /** * 【首页】【项目进行中】 项目进行中·申请工资结算（新增） + * 【首页】【已完成项目】 已完成项目·申请工资结算（新增） */ - @ApiOperation("【首页】【项目进行中】 项目进行中·申请工资结算（新增）") + @ApiOperation("【首页】【项目进行中|已完成项目】 申请工资结算（新增）") @PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementAdd')") @PostMapping("/WgzAppUserApplyForPayrollSettlementAdd") public AjaxResult userApplyForPayrollSettlementAdd(@Validated @RequestBody WgzApplyForPayrollSettlementAddReq req) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java index 1b5d987..4de516f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java @@ -29,5 +29,5 @@ public interface BgtProjectRecruitApplyMapper extends BaseMapperPlus todayAttendanceList(@Param("dto") BgtAttendanceDayDTO dto); // 获取指定项目下的所有成员(分页) - Page underwayPage (@Param("page") Page page, @Param("userId") Long userId); + Page underwayPage (@Param("page") Page page); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java index 7a69a65..6221ef6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java @@ -226,11 +226,11 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl userUnderway(WgzAppUnderwayReq req) { - Long userId = SecurityUtils.getAppUserId(); + req.setUserId(SecurityUtils.getAppUserId()); Page pe = new Page<>(); pe.setCurrent(req.getPageNum()); pe.setSize(req.getPageSize()); - return PageUtils.buildDataInfo(baseMapper.underwayPage(pe, userId)); + return PageUtils.buildDataInfo(baseMapper.underwayPage(pe)); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppApplyForPayrollSettlementListReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppApplyForPayrollSettlementListReq.java index 084da06..6a294a1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppApplyForPayrollSettlementListReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppApplyForPayrollSettlementListReq.java @@ -14,6 +14,6 @@ import java.io.Serializable; @Accessors(chain = true) @ApiModel("申请工资结算（列表）请求对象") public class WgzAppApplyForPayrollSettlementListReq extends PageReq { - @ApiModelProperty("0已结算 1未结算") + @ApiModelProperty("0申请中 1已结算 2未通过 3未结算（申请中+未通过）") private String auditorType; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUnderwayReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUnderwayReq.java index d813672..23ac92c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUnderwayReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUnderwayReq.java @@ -3,6 +3,7 @@ package com.ruoyi.wgz.bo.req; import com.ruoyi.common.bo.PageReq; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.Hidden; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -16,5 +17,11 @@ import java.time.LocalDateTime; @Accessors(chain = true) @ApiModel("项目进行中请求对象") public class WgzAppUnderwayReq extends PageReq { + @ApiModelProperty("招工ID") + private String type; + + @ApiModelProperty("务工者唯一标识") + @Hidden + private Long userId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzApplyForPayrollSettlementAddReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzApplyForPayrollSettlementAddReq.java index 592116b..c44e7e8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzApplyForPayrollSettlementAddReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzApplyForPayrollSettlementAddReq.java @@ -49,6 +49,9 @@ public class WgzApplyForPayrollSettlementAddReq implements Serializable { @ApiModelProperty("进场时间") private LocalDate entryTime; + @ApiModelProperty("退场时间（注意：完成项目才填写退场时间）") + private LocalDate leaveTime; + @ApiModelProperty("工资金额") private BigDecimal recruitAmount; 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 a38091d..3b5be42 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 @@ -50,6 +50,9 @@ public class WgzAppApplyForPayrollSettlementListRes implements Serializable { @ApiModelProperty("进场时间") private LocalDate entryTime; + @ApiModelProperty("退场时间") + private LocalDate leaveTime; + @ApiModelProperty("工资金额") private BigDecimal recruitAmount; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUnderwayRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUnderwayRes.java index 4276642..4c57a5e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUnderwayRes.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUnderwayRes.java @@ -8,6 +8,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; @Data @@ -49,7 +50,16 @@ public class WgzAppUnderwayRes implements Serializable { @ApiModelProperty("招工要求") private String recruitRequirement; - @ApiModelProperty("已报名数量") - private Integer numberOfRegistered; + @ApiModelProperty("发布时间") + private LocalDateTime taskCreateTime; + + @ApiModelProperty("进场时间") + private LocalDate entryTime; + + @ApiModelProperty("离场时间") + private LocalDate leaveTime; + +// @ApiModelProperty("已报名数量") +// private Integer numberOfRegistered; } diff --git a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml index 6affe34..94d541b 100644 --- a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml @@ -80,19 +80,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml index 55f6afd..47d3e15 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml @@ -113,9 +113,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.update_time AS file_update_time, f.remark AS file_remark FROM - your_main_table w + wgz_pay_calculation w LEFT JOIN wgz_pay_calculation_files f ON w.id = f.calculation_id + + + + AND w.auditor_type in ('0', '1') and + + + AND w.auditor_type = '2' and + + + AND w.auditor_type = '3' and + + + AND w.auditor_type = in ('0', '1','3') and + + + w.del_flag = 0 +