Browse Source

Merge branch '20250125_sun' of sckj/mz-cloud into master

sckj 2 months ago
parent
commit
dc52ac997d

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -518,6 +518,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
 
     public static void main(String[] args) {
-        System.out.println(getCsyfByPc("202501", "0"));
+        System.out.println(checkFor80("19670515"));
     }
 }

+ 1 - 1
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqSqServiceImpl.java

@@ -296,7 +296,7 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
     @Override
     public Map<String, String> getQxBfPz(GljtSqSq gljtSqSq) {
         Map<String, String> res = new LinkedHashMap<>();
-        if (DateUtils.checkFor80(gljtSqSq.getCsrq()) < 0) {
+        if (DateUtils.checkFor80(gljtSqSq.getCsrq()) == 0) {
             // 小于80岁出最小月份
             res.put("default", DateUtils.calculate80thBirthday(gljtSqSq.getCsrq()));
             res.put("under", DateUtils.calculate80thBirthday(gljtSqSq.getCsrq()));