diff --git a/WebRoot/Excel/1b1a53fa-8dda-4ea9-b74a-6582de99abf9.xlsx b/WebRoot/Excel/1b1a53fa-8dda-4ea9-b74a-6582de99abf9.xlsx new file mode 100644 index 00000000..32882551 Binary files /dev/null and b/WebRoot/Excel/1b1a53fa-8dda-4ea9-b74a-6582de99abf9.xlsx differ diff --git a/WebRoot/Excel/6caf9fce-a1e1-4ea8-8eb9-c135a60427fa.xlsx b/WebRoot/Excel/6caf9fce-a1e1-4ea8-8eb9-c135a60427fa.xlsx new file mode 100644 index 00000000..59cc4625 Binary files /dev/null and b/WebRoot/Excel/6caf9fce-a1e1-4ea8-8eb9-c135a60427fa.xlsx differ diff --git a/WebRoot/Excel/79ed2cdd-2e7c-47d3-a96d-d6ab90fca105.xlsx b/WebRoot/Excel/79ed2cdd-2e7c-47d3-a96d-d6ab90fca105.xlsx new file mode 100644 index 00000000..d95ddbe7 Binary files /dev/null and b/WebRoot/Excel/79ed2cdd-2e7c-47d3-a96d-d6ab90fca105.xlsx differ diff --git a/WebRoot/Excel/ee2bdd2f-f029-44e5-9b48-2baa734b32c6.xlsx b/WebRoot/Excel/ee2bdd2f-f029-44e5-9b48-2baa734b32c6.xlsx new file mode 100644 index 00000000..9076747e Binary files /dev/null and b/WebRoot/Excel/ee2bdd2f-f029-44e5-9b48-2baa734b32c6.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 97d2d9ba..2494a65a 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -296,25 +296,25 @@ public class CollectController extends Controller { PoiUtil.addComment(wb, cell, "此列内容必须输入!"); } -// int data_type_id = record.getInt("data_type_id"); -// if (data_type_id == 2) { -// if (!allow_blank) PoiUtil.addComment(wb, cell, "此列内容必须输入,并且需要输入整数!"); -// else PoiUtil.addComment(wb, cell, "此列需要输入整数!"); -// } -// if (data_type_id == 3) { -// if (!allow_blank) { -// PoiUtil.addComment(wb, cell, "此列内容必须输入,并且需要输入小数!"); -// } else { -// PoiUtil.addComment(wb, cell, "此列需要输入小数!"); -// } -// } -// if (data_type_id == 4) { -// if (!allow_blank) { -// PoiUtil.addComment(wb, cell, "此列内容必须输入,并且需要输入日期,格式为yyyy/mm/dd!"); -// } else { -// PoiUtil.addComment(wb, cell, "此列需要输入日期,格式为yyyy/mm/dd!"); -// } -// } + int data_type_id = record.getInt("data_type_id"); + if (data_type_id == 2) { + if (!allow_blank) PoiUtil.addComment(wb, cell, "此列内容必须输入,并且需要输入整数!"); + else PoiUtil.addComment(wb, cell, "此列需要输入整数!"); + } + if (data_type_id == 3) { + if (!allow_blank) { + PoiUtil.addComment(wb, cell, "此列内容必须输入,并且需要输入小数!"); + } else { + PoiUtil.addComment(wb, cell, "此列需要输入小数!"); + } + } + if (data_type_id == 4) { + if (!allow_blank) { + PoiUtil.addComment(wb, cell, "此列内容必须输入,并且需要输入日期,格式为yyyy/mm/dd!"); + } else { + PoiUtil.addComment(wb, cell, "此列需要输入日期,格式为yyyy/mm/dd!"); + } + } colIdx++; } }