Commit fdcdcc0c by hzc

修复填报数据excel导出时数据错位问题

parent 03dde918
...@@ -556,6 +556,7 @@ public class DataEnterCtrl { ...@@ -556,6 +556,7 @@ public class DataEnterCtrl {
*/ */
private void genernateData(List<TaskIndValue> values, ExcelIndicator indicator, private void genernateData(List<TaskIndValue> values, ExcelIndicator indicator,
ExcelObj obj, boolean hasSameTerm, List<String> data) { ExcelObj obj, boolean hasSameTerm, List<String> data) {
boolean isExist = false;
for (TaskIndValue value : values) { for (TaskIndValue value : values) {
if (indicator.getIndId().equals(value.getIndId()) && if (indicator.getIndId().equals(value.getIndId()) &&
// obj.getObjType().equals(value.getObjType())&& // obj.getObjType().equals(value.getObjType())&&
...@@ -572,9 +573,17 @@ public class DataEnterCtrl { ...@@ -572,9 +573,17 @@ public class DataEnterCtrl {
data.add(""); data.add("");
} }
} }
isExist = true;
break; break;
} }
} }
if(isExist==false){
//找不到
data.add("");
if(hasSameTerm){
data.add("");
}
}
} }
@ApiOperation("查询中间表的值(填报点击获取中间数据)") @ApiOperation("查询中间表的值(填报点击获取中间数据)")
@PostMapping("findOldValueToEdit") @PostMapping("findOldValueToEdit")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment