工时导入。 解决钉钉发生提醒报错异常。

fhKeeper/formulahousekeeper/management-platform/pom.xml

@@ -145,15 +145,15 @@
             <scope>system</scope>
             <systemPath>${basedir}/src/main/resources/lib/taobao-sdk-java-auto_1479188381469-20210623.jar</systemPath>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>dingtalk</artifactId>-->
+<!--            <version>1.1.50</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>dingtalk</artifactId>
-            <version>1.1.50</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>dingtalk</artifactId>
-            <version>2.1.14</version>
+            <version>2.2.15</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5764,7 +5764,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 report.setCost(reportCreator.getCost()==null?new BigDecimal(0) : reportCreator.getCost().multiply(new BigDecimal(time)));
                                 if (notAllowedOnNonWorkday == 1 && WorkDayCalculateUtils.isWorkDay(report.getCreateDate()) == false) {
                                     //msg.setError("第"+dataCount+"行日期为非工作日，无法导入");
-                                    msg.setError(MessageUtils.message("report.nonWorkDay",dataCount, reportDate));
+                                    msg.setError(MessageUtils.message("report.nonWorkDay",dataCount+1, reportDate));
                                     return msg;
                                 }
                                 reportList.add(report);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -338,7 +338,7 @@ report.hourReportNoFilled=您{0}的工时报告还未填写
 report.lackCardTime=缺少考勤时长: {0}
 report.timeReachLimitError=填报工时不可超过考勤时长: {0}
 report.financial_report=财务已完成对{0}月日报的审核，无法提交。
-report.nonWorkDay=第{0}行日期{1}为非工作日，无法导入
+report.nonWorkDay=表格中第{0}行日期{1}为非工作日，无法导入
 #模板相关
 Template.subProject=子项目
 Template.AlreadyExists=该模板名称已存在

fhKeeper/formulahousekeeper/pom.xml

@@ -40,6 +40,7 @@
         <fastjson.version>1.2.7</fastjson.version>
         <baidu.api.sdk.version>4.2.0</baidu.api.sdk.version>
         <tess4j-version>4.4.1</tess4j-version>
+		<kotlin.version>1.6.21</kotlin.version>
     </properties>
 
     <repositories>