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 d47ba0a..df8b1e2 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 @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.wgz.controller; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.bgt.domain.BgtProjectRecruit; import com.ruoyi.bgt.domain.BgtProjectRecruitApply; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; @@ -23,6 +24,7 @@ import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo; import com.ruoyi.wgz.bo.rests.WgzAutonymAnnex; import com.ruoyi.wgz.bo.req.*; + import com.ruoyi.wgz.domain.WgzAttendance; import com.ruoyi.wgz.domain.WgzPayCalculation; import com.ruoyi.wgz.domain.WgzQuestionsConfiguration; import com.ruoyi.wgz.service.*; @@ -420,19 +422,29 @@ */ @ApiOperation("【首页】【项目进行中|已完成项目】 详情") //@PreAuthorize("@ss.hasPermi('wgzApp:user:userProjectInProgressDetails')") - @GetMapping("/WgzAppUserProjectInProgressDetails/{id}") - public AjaxResult userProjectInProgressDetails(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { + @GetMapping("/WgzAppUserProjectInProgressDetails/{recruitApplyId}") + public AjaxResult userProjectInProgressDetails(@NotNull(message = "主键不能为空") @PathVariable("recruitApplyId") Long recruitApplyId) { WgzApplyForPayrollSettlementAddRes res = new WgzApplyForPayrollSettlementAddRes(); Long appUserId = SecurityUtils.getAppUserId(); - BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId); - BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId()); +// BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId); + BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.getById(recruitApplyId); +// BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId()); //1、先获取项目详情基本信息 - WgzAppProjectDetailsRes wgzAppProjectDetailsRes = iBgtProjectRecruitService.userProjectDetails(id); - BeanUtils.copyProperties(wgzAppProjectDetailsRes, res); + WgzAppProjectDetailsRes appById = iBgtProjectRecruitService.userProjectDetails(by.getRecruitId()); + BeanUtils.copyProperties(appById, res); //2、获取当前人员的打卡天数*单天金额=实际总工资金额 BigDecimal recruitAmount = appById.getRecruitAmount(); //查询实际考勤时间（只要有打卡就算出勤一条，异常也视为正常出勤,也就是说只要有上班or下班至少有一个有数据，那就证明出勤ok） - Integer i = iWgzAttendanceService.attendanceDetail(appUserId, appById.getId(), null); + int i = iWgzAttendanceService.count( + new LambdaQueryWrapper(). + eq(WgzAttendance::getUserId, appUserId). + eq(WgzAttendance::getRecruitId, appById.getId()).and(wrapper -> wrapper + .isNotNull(WgzAttendance::getClockInTime) + .or() + .isNotNull(WgzAttendance::getClockOutTime) + ) + ); +// Integer i = iWgzAttendanceService.attendanceDetail(appUserId, appById.getId(), null); if (i==0){ res.setNum(0); res.setTotalAmount(BigDecimal.valueOf(0)); @@ -443,7 +455,7 @@ } res.setEntryTime(by.getEntryTime()). setLeaveTime(by.getLeaveTime()). - setAmount(recruitAmount); + setAmount(appById.getRecruitAmount()); //3、查询当前进行中的项目是否有工资结算(多次追加) List gzs = iWgzPayCalculationService.findByUserIdRecruitIdNewestData(appUserId, appById.getId()); if (gzs.isEmpty()){ @@ -482,7 +494,7 @@ */ @ApiOperation("【首页】【项目进行中】 项目进行中·申请工资结算（列表）") //@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementList')") - @GetMapping("/WgzAppUserApplyForPayrollSettlementList") +// @GetMapping("/WgzAppUserApplyForPayrollSettlementList") public TableDataInfo userApplyForPayrollSettlementList(@Validated WgzAppApplyForPayrollSettlementListReq req) { return iWgzPayCalculationService.userApplyForPayrollSettlementList(req); } @@ -493,8 +505,7 @@ */ @ApiOperation("【首页】【项目进行中|已完成项目】 申请工资结算（详情）") //@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementDetails')") - @RepeatSubmit - @PostMapping("/WgzAppUserApplyForPayrollSettlementDetails/{messageId}") + @GetMapping("/WgzAppUserApplyForPayrollSettlementDetails/{id}") public AjaxResult userApplyForPayrollSettlementDetails(@NotNull(message = "主键ID不能为空") @PathVariable("id") Long id) { return AjaxResult.success(iWgzPayCalculationService.userApplyForPayrollSettlementDetails(id)); } 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 73405c4..ede47fc 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 @@ -368,7 +368,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl 0) { - SysDictData typeOfWork = dictTypeService.selectDictDataByTypeAndData("type_of_work", byId.getTypeOfWork()); + SysDictData typeOfWork = dictTypeService.selectDictDataByTypeAndData("type_of_work", appById.getTypeOfWork()); Map mp = new HashMap<>(); mp.put("projectName", appById.getRecruitName()); mp.put("userName", byId.getUsername()); @@ -634,9 +634,9 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl implem Annex annex = baseMapper.selectById(id); //2、删除对应的数据，并删除相对应的资源 if (baseMapper.deleteById(id)>0){ - boolean b = fileDeletionService.deleteFileByPath(annex.getAnnexUrl()); + String s = annex.getAnnexUrl().replaceAll("/profile", "ruoyi/uploadPath"); + boolean b = fileDeletionService.deleteFileByPath(s); if(!b){ throw new RuntimeException("附件删除失败！"); } 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 6a294a1..65b0140 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 @@ -7,6 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import javax.validation.constraints.Min; import java.io.Serializable; @Data @@ -14,6 +15,9 @@ import java.io.Serializable; @Accessors(chain = true) @ApiModel("申请工资结算（列表）请求对象") public class WgzAppApplyForPayrollSettlementListReq extends PageReq { - @ApiModelProperty("0申请中 1已结算 2未通过 3未结算（申请中+未通过）") + @ApiModelProperty(value = "用户id",hidden = true) + private Long userId; + + @ApiModelProperty("0申请中 1已通过 2未通过 3全部") private String auditorType; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java index 9ce35fa..a6e8c22 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyRecordReq.java @@ -21,7 +21,10 @@ public class WgzAppDailyRecordReq extends PageReq { @ApiModelProperty(value = "0正常 1补卡 2全部 ") private String types; - @ApiModelProperty(value = "日期（格式：年-月-日）") + @ApiModelProperty(value = "日期（格式：年-月-日）,不填查全部") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate rq; + + @ApiModelProperty(value = "招工ID，不填查全部") + private Long recruitId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppLeaveHistoryListPageReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppLeaveHistoryListPageReq.java index d426930..24eb42e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppLeaveHistoryListPageReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppLeaveHistoryListPageReq.java @@ -2,9 +2,13 @@ package com.ruoyi.wgz.bo.req; 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 org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; @Data @@ -13,4 +17,13 @@ import lombok.experimental.Accessors; @ApiModel("请假·历史请假记录请求对象") public class WgzAppLeaveHistoryListPageReq extends PageReq { + @ApiModelProperty(value = "当前用户ID",hidden = true) + private Long userId; + + @ApiModelProperty(value = "招工ID，不填查全部") + private Long recruitId; + + @ApiModelProperty(value = "日期（格式：年-月-日）,不填查全部") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate rq; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java index f877614..00b5256 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java @@ -74,6 +74,7 @@ public class WgzAppRealNameAuthenticationReq implements Serializable { // private List annex; @ApiModelProperty("工种，多个逗号分隔") + @NotBlank(message = "工种不能为空") private String typeOfWork; } 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 2e48890..bf0c3e1 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 @@ -25,6 +25,9 @@ public class WgzAppUnderwayRes implements Serializable { @ApiModelProperty("项目ID") private Long projectId; + @ApiModelProperty("招工申请ID") + private Long recruitApplyId; + @ApiModelProperty("招工名称") private String recruitName; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java index 75f8855..74cc6cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java @@ -110,7 +110,7 @@ public class WgzApplyForPayrollSettlementAddRes implements Serializable { private Integer num; @ApiModelProperty("总的金额") - private BigDecimal TotalAmount; + private BigDecimal totalAmount; //--------- //--------- diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzLeaveMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzLeaveMapper.java index 89e9b83..59625bd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzLeaveMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzLeaveMapper.java @@ -28,7 +28,7 @@ public interface WgzLeaveMapper extends BaseMapperPlus { * @param page 分页对象 * @return 分页查询结果 */ - Page userLeaveHistoryListPage(@Param("page") Page page); + Page userLeaveHistoryListPage(@Param("page") Page page,@Param("req") WgzAppLeaveHistoryListPageReq req); @Select("SELECT\n" + 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 565ff2c..3cfc742 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 @@ -19,7 +19,7 @@ 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 userApplyForPayrollSettlementList (@Param("page") Page page,@Param("req") WgzAppApplyForPayrollSettlementListReq req); Page appQueryPageList (@Param("page") Page page, @Param("dto") BgtPayCalculationListDTO dto); } 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 893957f..4389a73 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 @@ -225,10 +225,11 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl userLeaveHistoryListPage(WgzAppLeaveHistoryListPageReq req) { + req.setUserId(SecurityUtils.getAppUserId()); Page queryDTOPage = new Page<>(); queryDTOPage.setCurrent(req.getPageNum()); queryDTOPage.setSize(req.getPageSize()); - return PageUtils.buildDataInfo(baseMapper.userLeaveHistoryListPage(queryDTOPage)); + return PageUtils.buildDataInfo(baseMapper.userLeaveHistoryListPage(queryDTOPage,req)); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java index 59127da..ba23460 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java @@ -3,6 +3,7 @@ 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.mapper.BgtProjectRecruitMapper; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; @@ -36,12 +37,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.wgz.bo.WgzMessageQueryBo; import com.ruoyi.wgz.mapper.WgzMessageMapper; import com.ruoyi.wgz.service.IWgzMessageService; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - import java.time.LocalDate; import java.util.*; +import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.*; + /** * 消息Service业务层处理 * @@ -69,6 +69,9 @@ public class WgzMessageServiceImpl extends ServicePlusImpl mp = new HashMap<>(); -// List list = new ArrayList<>(); //1、获取字典类型 List data = dictTypeService.selectDictDataByType("message_large_type"); for (SysDictData datum : data) { - //2、统计数据 + //1-2、统计数据 LambdaQueryWrapper wp = new LambdaQueryWrapper(). eq(WgzMessage::getRecipientId, id). eq(WgzMessage::getRecipientType, "1"). @@ -161,7 +167,17 @@ public class WgzMessageServiceImpl extends ServicePlusImpl(). + eq(WgzMessage::getSenderType, USERTYPE_BGT). + eq(WgzMessage::getSenderId, appById.getUserId()). + eq(WgzMessage::getRecipientType, USERTYPE_WGZ). + eq(WgzMessage::getRecipientId, appUserId). + eq(WgzMessage::getIsOperation, "1") + ); + mp.put("daiban",daiBanCount); + return res.setMp(mp); } @Override @@ -172,6 +188,10 @@ public class WgzMessageServiceImpl extends ServicePlusImpl queryDTOPage = new Page<>(); queryDTOPage.setCurrent(req.getPageNum()); queryDTOPage.setSize(req.getPageSize()); + //0、待办的查询 + if (req.getLargeType().equals("daiban")){ + + } //1、分页查询出所有的小类型，然后循环查询小类型对应标题数据 if(req.getLargeType() !=null && req.getLargeType().equals("3") && req.getSmallType()==null){ Page pe = baseMapper.pagingQueryTheMessageList(queryDTOPage, req); 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 ee07754..5a0b12f 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 @@ -179,7 +179,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl attWra = new LambdaQueryWrapper(). eq(WgzAttendance::getUserId, user.getUserId()). @@ -219,13 +219,15 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl { - data.setCalculationId(wgzPayCalculation.getId()); - }); - boolean fjSave = iWgzPayCalculationFilesService.saveBatch(req.getPayCalculation()); - if (!fjSave) { - throw new RuntimeException("附件新增失败！"); + List payCalculation = req.getPayCalculation(); + if(payCalculation!=null){ + req.getPayCalculation().forEach(data -> { + data.setCalculationId(wgzPayCalculation.getId()); + }); + boolean fjSave = iWgzPayCalculationFilesService.saveBatch(req.getPayCalculation()); + if (!fjSave) { + throw new RuntimeException("附件新增失败！"); + } } //5、将修改标识符的数据存放到中间表 @@ -354,10 +356,13 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl userApplyForPayrollSettlementList(WgzAppApplyForPayrollSettlementListReq req) { + //1、获取当前人 + Long appUserId = SecurityUtils.getAppUserId(); + req.setUserId(appUserId); Page pe = new Page<>(); pe.setCurrent(req.getPageNum()); pe.setSize(req.getPageSize()); - return PageUtils.buildDataInfo(baseMapper.userApplyForPayrollSettlementList(pe)); + return PageUtils.buildDataInfo(baseMapper.userApplyForPayrollSettlementList(pe,req)); } @Override 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 d526ea6..3a3ca4c 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 @@ -206,7 +206,15 @@ public class WgzUserServiceImpl extends ServicePlusImpl if(!ValidUtil.isValidBankCard(req.getCardNo())){ throw new RuntimeException("请检查银行卡！"); } - + //0、查询当前用户是否实名了，如若已实名就无法再次实名 + Integer count = baseMapper.selectCount( + new LambdaQueryWrapper() + .eq(WgzUser::getUserId, req.getUserId()) + .isNotNull(WgzUser::getIdentityCard) + ); + if (count>0){ + throw new RuntimeException("当前用户已实名！"); + } //1、对指定用户进行实名认证 WgzUser user = new WgzUser(); BeanUtils.copyProperties(req, user); diff --git a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml index 57e1e5a..2de02f1 100644 --- a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml @@ -143,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT a.entry_time, a.leave_time, + a.id as recruitApplyId, b.*, c.task_name, c.task_address, diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml index 72ca36d..28ec843 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml @@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.status = #{req.types} and + + a.recruit_id = #{req.recruitId} and + a.del_flag = 0 ORDER BY a.id DESC diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml index 77066d3..52e7f0d 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml @@ -34,8 +34,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM wgz_leave a LEFT JOIN bgt_user b ON (a.auditor_user_id = b.user_id and b.del_flag = 0) - WHERE - a.del_flag = 0 + + a.user_id = #{req.userId} + and a.del_flag = 0 + + and a.recruit_id = #{req.recruitId} + + + and DATE_FORMAT(a.create_time,'%Y-%m-%d') = #{req.rq} + + ORDER BY 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 bc851cc..db31a1f 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml @@ -118,19 +118,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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.user_id = #{req.userId} and w.del_flag = 0