bug修复

935090232@qq.com

2021-07-09 3cd342a343fd67a32415b832abe1a39bab9e627d

 zq-erp/src/main/java/com/matrix/system/hive/plugin/util/TimeUtils.java

@@ -1,5 +1,6 @@
package com.matrix.system.hive.plugin.util;

import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.StringUtils;

import java.text.SimpleDateFormat;
@@ -337,8 +338,8 @@
        Calendar c = Calendar.getInstance();
        try {
            int dataInt = StringUtils.stringToInt(data);
            int month = DateUtils.getMonth(createTime);
            int year = DateUtils.getYear(createTime);
            int month = DateUtil.getMonth(createTime);
            int year = DateUtil.getYear(createTime);
            if (dataInt > 12 - month && dataInt < 12) {
                month += dataInt;
                year += 1;
@@ -437,7 +438,7 @@
        String checkrule = "1";
        
        Date resultDate = TimeUtils.getEndYearTime(data, checkrule);
        String time = DateUtils.dateToString(resultDate, DateUtils.DATE_FORMAT_SS);
        String time = DateUtil.dateToString(resultDate, DateUtil.DATE_FORMAT_SS);
        System.out.println(time);
    }
}