*）修改导出报表bug

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/service/impl/CheckServiceImpl.java

@@ -1332,47 +1332,91 @@ public class CheckServiceImpl implements ICheckService {
             String pointName = StringUtil.setStr(checkInputBo.getPlanTaskId(), checkInputBo.getPointName());
             String classifyName = StringUtil.setStr(checkInputBo.getPlanTaskId(), checkInputBo.getClassifyName());
             String beginTime = checkInputBo.getBeginTime();
-
-            if (flag1) {
-                lastDate = beginTime;
-                flag1 = false;
-            }
-            if (i != 0 && (null == lastDate ? null == beginTime : lastDate.equals(beginTime))) {
-                endRow1++;
+            String checkDate = checkInputBo.getCheckDate();
+            if (ObjectUtils.isEmpty(beginTime)){
+                if (flag1) {
+                    lastDate = checkDate;
+                    flag1 = false;
+                }
+                if (i != 0 && (lastDate.equals(checkDate))) {
+                    endRow1++;
+                } else {
+                    //两者不相同时，融合之前相同的行
+                    if (endRow1 > startRow1) {
+                        sheet.addMergedRegion(new CellRangeAddress(startRow1, endRow1, 0, 0));
+                    }
+                    startRow1 = temNum1;
+                    endRow1 = startRow1;
+                    lastDate = checkDate;
+                }
+                temNum1++;
+                if (i == checkInfoList.size() - 1 && startRow1 != endRow1) {
+                    //融合最后相同的行
+                    sheet.addMergedRegion(new CellRangeAddress(startRow1, endRow1, 0, 0));
+                }
+                pointName = StringUtil.setStr(checkInputBo.getCheckDate(), checkInputBo.getPointName());
+                if (flag2) {
+                    lastPointName = pointName;
+                    flag2 = false;
+                }
+                if (i != 0 && lastPointName.equals(pointName)) {
+                    endRow2++;
+                } else {
+                    //两者不相同时，融合之前相同的行
+                    if (endRow2 > startRow2) {
+                        sheet.addMergedRegion(new CellRangeAddress(startRow2, endRow2, 1, 1));
+                    }
+                    startRow2 = temNum2;
+                    endRow2 = startRow2;
+                    lastPointName = pointName;
+                }
+                temNum2++;
+                if (i == checkInfoList.size() - 1 && startRow2 != endRow2) {
+                    //融合最后相同的行
+                    sheet.addMergedRegion(new CellRangeAddress(startRow2, endRow2, 1, 1));
+                }
             } else {
-                //两者不相同时，融合之前相同的行
-                if (endRow1 > startRow1) {
+                if (flag1) {
+                    lastDate = beginTime;
+                    flag1 = false;
+                }
+                if (i != 0 && (lastDate.equals(beginTime))) {
+                    endRow1++;
+                } else {
+                    //两者不相同时，融合之前相同的行
+                    if (endRow1 > startRow1) {
+                        sheet.addMergedRegion(new CellRangeAddress(startRow1, endRow1, 0, 0));
+                    }
+                    startRow1 = temNum1;
+                    endRow1 = startRow1;
+                    lastDate = beginTime;
+                }
+                temNum1++;
+                if (i == checkInfoList.size() - 1 && startRow1 != endRow1) {
+                    //融合最后相同的行
                     sheet.addMergedRegion(new CellRangeAddress(startRow1, endRow1, 0, 0));
                 }
-                startRow1 = temNum1;
-                endRow1 = startRow1;
-                lastDate = beginTime;
-            }
-            temNum1++;
-            if (i == checkInfoList.size() - 1 && startRow1 != endRow1) {
-                //融合最后相同的行
-                sheet.addMergedRegion(new CellRangeAddress(startRow1, endRow1, 0, 0));
-            }
 
-            if (flag2) {
-                lastPointName = pointName;
-                flag2 = false;
-            }
-            if (i != 0 && lastPointName.equals(pointName)) {
-                endRow2++;
-            } else {
-                //两者不相同时，融合之前相同的行
-                if (endRow2 > startRow2) {
+                if (flag2) {
+                    lastPointName = pointName;
+                    flag2 = false;
+                }
+                if (i != 0 && lastPointName.equals(pointName)) {
+                    endRow2++;
+                } else {
+                    //两者不相同时，融合之前相同的行
+                    if (endRow2 > startRow2) {
+                        sheet.addMergedRegion(new CellRangeAddress(startRow2, endRow2, 1, 1));
+                    }
+                    startRow2 = temNum2;
+                    endRow2 = startRow2;
+                    lastPointName = pointName;
+                }
+                temNum2++;
+                if (i == checkInfoList.size() - 1 && startRow2 != endRow2) {
+                    //融合最后相同的行
                     sheet.addMergedRegion(new CellRangeAddress(startRow2, endRow2, 1, 1));
                 }
-                startRow2 = temNum2;
-                endRow2 = startRow2;
-                lastPointName = pointName;
-            }
-            temNum2++;
-            if (i == checkInfoList.size() - 1 && startRow2 != endRow2) {
-                //融合最后相同的行
-                sheet.addMergedRegion(new CellRangeAddress(startRow2, endRow2, 1, 1));
             }
 
             if (flag3) {