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-12 17:05:10 +08:00
parent 330e4e5b8b
commit bed482475b
7 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtAttendanceController.java
View File

@ -64,13 +64,15 @@ public class AppBgtAttendanceController {
vo.setUserId(wgzUser.getUserId());
vo.setUsername(wgzUser.getUsername());
vo.setAvatarName(wgzUser.getAvatarName());
vo.setIdentityCard(wgzUser.getIdentityCard());
//务工者的申请信息
BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getOne(dto.getTaskId(),wgzUser.getUserId());
BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getById(dto.getRecruitApplyId());
vo.setEntryTime(recruitApply.getEntryTime());
vo.setLeaveTime(recruitApply.getLeaveTime());
vo.setStatus(recruitApply.getStatus());
return AjaxResult.success(vo);
}

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

@ -29,4 +29,7 @@ public class BgtAttendanceDetailDTO {
@ApiModelProperty("日期")
private LocalDate date;
@ApiModelProperty("招工申请ID")
private Long recruitApplyId;
}

7
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonBaseInfoVO.java
View File

@ -12,7 +12,7 @@ import java.time.LocalDate;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("App包工头总体考勤视图对象")
@ApiModel("App包工头个人考勤基础信息视图对象")
public class BgtAttendancePersonBaseInfoVO {
@ApiModelProperty("务工者Id")
@ -25,12 +25,15 @@ public class BgtAttendancePersonBaseInfoVO {
@ApiModelProperty("头像")
private String avatarName;
@ApiModelProperty("身份证号码")
private String identityCard;
@ApiModelProperty("进场时间")
private LocalDate entryTime;
@ApiModelProperty("离场时间")
private LocalDate leaveTime;
@ApiModelProperty("选择状态（0未选择 1已选择）")
@ApiModelProperty("0报名 1包工同意 2包工头拒绝（截止时间）3务工者同意 4务工者拒绝 5进场 6离场")
private String status;
}

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

@ -11,7 +11,7 @@ import java.util.List;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("App包工头总体考勤视图对象")
@ApiModel("App包工头个人考勤统计视图对象")
public class BgtAttendancePersonCountVO {
@ApiModelProperty("出勤天数")

8
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
View File

@ -146,14 +146,6 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
@Override
public TableDataInfo<BgtProjectRecruitApplyVO> appQueryPageList(BgtProjectRecruitApplyQueryDTO dto) {
if (dto.getTaskId() != null) {
List<Long> recruitIdsByTaskId = iBgtProjectRecruitService.getRecruitIdsByTaskId(dto.getTaskId());
if (dto.getRecruitIds() == null) {
dto.setRecruitIds(recruitIdsByTaskId);
} else {
dto.getRecruitIds().addAll(recruitIdsByTaskId);
}
}
if(dto.getDate()!=null){
LocalDate date = dto.getDate();
dto.setBeginDate(date.with(TemporalAdjusters.firstDayOfMonth()));

2
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java
View File

@ -101,7 +101,7 @@ public class BgtWageApplicationServiceImpl extends ServicePlusImpl<BgtWageApplic
.setRecipientId(add.getUserId())
.setHeadline(map.get(HEADLINE))
.setSubheading(map.get(SUBHEADING))
.setTableId(task.getId())
.setTableId(add.getId())
.setTableName(SqlHelper.table(FbsProjectTask.class).getTableName())
.setMessageLargeType(BGT_LARGE_SETTLEMENT);
bgtMessageService.sendAMessage(bgtMessage);

14
ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml
View File

@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wu.score,
wu.avatar_name,
wu.username,
wu.identity_card,
bpra.status,
wu.type_of_work,
bpr.recruit_name,
@ -41,12 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dto.username !=null and dto.username !='' ">
and wu.username like concat('%', #{dto.username}, '%')
</if>
<if test="dto.recruitIds != null and dto.recruitIds.size() > 0">
AND bpra.recruit_id IN
<foreach collection="dto.recruitIds" item="recruitId" open="(" separator="," close=")">
#{recruitId}
</foreach>
<if test="dto.taskId != null">
AND bpra.task_id = #{dto.taskId}
</if>
<!-- <if test="dto.recruitIds != null and dto.recruitIds.size() > 0">-->
<!-- AND bpra.recruit_id IN-->
<!-- <foreach collection="dto.recruitIds" item="recruitId" open="(" separator="," close=")">-->
<!-- #{recruitId}-->
<!-- </foreach>-->
<!-- </if>-->
<if test="dto.status != null and dto.status.size() > 0">
AND bpra.status IN
<foreach collection="dto.status" item="item" open="(" separator="," close=")">