新增打卡地址

src/com/engine/kq/biz/KQFormatData.java

@@ -16,6 +16,9 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.Expression;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.lang3.StringUtils;
 import weaver.common.DateUtil;
@@ -998,7 +1001,10 @@ public class KQFormatData extends BaseBean {
                     if (signTime.length() == 5) {
                       signTime = signTime + ":00";
                     }
-                    String subsidyTime = kqDate + " 00:00:00";
+                    LocalDate date = LocalDate.parse(kqDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                    LocalDate localDate = date.plusDays(1);
+                    String kqDateNew = localDate.toString();
+                    String subsidyTime = kqDateNew + " 00:00:00";
                     bb.writeLog("subsidyTime: " + subsidyTime);
                     String outTime = signDate + " " + signTime;
                     bb.writeLog("outTime: " + outTime);

src/com/engine/kq/biz/KQReportBiz.java

@@ -1346,7 +1346,7 @@ public class KQReportBiz extends BaseBean {
               legWorkInfos.add(temp);
             }
           }
-          bb.writeLog("legWorkInfos: " + legWorkInfos);
+//          bb.writeLog("legWorkInfos: " + legWorkInfos);
 
           if (legWorkInfos != null && legWorkInfos.size() > 0 ) {
             String tempSignIn = "";
@@ -1426,13 +1426,13 @@ public class KQReportBiz extends BaseBean {
 //      bb.writeLog("radius: " + radius);
 
       String MealAlloTableName = Util.null2String(bb.getPropValue("project_hostar", "MealAllowanceTableName"));
-      bb.writeLog("MealAlloTableName: " + MealAlloTableName);
+//      bb.writeLog("MealAlloTableName: " + MealAlloTableName);
 
       if (StringUtils.isNotBlank(MealAlloTableName)) {
         //获取餐补判断时间
         List<Map<String, String>> MealMap = new ArrayList<>();
         String acqTimeSql = "select startTime, endTime from " + MealAlloTableName + " where (isDelete is null or isDelete = 0)";
-        bb.writeLog("acqTimeSql: " + acqTimeSql);
+//        bb.writeLog("acqTimeSql: " + acqTimeSql);
         rs.executeQuery(acqTimeSql);
         while (rs.next()) {
           String startTime = Util.null2String(rs.getString("startTime"));
@@ -1442,7 +1442,7 @@ public class KQReportBiz extends BaseBean {
           temp.put("endTime",endTime);
           MealMap.add(temp);
         }
-        bb.writeLog("MealMap: " + MealMap);
+//        bb.writeLog("MealMap: " + MealMap);
 
         //根据外勤打卡数据计算餐补数据
         for (String key: lsCheckInfo.keySet()) {

src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java

@@ -307,11 +307,11 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
           } else if(fieldName.equals("signin1")){
             fieldValue = Util.null2String(signDetailInfo.get("signintime1"));
             data.add(fieldValue);
-            fieldValue = Util.null2String(signDetailInfo.get("signinstatus1"));
-            data.add(fieldValue);
             //考勤二开
             fieldValue = Util.null2String(signDetailInfo.get("signinaddress1"));
             data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signinstatus1"));
+            data.add(fieldValue);
             continue;
           } else if(fieldName.equals("signin2")){
             fieldValue = Util.null2String(signDetailInfo.get("signintime2"));
@@ -328,11 +328,11 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
           } else if(fieldName.equals("signout1")){
             fieldValue = Util.null2String(signDetailInfo.get("signouttime1"));
             data.add(fieldValue);
-            fieldValue = Util.null2String(signDetailInfo.get("signoutstatus1"));
-            data.add(fieldValue);
             //考勤二开
             fieldValue = Util.null2String(signDetailInfo.get("signoutaddress1"));
             data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signoutstatus1"));
+            data.add(fieldValue);
             continue;
           } else if(fieldName.equals("signout2")){
             fieldValue = Util.null2String(signDetailInfo.get("signouttime2"));