zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分包商

Browse Source
This commit is contained in:
zt
2025-03-28 10:38:49 +08:00
parent e35e17df3e
commit 14ed939008
16 changed files with 249 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectTaskProgressAuditDTO.java Normal file
View File

@ -0,0 +1,31 @@
package com.ruoyi.fbs.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 FbsProjectTaskProgressAuditDTO {
@ApiModelProperty("主键自增ID")
private Long id;
@ApiModelProperty("审核状态（1审核中 2已审核 3未审核）")
private String auditStatus;
@ApiModelProperty("审核意见")
private String auditOpinion;
}

19
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java Normal file
View File

@ -0,0 +1,19 @@
package com.ruoyi.fbs.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("分包商任务切换列表查询条件")
public class FbsTaskSwitchListDTO {
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
@ApiModelProperty("任务名")
private String taskName;
}

9
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java
View File

@ -11,6 +11,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.fbs.bo.FbsProjectTaskQueryBo;
import com.ruoyi.fbs.domain.FbsProjectTask;
import com.ruoyi.fbs.domain.dto.FbsTaskListDTO;
import com.ruoyi.fbs.domain.dto.FbsTaskSwitchListDTO;
import com.ruoyi.fbs.domain.vo.*;
import java.util.Collection;
@ -116,7 +117,13 @@ public interface IFbsProjectTaskService extends IServicePlus<FbsProjectTask> {
TableDataInfo<FbsProjectTaskListVO> fbsPageList(FbsTaskListDTO dto);
/**
* 任务详情-结算
* 分包商查询任务详情-工资结算审批
*/
FbsTaskDetailWageVO fbsWage(Long id);
/**
* 分包商查询任务详情-任务切换列表
*/
TableDataInfo<FbsProjectTaskListVO> switchList(FbsTaskSwitchListDTO dto);
}

17
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java
View File

@ -28,6 +28,7 @@ import com.ruoyi.fbs.bo.FbsProjectTaskQueryBo;
import com.ruoyi.fbs.domain.FbsProjectTask;
import com.ruoyi.fbs.domain.dto.FbsTaskApplyListDTO;
import com.ruoyi.fbs.domain.dto.FbsTaskListDTO;
import com.ruoyi.fbs.domain.dto.FbsTaskSwitchListDTO;
import com.ruoyi.fbs.domain.vo.*;
import com.ruoyi.fbs.mapper.FbsProjectTaskMapper;
import com.ruoyi.fbs.service.IFbsProjectTaskApplyService;
@ -356,4 +357,20 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
fbsTaskDetailWageVO.setTaskApplyAmount(taskApplyAmount);
return fbsTaskDetailWageVO;
}
@Override
public TableDataInfo<FbsProjectTaskListVO> switchList(FbsTaskSwitchListDTO dto) {
LambdaQueryWrapper<FbsProjectTask> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FbsProjectTask::getCreateId,SecurityUtils.getAppUserId());
wrapper.like(StrUtil.isNotBlank(dto.getTaskName()),FbsProjectTask::getTaskName,dto.getTaskName());
wrapper.orderByDesc(FbsProjectTask::getId);
Page<FbsProjectTask> page = page(PageUtils.buildPage(), wrapper);
Page<FbsProjectTaskListVO> fbsProjectTaskListVOPage = new Page<>();
fbsProjectTaskListVOPage.setTotal(page.getTotal());
List<FbsProjectTaskListVO> fbsProjectTaskListVOS = BeanUtil.copyToList(page.getRecords(), FbsProjectTaskListVO.class);
fbsProjectTaskListVOPage.setRecords(fbsProjectTaskListVOS);
return PageUtils.buildDataInfo(fbsProjectTaskListVOPage);
}
}