|
@@ -2760,24 +2760,27 @@ public class DingDingServiceImpl implements DingDingService {
|
|
|
String endTime = null;
|
|
|
String realPlanStartTime = null;
|
|
|
String realPlanEndTime = null;
|
|
|
- for (int i=0;i<array.size(); i++) {
|
|
|
- JSONObject obj = array.getJSONObject(i);
|
|
|
- //出差类型
|
|
|
- System.out.println(obj);
|
|
|
- if (obj.getInteger("approve_biz_type") == 2) {
|
|
|
- if (obj.getString("check_type").equals("OnDuty")) {
|
|
|
- //出差开始时间
|
|
|
- System.out.println("出差开始时间=="+obj.getString("check_date_time"));
|
|
|
- startTime = obj.getString("check_date_time");
|
|
|
- realPlanStartTime = obj.getString("real_plan_time");
|
|
|
- } else {
|
|
|
- //出差结束时间
|
|
|
- System.out.println("出差结束时间=="+obj.getString("check_date_time"));
|
|
|
- endTime = obj.getString("check_date_time");
|
|
|
- realPlanEndTime = obj.getString("real_plan_time");
|
|
|
+ if (array != null) {
|
|
|
+ for (int i=0;i<array.size(); i++) {
|
|
|
+ JSONObject obj = array.getJSONObject(i);
|
|
|
+ //出差类型
|
|
|
+ System.out.println(obj);
|
|
|
+ if (obj.getInteger("approve_biz_type") == 2) {
|
|
|
+ if (obj.getString("check_type").equals("OnDuty")) {
|
|
|
+ //出差开始时间
|
|
|
+ System.out.println("出差开始时间=="+obj.getString("check_date_time"));
|
|
|
+ startTime = obj.getString("check_date_time");
|
|
|
+ realPlanStartTime = obj.getString("real_plan_time");
|
|
|
+ } else {
|
|
|
+ //出差结束时间
|
|
|
+ System.out.println("出差结束时间=="+obj.getString("check_date_time"));
|
|
|
+ endTime = obj.getString("check_date_time");
|
|
|
+ realPlanEndTime = obj.getString("real_plan_time");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (startTime != null && endTime != null) {
|
|
|
//获取到出差的时间,计算时长
|
|
|
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|