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-02-27 15:58:23 +08:00
parent f044bc2bd0
commit be3f814cda
17 changed files with 130 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectTaskProgress.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.bgt.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -79,6 +80,7 @@ public class BgtProjectTaskProgress implements Serializable {
private String uploader;
@ApiModelProperty("上传时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime uploadTime;
/** 进度 */

4
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtMessageDetailDTO.java
View File

@ -20,9 +20,7 @@ import java.time.LocalDate;
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("其他消息查询对象")
public class BgtMessageDetailDTO implements Serializable {
private static final long serialVersionUID=1L;
public class BgtMessageDetailDTO {
/** 分页大小 */
@ApiModelProperty("分页大小")

6
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtMessageMyListDTO.java
View File

@ -6,8 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 消息对象 bgt_message
*
@ -18,9 +16,7 @@ import java.io.Serializable;
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("消息列表查询对象")
public class BgtMessageMyListDTO implements Serializable {
private static final long serialVersionUID=1L;
public class BgtMessageMyListDTO {
/** 分页大小 */
@ApiModelProperty("分页大小")

5
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectRecruitApplyConsentDTO.java
View File

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;
@ -17,9 +16,7 @@ import java.util.List;
*/
@Data
@ApiModel("包工头同意申请对象")
public class BgtProjectRecruitApplyConsentDTO implements Serializable {
private static final long serialVersionUID=1L;
public class BgtProjectRecruitApplyConsentDTO{
/** 主键ID */
@ApiModelProperty("主键ID")

44
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectRecruitQueryDTO.java
View File

@ -1,10 +1,8 @@
package com.ruoyi.bgt.domain.dto;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
@ -16,9 +14,8 @@ import java.util.List;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("包工头招工分页查询对象")
public class BgtProjectRecruitQueryDTO extends BaseEntity {
public class BgtProjectRecruitQueryDTO{
/** 分页大小 */
@ApiModelProperty("分页大小")
@ -36,43 +33,4 @@ public class BgtProjectRecruitQueryDTO extends BaseEntity {
@ApiModelProperty("选择状态（0报名 1包工同意 2包工头拒绝（截止时间）3务工者同意 4务工者拒绝 5进场 6离场）")
private List<String> status;
// /** 项目ID */
// @ApiModelProperty("项目ID")
// private Long projectId;
// /** 标段ID */
// @ApiModelProperty("标段ID")
// private Long sectionId;
// /** 分包ID */
// @ApiModelProperty("分包ID")
// private Long subId;
// /** 任务ID */
// @ApiModelProperty("任务ID")
// private Long taskId;
// /** 招工名称 */
// /** 招工地址 */
// @ApiModelProperty("招工地址")
// private String recruitAddress;
// /** 招工金额 */
// @ApiModelProperty("招工金额")
// private Long recruitAmount;
// /** 招工数量 */
// @ApiModelProperty("招工数量")
// private Long recruitStaffNum;
// /** 招工开始时间 */
// @ApiModelProperty("招工开始时间")
// private String recruitBeginTime;
// /** 联系人 */
// @ApiModelProperty("联系人")
// private String recruitContactPerson;
// /** 联系电话 */
// @ApiModelProperty("联系电话")
// private String recruitContactPhone;
// /** 招工描述 */
// @ApiModelProperty("招工描述")
// private String subDescribe;
// /** 招工要求 */
// @ApiModelProperty("招工要求")
// private String recruitRequirement;
}

79
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressDTO.java Normal file
View File

@ -0,0 +1,79 @@
package com.ruoyi.bgt.domain.dto;
import com.baomidou.mybatisplus.annotation.TableName;
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 java.time.LocalDateTime;
/**
* 包工头项目任务进度对象 bgt_project_task_progress
*
* @author ruoyi
* @date 2025-02-18
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("bgt_project_task_progress")
@ApiModel("包工头项目任务进度视图对象")
public class BgtProjectTaskProgressDTO {
@ApiModelProperty("项目ID")
private Long projectId;
@ApiModelProperty("项目名")
private String projectName;
@ApiModelProperty("标段ID")
private Long sectionId;
@ApiModelProperty("分包ID")
private Long subId;
@ApiModelProperty("任务ID")
private Long taskId;
@ApiModelProperty("任务名")
private String taskName;
@ApiModelProperty("用工数量")
private Integer taskStaffNum;
@ApiModelProperty("进度名称")
private String progressName;
@ApiModelProperty("负责人")
private String director;
@ApiModelProperty("上传人ID")
private Long uploaderId;
@ApiModelProperty("上传人")
private String uploader;
@ApiModelProperty("上传时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime uploadTime;
@ApiModelProperty("进度")
private Integer progress;
@ApiModelProperty("进度描述")
private String progressDescribe;
@ApiModelProperty("进度附件")
private String progressAnnex;
@ApiModelProperty("审核人Id")
private Long reviewerId;
@ApiModelProperty("备注")
private String remark;
}

5
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtWageApplicationQueryDTO.java
View File

@ -1,10 +1,8 @@
package com.ruoyi.bgt.domain.dto;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 包工头工资申请分页查询对象 bgt_wage_application
@ -14,9 +12,8 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("App包工头工资申请分页查询对象")
public class BgtWageApplicationQueryDTO extends BaseEntity {
public class BgtWageApplicationQueryDTO {
/** 分页大小 */
@ApiModelProperty("分页大小")

3
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.bgt.domain.dto;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.domain.dto.AnnexDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -22,7 +21,7 @@ import java.util.List;
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("包工头实名认证对象")
public class UserRealNameAuthenticationDTO extends BaseEntity {
public class UserRealNameAuthenticationDTO {
@ApiModelProperty("主键")
@NotBlank(message = "主键不能为空")

11
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java
View File

@ -85,16 +85,15 @@ public class BgtProjectTaskProgressServiceImpl extends ServicePlusImpl<BgtProjec
@Override
public Boolean insert(BgtProjectTaskProgress bo) {
BgtProjectTaskProgress add = BeanUtil.toBean(bo, BgtProjectTaskProgress.class);
validEntityBeforeSave(add);
if(add.getProgress() == 100){
validEntityBeforeSave(bo);
if(bo.getProgress() == 100){
//更改任务状态
fbsProjectTaskService.lambdaUpdate().set(FbsProjectTask::getStatus, ProjectTaskStatus.COMPLETE.getCode())
.eq(FbsProjectTask::getId, add.getTaskId()).update();
.eq(FbsProjectTask::getId, bo.getTaskId()).update();
//批量退场
recruitApplyService.quitBatch(add.getTaskId());
recruitApplyService.quitBatch(bo.getTaskId());
}
return save(add);
return save(bo);
}
@Override