Merge branch 'fix/240501_移动端查看工资单' into custom/宁波精华
This commit is contained in:
commit
8b324437e3
|
|
@ -5,8 +5,6 @@ import lombok.Builder;
|
|||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
|
|
@ -62,4 +60,7 @@ public class SalaryMySalaryBillListDTO {
|
|||
private Date sendTime;
|
||||
|
||||
|
||||
private Long employeeId;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -737,7 +737,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
|
|||
String cacheKey = "addUpDeduction_autoAddAll_processing";
|
||||
Object objVal = Util_DataCache.getObjVal(cacheKey);
|
||||
if (objVal != null) {
|
||||
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(135788, "一键累计过于频繁,请稍后再试"));
|
||||
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(135788, "一键累计过于频繁,请稍后再试 "));
|
||||
}
|
||||
try {
|
||||
Util_DataCache.setObjVal(cacheKey, true);
|
||||
|
|
|
|||
|
|
@ -807,7 +807,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
|
|||
queryParam.setStartSalaryMonth(getLimitMonth());
|
||||
|
||||
List<SalaryMySalaryBillListDTO> list = salarySendInfoMapper.mySalaryBillList(queryParam);
|
||||
|
||||
list.forEach(dto -> dto.setEmployeeId(Long.valueOf(user.getUID())));
|
||||
PageInfo<SalaryMySalaryBillListDTO> pageInfo = new PageInfo<>(list, SalaryMySalaryBillListDTO.class);
|
||||
pageInfo.setTotal(list.size());
|
||||
pageInfo.setPageNum(queryParam.getCurrent());
|
||||
|
|
|
|||
Loading…
Reference in New Issue