|
@@ -386,13 +386,15 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
|
|
|
|
|
|
|
|
if(!Objects.isNull(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()))) {
|
|
if(!Objects.isNull(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()))) {
|
|
|
String jqEndDate = StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate());
|
|
String jqEndDate = StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate());
|
|
|
- String timePart = jqEndDate.substring(11);
|
|
|
|
|
- // 检查是否为 24:00:00
|
|
|
|
|
- if (timePart.equals("24:00:00")) {
|
|
|
|
|
- // 截取日期部分
|
|
|
|
|
- String datePart = jqEndDate.substring(0, 10);
|
|
|
|
|
- // 拼接成新的时间字符串
|
|
|
|
|
- insAreaCompany.setJqEndDate(datePart + " 23:59:59");
|
|
|
|
|
|
|
+ if(!Objects.isNull(jqEndDate)) {
|
|
|
|
|
+ String timePart = jqEndDate.substring(11);
|
|
|
|
|
+ // 检查是否为 24:00:00
|
|
|
|
|
+ if (timePart.equals("24:00:00")) {
|
|
|
|
|
+ // 截取日期部分
|
|
|
|
|
+ String datePart = jqEndDate.substring(0, 10);
|
|
|
|
|
+ // 拼接成新的时间字符串
|
|
|
|
|
+ insAreaCompany.setJqEndDate(datePart + " 23:59:59");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
insPlyIncome.setJqEndDate(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()));
|
|
insPlyIncome.setJqEndDate(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()));
|
|
@@ -400,13 +402,15 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
|
|
|
|
|
|
|
|
if(!Objects.isNull(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()))) {
|
|
if(!Objects.isNull(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()))) {
|
|
|
String syEndDate = StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate());
|
|
String syEndDate = StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate());
|
|
|
- String timePart = syEndDate.substring(11);
|
|
|
|
|
- // 检查是否为 24:00:00
|
|
|
|
|
- if (timePart.equals("24:00:00")) {
|
|
|
|
|
- // 截取日期部分
|
|
|
|
|
- String datePart = syEndDate.substring(0, 10);
|
|
|
|
|
- // 拼接成新的时间字符串
|
|
|
|
|
- insAreaCompany.setSyEndDate(datePart + " 23:59:59");
|
|
|
|
|
|
|
+ if(!Objects.isNull(syEndDate)) {
|
|
|
|
|
+ String timePart = syEndDate.substring(11);
|
|
|
|
|
+ // 检查是否为 24:00:00
|
|
|
|
|
+ if (timePart.equals("24:00:00")) {
|
|
|
|
|
+ // 截取日期部分
|
|
|
|
|
+ String datePart = syEndDate.substring(0, 10);
|
|
|
|
|
+ // 拼接成新的时间字符串
|
|
|
|
|
+ insAreaCompany.setSyEndDate(datePart + " 23:59:59");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|