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

增加接口和app初始头像

Browse Source
This commit is contained in:
罗成
2025-03-10 14:30:07 +08:00
parent 708458df71
commit 0dd222e9f3
8 changed files with 80 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
View File

@ -72,6 +72,12 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
@ApiModelProperty("招工要求")
private String recruitRequirement;
@ApiModelProperty("工种")
private String typeOfWork;
@ApiModelProperty("工种名称")
private String typeOfWorkLabel;
@ApiModelProperty("已报名数量")
private Integer numberOfRegistered;

31
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserGetTheApproverRes.java Normal file
View File

@ -0,0 +1,31 @@
package com.ruoyi.wgz.bo.res;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("通用审批人信息返回")
public class WgzAppUserGetTheApproverRes implements Serializable {
/** 唯一标识 */
@Excel(name = "唯一标识")
@ApiModelProperty("唯一标识")
private Long userId;
/** 姓名 */
@Excel(name = "姓名")
@ApiModelProperty("姓名")
private String username;
/** 头像地址 */
@Excel(name = "头像地址")
@ApiModelProperty("头像地址")
private String avatarName;
}

5
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java
View File

@ -57,6 +57,11 @@ public class WgzApplyForPayrollSettlementAddRes implements Serializable {
@ApiModelProperty("开工日期")
private String recruitWorkBeginTime;
@ApiModelProperty("工种")
private String typeOfWork;
@ApiModelProperty("工种名称")
private String typeOfWorkLabel;
@ApiModelProperty("联系人")
private String recruitContactPerson;

7
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
View File

@ -298,7 +298,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
//2、获取当前人、当前工地、当前月的所有考勤记录
LambdaQueryWrapper<WgzAttendance> apply = new LambdaQueryWrapper<WgzAttendance>().
eq(WgzAttendance::getUserId, appUserId).
eq(WgzAttendance::getRecruitId, by.getId()).
eq(WgzAttendance::getRecruitId, by.getRecruitId()).
apply("DATE_FORMAT(date, '%Y-%m') = {0}", format);
List<WgzAttendance> wgzAttendances = baseMapper.selectList(apply);
//3、组装返回数据
@ -317,7 +317,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
if (wa.getClockOutTime() != null) {
two.setNum(2);
two.setManHour(calculateWorkingHours(wa.getClockInTime(), wa.getClockOutTime()));
two.setSb(sbOrXb(wa, 2));
two.setXb(sbOrXb(wa, 2));
}
}
mp.put(date, two);
@ -545,7 +545,6 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
*/
public WgzAppPunchTheCalendarRecordThree sbOrXb(WgzAttendance wa, int num) {
WgzAppPunchTheCalendarRecordThree sbb = new WgzAppPunchTheCalendarRecordThree().
setClockingTime(wa.getClockInTime()).
setPnchOsition(wa.getPnchOsition()).
setPnchOsitionX(wa.getPnchOsitionX()).
setClockingCondition(0); //正常
@ -554,6 +553,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
sbb.setClockingCondition(7);
}
if (num == 1) {
sbb.setClockingTime(wa.getClockInTime());
//判断上班迟到
if (wa.getLate() == 1) {
sbb.setClockingCondition(1);
@ -564,6 +564,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
}
}
if (num == 2) {
sbb.setClockingTime(wa.getClockOutTime());
//判断下班早退
if (wa.getEarlyLeave() == 1) {
sbb.setClockingCondition(2);