diff --git a/sql/rysqlite3.db b/sql/rysqlite3.db index 2770428..e8cfea9 100644 Binary files a/sql/rysqlite3.db and b/sql/rysqlite3.db differ diff --git a/src/main/java/com/ruoyi/project/project/cases/controller/CaseController.java b/src/main/java/com/ruoyi/project/project/cases/controller/CaseController.java index 6e59bb6..1bbc006 100644 --- a/src/main/java/com/ruoyi/project/project/cases/controller/CaseController.java +++ b/src/main/java/com/ruoyi/project/project/cases/controller/CaseController.java @@ -84,7 +84,7 @@ public class CaseController extends BaseController { List list = caseService.selectCaseList(cases); ExcelUtil util = new ExcelUtil(Case.class); - return util.exportExcel(list, "案件信息数据"); + return util.exportExcel(list, "案件数据"); } 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 b3189fe..50347cd 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 @@ -48,5 +48,8 @@ public class Case extends BaseEntity /** 立案时间 */ private String filingTime; + + /** 创建时间 */ + private String creatTime; } diff --git a/src/main/java/com/ruoyi/project/project/item/domain/Item.java b/src/main/java/com/ruoyi/project/project/item/domain/Item.java index 2ed69b2..0ce5b53 100644 --- a/src/main/java/com/ruoyi/project/project/item/domain/Item.java +++ b/src/main/java/com/ruoyi/project/project/item/domain/Item.java @@ -40,5 +40,8 @@ public class Item extends BaseEntity /** 来源说明 */ private String source; + /** 创建时间 */ + private String creatTime; + } diff --git a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java index 9d5dd3e..3f1b2ab 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java @@ -134,7 +134,7 @@ public class IndexController extends BaseController public String main(ModelMap mmap) { mmap.put("version", ruoYiConfig.getVersion()); - return "main"; + return "/project/case/case"; } // content-main class diff --git a/src/main/resources/mybatis/project/CaseMapper.xml b/src/main/resources/mybatis/project/CaseMapper.xml index 497925b..5c6bac3 100644 --- a/src/main/resources/mybatis/project/CaseMapper.xml +++ b/src/main/resources/mybatis/project/CaseMapper.xml @@ -15,10 +15,11 @@ + - select case_no, name, user_no, sex, age, position, department, rank, phone, filing_time + select case_no, name, user_no, sex, age, position, department, rank, phone, filing_time, creat_time from cases @@ -50,7 +51,8 @@ department, rank, phone, - filing_time + filing_time, + creat_time )values( #{caseNo}, #{name}, @@ -61,7 +63,8 @@ #{department}, #{rank}, #{phone}, - #{filingTime} + #{filingTime}, + (datetime(CURRENT_TIMESTAMP,'localtime')) ) diff --git a/src/main/resources/mybatis/project/ItemMapper.xml b/src/main/resources/mybatis/project/ItemMapper.xml index 29b1b04..ce75f71 100644 --- a/src/main/resources/mybatis/project/ItemMapper.xml +++ b/src/main/resources/mybatis/project/ItemMapper.xml @@ -12,10 +12,11 @@ + - select case_no, item_no, item_type, brand, number, price, source + select case_no, item_no, item_type, brand, number, price, source, creat_time from item @@ -46,7 +47,8 @@ brand, number, price, - source + source, + creat_time )values( #{caseNo}, #{itemNo}, @@ -54,7 +56,8 @@ #{brand}, #{number}, #{price}, - #{source} + #{source}, + (datetime(CURRENT_TIMESTAMP,'localtime')) ) diff --git a/src/main/resources/static/img/login-background.jpg b/src/main/resources/static/img/login-background.jpg index adfa3f9..41bea60 100644 Binary files a/src/main/resources/static/img/login-background.jpg and b/src/main/resources/static/img/login-background.jpg differ diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 7ba0681..95e4dca 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + 涉案财物信息管理系统首页 @@ -26,7 +26,7 @@
@@ -46,9 +46,9 @@
-
  • - 首页 -
    • + + +
  • @@ -191,7 +191,7 @@
      -
    • 文档
      • +
    • 锁屏
    • 全屏
    • diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 9b91840..f128b82 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -26,24 +26,24 @@
      -
      +

      登录：

      -

      你若不离不弃，我必生死相依

      +

      涉案财物信息管理系统

      @@ -64,8 +64,8 @@
      diff --git a/src/main/resources/templates/project/case/add.html b/src/main/resources/templates/project/case/add.html index 0dcad05..55a1f85 100644 --- a/src/main/resources/templates/project/case/add.html +++ b/src/main/resources/templates/project/case/add.html @@ -20,55 +20,55 @@
      - +
      - +
      - +
      -
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      diff --git a/src/main/resources/templates/project/item/add.html b/src/main/resources/templates/project/item/add.html index 34e2261..45bc71a 100644 --- a/src/main/resources/templates/project/item/add.html +++ b/src/main/resources/templates/project/item/add.html @@ -29,27 +29,27 @@
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      diff --git a/src/main/resources/templates/project/item/edit.html b/src/main/resources/templates/project/item/edit.html index b9984a5..43e3255 100644 --- a/src/main/resources/templates/project/item/edit.html +++ b/src/main/resources/templates/project/item/edit.html @@ -29,27 +29,27 @@
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      diff --git a/src/main/resources/templates/project/item/item.html b/src/main/resources/templates/project/item/item.html index 55c8104..97e7eb9 100644 --- a/src/main/resources/templates/project/item/item.html +++ b/src/main/resources/templates/project/item/item.html @@ -36,6 +36,9 @@ 导出 + + 关闭 +