From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarColorServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarColorServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarColorServiceImpl.java
index 76b917e..68741c3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarColorServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarColorServiceImpl.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.TCarColorMapper;
import com.stylefeng.guns.modular.system.model.TCarColor;
import com.stylefeng.guns.modular.system.service.ITCarColorService;
@@ -31,8 +32,14 @@
@Override
public Map<String, Object> list(String createTime, String name, Integer offset, Integer limit) throws Exception {
Map<String, Object> map = new HashMap<>();
- List<Map<String, Object>> list = tCarColorMapper.list(createTime, name, offset, limit);
- int i = tCarColorMapper.listCount(createTime, name);
+ String start = "";
+ String end = "";
+ if(ToolUtil.isNotEmpty(createTime)){
+ start = createTime.split(" - ")[0];
+ end = createTime.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = tCarColorMapper.list(start, end, name, offset, limit);
+ int i = tCarColorMapper.listCount(start, end, name);
map.put("rows", list);
map.put("total", i);
return map;
--
Gitblit v1.7.1