修改填报excel模板导出和数据导入的方法

src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java

@@ -255,30 +255,28 @@ public class DataEnterCtrl {
                 }
             } else {
                 if (hasSameTerm) {
-                    startColumn = 2;
+                    startRow = 2;
                 }
                 for (int i = 0; i < inds.size(); i++) {
                     int t = i + startRow;
                     XSSFRow row = sheet.getRow(t);
                     ExcelIndicator ind = inds.get(i);
+                    int start = startColumn;
                     for (int j = 0; j < objs.size(); j++) {
                         ExcelObj obj = objs.get(j);
-                        String val1 = ExcelUtil.getXSSFCellValue(row.getCell(startColumn + j));
+                        String val1 = ExcelUtil.getXSSFCellValue(row.getCell(j + start));
+                        String val2 = ExcelUtil.getXSSFCellValue(row.getCell(j + start + 1));
                         TaskIndValue value = this.doGenTaskIndValue(val1, obj, ind, template.getId(),
                                 taskId, task.getValueTime(), userId, now);
                         taskIndValues.add(value);
                         if (hasSameTerm) {
-                            XSSFRow row2 = sheet.getRow(t + 1);
-                            startRow++;
-                            String val2 = ExcelUtil.getXSSFCellValue(row2.getCell(startColumn + j));
 //                            TaskIndValue value2 = this.doGenTaskIndValue(val2, obj, ind, template.getId(),
 //                                    taskId, sameTermValutTime, userId, now);
 //                            taskIndValues.add(value2);
                             value.setIndLastValue(val2);
-                            startRow--;
+                            start ++;
                         }
                     }
-                    startRow++;
                 }
             }
             taskService.saveTaskValues(taskIndValues, taskId, Constants.INPUT_EXCEL);

src/main/java/com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java

@@ -210,17 +210,6 @@ public class ExcelTempCtrl {
                     List<String> data = new ArrayList<>();
                     datas.add(data);
                     data.add(indicator.getIndName());
-                    if (hasSameTerm) {
-                        OnceAbsoluteMergeStrategy  mergeStrategy = new OnceAbsoluteMergeStrategy(
-                                i, i+1, 0, 0);
-                        i += 2;
-                        merges.add(mergeStrategy);
-                        List<String> h2 = new ArrayList<>();
-                        data.add("本期");
-                        h2.add("");
-                        h2.add("同期");
-                        datas.add(h2);
-                    }
                 }
                 List<String> column1 = new ArrayList<>();
                 column1.add("");
@@ -229,13 +218,20 @@ public class ExcelTempCtrl {
                     List<String> header = new ArrayList<>();
                     header.add(obj.getObjName());
                     headers.add(header);
+                    if (hasSameTerm) {
+                        header.add("本期");
+                        List<String> header2 = new ArrayList<>();
+                        headers.add(header2);
+                        header2.add(obj.getObjName());
+                        header2.add("同期");
+                        hasSameTerm = true;
+                    }
                 }
                 if (hasSameTerm) {
-                    //如果有同期值，需要占据两列
-                    List<String> column2 = new ArrayList<>();
-                    column2.add("");
-                    headers.add(0, column2);
+                    //如果有同期值需要占据两行
+                    column1.add("");
                 }
+
             }
             response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
             ExcelWriterBuilder writerBuilder = EasyExcel.write(response.getOutputStream());