ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

fix(excel):修正部分文案，增加对于错误信息的JSON输出定义。

Browse Source
This commit is contained in:
徐涛 2022-08-17 14:05:38 +08:00
parent 592e93b2c9
commit 21803bf832
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
excel/abstract.go
View File

@ -25,9 +25,9 @@ type ExcelAnalyzer[T any] struct {
} }
type ExcelAnalysisError struct { type ExcelAnalysisError struct {
Row int Row int `json:"row"`
Col int Col int `json:"col"`
Err error Err error `json:"error"`
} }
func NewColumnRecognizer(tag string, patterns ...string) ColumnRecognizer { func NewColumnRecognizer(tag string, patterns ...string) ColumnRecognizer {
@ -137,7 +137,7 @@ func (a *ExcelAnalyzer[T]) Analysis(bean T) ([]T, []ExcelAnalysisError) {
} else { } else {
v, err := strconv.Atoi(matchValue) v, err := strconv.Atoi(matchValue)
if err != nil { if err != nil {
errs = append(errs, ExcelAnalysisError{Row: rowIndex + 1, Col: recognizer.MatchIndex + 1, Err: fmt.Errorf("单元格内容应为不带小鼠的整数。%w", err)}) errs = append(errs, ExcelAnalysisError{Row: rowIndex + 1, Col: recognizer.MatchIndex + 1, Err: fmt.Errorf("单元格内容应为不带小数的整数。%w", err)})
actualField.SetInt(0) actualField.SetInt(0)
} else { } else {
actualField.SetInt(int64(v)) actualField.SetInt(int64(v))