diff --git a/sql/rysqlite3.db b/sql/rysqlite3.db index 559fee0..1369ad6 100644 Binary files a/sql/rysqlite3.db and b/sql/rysqlite3.db differ diff --git a/src/main/java/com/ruoyi/project/project/cases/domain/Case.java b/src/main/java/com/ruoyi/project/project/cases/domain/Case.java index cc3790c..ac1e864 100644 --- a/src/main/java/com/ruoyi/project/project/cases/domain/Case.java +++ b/src/main/java/com/ruoyi/project/project/cases/domain/Case.java @@ -32,7 +32,7 @@ public class Case extends BaseEntity private String name; /** 身份证号 */ - @Excel(name = "省份证号") + @Excel(name = "身份证号") private String userNo; /** 性别 */ diff --git a/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java b/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java index 93158e9..f58c2ea 100644 --- a/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java +++ b/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java @@ -76,7 +76,7 @@ public class ItemController extends BaseController { int i = itemService.selectItemByItemNo(item); if (i > 0){ - return error("物品编号重复,请检查!!!"); + return error("物品编号重复,请检查!"); } return toAjax(itemService.insertItem(item)); } @@ -86,11 +86,11 @@ public class ItemController extends BaseController */ @RequiresPermissions("system:case:export") @Log(title = "物品列表导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/export/{caseNo}") @ResponseBody - public AjaxResult export(Item item) + public AjaxResult export(@PathVariable("caseNo")String caseNo) { - List list = itemService.selectItemList(item); + List list = itemService.selectItemByCaseNo(caseNo); ExcelUtil util = new ExcelUtil(Item.class); return util.exportExcel(list, "物品信息数据"); }