diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 2caa253..154663a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -134,6 +134,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 添加CORS filter httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class); httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class); +// httpSecurity.sessionManagement().maximumSessions(1) +// .maxSessionsPreventsLogin(true); // 禁止后来者登录 } 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 index 511c47d..7704e57 100644 --- 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 @@ -1,11 +1,14 @@ package com.ruoyi.bgt.domain.dto; +import com.ruoyi.wgz.domain.WgzPayCalculationFiles; 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 * @@ -28,5 +31,7 @@ public class BgtPayCalculationUpdateDTO { @ApiModelProperty("审核意见") private String auditorOpinion; + @ApiModelProperty("附件实体数据") + private List payCalculation; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtPayCalculationDetailBaseVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtPayCalculationDetailBaseVO.java index 264a5b5..05ac993 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtPayCalculationDetailBaseVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtPayCalculationDetailBaseVO.java @@ -56,5 +56,6 @@ public class BgtPayCalculationDetailBaseVO { private Long taskId; @ApiModelProperty("务工者Id") + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long userId; } 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 084a91f..8e38122 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 @@ -682,7 +682,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl list = baseMapper.selectList(Wrappers.lambdaQuery() - .eq(BgtProjectRecruitApply::getRemark, recruitId) + .eq(BgtProjectRecruitApply::getRecruitId, recruitId) .eq(BgtProjectRecruitApply::getUserId, userId) .in(BgtProjectRecruitApply::getStatus, RecruitApplyStatus.getWorkStatus()) .orderByDesc(BgtProjectRecruitApply::getCreateTime)); 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 adf1b55..0b69177 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 @@ -26,6 +26,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.AuditStatus; +import com.ruoyi.common.exception.BaseException; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.fbs.domain.FbsProjectTask; @@ -402,6 +403,10 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl mp = new HashMap<>(); @@ -525,6 +530,15 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl files = dto.getPayCalculation(); + if(CollectionUtil.isNotEmpty(files)){ + files.forEach(file -> { + file.setCalculationId(payCalculation.getId()); + }); + iWgzPayCalculationFilesService.saveBatch(files); + } return save; } @@ -562,9 +576,18 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl - and (wa.late = 1 or wa.early_leave = 1 or wa.missed_in = 1 or wa.missed_out = 1) and leave_mark_id is null + and (wa.late = 1 or wa.early_leave = 1 or wa.clock_in_time is null or wa.clock_out_time is null) and leave_mark_id is null and wa.leave_mark_id = 1 diff --git a/ruoyi-ui/src/api/bgt/user.js b/ruoyi-ui/src/api/bgt/user.js new file mode 100644 index 0000000..a5decf6 --- /dev/null +++ b/ruoyi-ui/src/api/bgt/user.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询APP包工头列表 +export function listUser(query) { + return request({ + url: '/bgt/user/list', + method: 'get', + params: query + }) +} + +// 查询APP包工头详细 +export function getUser(id) { + return request({ + url: '/bgt/user/' + id, + method: 'get' + }) +} + +// 新增APP包工头 +export function addUser(data) { + return request({ + url: '/bgt/user', + method: 'post', + data: data + }) +} + +// 修改APP包工头 +export function updateUser(data) { + return request({ + url: '/bgt/user', + method: 'put', + data: data + }) +} + +// 删除APP包工头 +export function delUser(id) { + return request({ + url: '/bgt/user/' + id, + method: 'delete' + }) +} + +// 导出APP包工头 +export function exportUser(query) { + return request({ + url: '/bgt/user/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/bgt/user/index.vue b/ruoyi-ui/src/views/bgt/user/index.vue new file mode 100644 index 0000000..c27085a --- /dev/null +++ b/ruoyi-ui/src/views/bgt/user/index.vue @@ -0,0 +1,582 @@ + + +