From adb33007bf87f63a893f90196a6087f9cafe34c7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 03 一月 2025 11:40:04 +0800
Subject: [PATCH] 考勤查询条件bug 修复
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
index 6401c74..f81e8af 100755
--- a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -1592,7 +1592,7 @@
CommunityDto communityDto = new CommunityDto();
communityDto.setCommunityId(feeDto.getCommunityId());
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- if (communityDtos == null || communityDtos.size() < 1) {
+ if (ListUtil.isNull(communityDtos)) {
value = value.replace("C", "0");
} else {
value = value.replace("C", communityDtos.get(0).getCommunityArea());
@@ -1606,7 +1606,7 @@
}
if (value.contains("RL")) {
List<RoomAttrDto> roomAttrDtos = roomDto.getRoomAttrDto();
- if (roomAttrDtos != null && roomAttrDtos.size() > 0) {
+ if (!ListUtil.isNull(roomAttrDtos)) {
for (RoomAttrDto roomAttrDto : roomAttrDtos) {
value = value.replace("RL" + roomAttrDto.getSpecCd(), roomAttrDto.getValue());
}
@@ -1723,15 +1723,15 @@
round = Math.floor(mulMonth / paymentCycle);
}
// 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
- targetEndDate = getTargetEndTime(round * paymentCycle, startDate,false);//鐩爣缁撴潫鏃堕棿
+ targetEndDate = getTargetEndTime(round * paymentCycle, startDate, false);//鐩爣缁撴潫鏃堕棿
//todo 濡傛灉 鍒颁簡 棰勪粯鏈� 浜х敓涓嬩釜鍛ㄦ湡鐨勮垂鐢�
if (DateUtil.getFormatTimeStringB(targetEndDate).equals(DateUtil.getFormatTimeStringB(endDate))
&& DateUtil.getCurrentDate().getTime() > preEndTime.getTime()
) {
- targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate,true);//鐩爣缁撴潫鏃堕棿
- }else{
- targetEndDate = getTargetEndTime(round * paymentCycle, startDate,true);//鐩爣缁撴潫鏃堕棿
+ targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate, true);//鐩爣缁撴潫鏃堕棿
+ } else {
+ targetEndDate = getTargetEndTime(round * paymentCycle, startDate, true);//鐩爣缁撴潫鏃堕棿
}
//todo 璐圭敤椤圭殑缁撴潫鏃堕棿<缂磋垂鐨勭粨鏉熸椂闂� 璐圭敤蹇粨鏉熶簡 鍙栬垂鐢ㄩ」鐨勭粨鏉熸椂闂�
@@ -1783,7 +1783,7 @@
}
@Override
- public Date getTargetEndTime(double month, Date startDate,boolean mulOneSec) {
+ public Date getTargetEndTime(double month, Date startDate, boolean mulOneSec) {
Calendar endDate = Calendar.getInstance();
endDate.setTime(startDate);
@@ -1791,7 +1791,7 @@
endDate.add(Calendar.MONTH, intMonth.intValue());
double doubleMonth = month - intMonth;
if (doubleMonth <= 0) {
- if(mulOneSec) {
+ if (mulOneSec) {
endDate.add(Calendar.SECOND, -1);
}
return endDate.getTime();
@@ -1799,7 +1799,7 @@
int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
Double hour = doubleMonth * futureDay * 24;
endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
- if(mulOneSec) {
+ if (mulOneSec) {
endDate.add(Calendar.SECOND, -1);
}
return endDate.getTime();
@@ -1973,7 +1973,7 @@
}
Date endTime = feeDto.getEndTime();
- Date date = getTargetEndTime(cycle, endTime,true);
+ Date date = getTargetEndTime(cycle, endTime, true);
feeDto.setDeadlineTime(date);
dealRentRate(feeDto);
@@ -1993,7 +1993,6 @@
dealRentRate(feeDto);
}
-
/**
--
Gitblit v1.8.0