lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2026-02-14 17:08:00 +08:00
Code Issues Projects Releases Wiki Activity

toYmdhms改为toYmdHms

Browse Source
This commit is contained in:
6tail
2020-04-20 12:51:10 +08:00
parent 19ac8dd54a
commit b7b7b749c3
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nlf/calendar/Lunar.java
View File

@@ -231,7 +231,7 @@ public class Lunar{
}
}
//立春交接时刻判断
if(solar.toYmdhms().compareTo(liChun.toYmdhms())<0) {
if(solar.toYmdHms().compareTo(liChun.toYmdHms())<0) {
gExact--;
if(gExact<0){
gExact += 10;
@@ -284,9 +284,9 @@ public class Lunar{
int indexExact = -2;
for(String jie:LunarUtil.JIE){
end = jieQi.get(jie);
String time = solar.toYmdhms();
String stime = null==start?time:start.toYmdhms();
String etime = end.toYmdhms();
String time = solar.toYmdHms();
String stime = null==start?time:start.toYmdHms();
String etime = end.toYmdHms();
if(time.compareTo(stime)>=0&&time.compareTo(etime)<0){
break;
}

4
src/main/java/com/nlf/calendar/Solar.java
View File

@@ -440,13 +440,13 @@ public class Solar{
return year+"-"+(month<10?"0":"")+month+"-"+(day<10?"0":"")+day;
}
public String toYmdhms(){
public String toYmdHms(){
return toYmd()+" "+(hour<10?"0":"")+hour+":"+(minute<10?"0":"")+minute+":"+(second<10?"0":"")+second;
}
public String toFullString(){
StringBuilder s = new StringBuilder();
s.append(toYmdhms());
s.append(toYmdHms());
if(isLeapYear()){
s.append(" ");
s.append("闰年");