From 11b96058d929b7fb8d86f301721541832e08ec24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com> Date: Fri, 24 Apr 2026 08:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E4=BB=A5=E5=8F=8A=E9=A6=96=E9=A1=B5=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysIndexController.java | 10 +- .../src/main/resources/static/favicon.ico | Bin 4286 -> 27021 bytes .../resources/templates/index-topnav.html | 4 +- .../src/main/resources/templates/index.html | 4 +- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/main_v1.html | 570 ++++++------------ .../templates/tyre/install/install.html | 10 +- .../resources/templates/tyre/tyre/stat.html | 9 +- .../resources/templates/tyre/tyre/tyre.html | 12 +- .../templates/tyre/uninstall/install.html | 10 +- ruoyi-common/pom.xml | 5 + .../common/core/domain/entity/SysDeptVo.java | 9 + .../com/ruoyi/system/domain/BaseTyre.java | 22 +- .../system/domain/RecordTyreInstall.java | 21 +- .../system/mapper/BaseInventoryMapper.java | 3 +- .../mapper/RecordWarehousingMapper.java | 3 +- .../system/service/IBaseInventoryService.java | 3 +- .../service/IRecordWarehousingService.java | 3 +- .../impl/BaseInventoryServiceImpl.java | 5 +- .../service/impl/BaseTyreServiceImpl.java | 1 + .../impl/RecordWarehousingServiceImpl.java | 5 +- .../mapper/tyre/BaseInventoryMapper.xml | 9 +- .../resources/mapper/tyre/BaseTyreMapper.xml | 48 +- .../mapper/tyre/RecordTyreInstallMapper.xml | 9 +- .../mapper/tyre/RecordWarehousingMapper.xml | 13 +- 25 files changed, 373 insertions(+), 419 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDeptVo.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index f0d7c4e9..2060830e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -2,6 +2,8 @@ package com.ruoyi.web.controller.system; import java.util.Date; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysDeptVo; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -147,12 +149,14 @@ public class SysIndexController extends BaseController @PostMapping("/queryIndexData") @ResponseBody - public AjaxResult queryIndexData() + public AjaxResult queryIndexData(SysDeptVo sysDeptVo) { + Map map =new HashMap(); //查询库存、在用轮胎数量、车辆数量 - Map tireTypeTotal = iBaseInventoryService.querytotal(); - List mapList = iRecordWarehousingService.selectRecord(); + + Map tireTypeTotal = iBaseInventoryService.querytotal(sysDeptVo); + List mapList = iRecordWarehousingService.selectRecord(sysDeptVo); //规格占比 List mapListTyreModel = iRecordWarehousingService.selectTyreModel(); //新胎装车统计 diff --git a/ruoyi-admin/src/main/resources/static/favicon.ico b/ruoyi-admin/src/main/resources/static/favicon.ico index df77a2ba75d38b2f9c85cd0d6193ddcd850fffc5..e6e3401f93de281d65943775937e42ce475beaae 100644 GIT binary patch literal 27021 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 LwzGO_=@s=qyQRbC literal 4286 zcmeI$ZAjHu0LSs8Qn!@t#;m9jUBL>c43r)WAG)q4KGYr4o>ntr59I_?2d2RoTx_)U zqKMj)4+RnfVZIo#O)87qi_vfy)T?lGHLvu?RIsg0quK(liuBJEkW-soQkLTR; z|DW?a|8vg0g2p8AlaXQc+w?3lW~nhI3pAM$s6F!H+DmDZCL0pJ6DyEdfy4?-UxD_L zBm)opcmsi1==ypjWBOomw5T6auo#8dgLSwF2Y+G0t?PZP0ov3zj~;qbG;aEIljbWC`Zq`1*y>7ilJOx8wl3CTu{+o zwWGYfdS7{aRZX;w-@X&bzSQ`7&cy~PMeh3_ZAk9$8;vvLylC%$)>h+xk7bD5@0N=w zuft)Sq1FSL)mi-?UMFV+Lm0NmdyEm+6WaS*4`$}mPkXt<9q(WBpv^wpAJlb@rsitv zl%FB82Va!VYkTE#Qx_SIYn1ZQ41Obju=1-nw{;eq6ZF@9?t=DuY7W$YfyRD_d_-Tf z>rhGiC>+MRkl*`m19?x~{2wTDunMbVtqwJ(b#FAvtVbAKSP46}+JA@6c9U(llW^bb zjNFFy;MdyLwY#z}H{K;nYcPnFuwAB=?il)P9fF?YD%L=ANW*dbi95(cWNsSBt*dV* zv`*uvDpOn7gI+g(jB>Z~1%6I`Scm$obb+FmC+)LXy96oE`k~^S$*5YAV=k`EXu{q53&!HThrEVO-PGm!WQzOqdXXq?9 zkg2uSnQz1uTza*yK5%os(K*rI4n3dhTEG9CH`7$ev~x(IE|Jfm+7qwD3M5wG|Gxsx z9IpxEb;1aOZ%e<&7@yY|k2h#iyg~mpPtYGe8uAT?LcZ{@@rB2YFX-?u2ReD23FCJh I@2m-b1CZ)_Q2+n{ diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index c72623e0..a0c19733 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -4,7 +4,7 @@ - 智能轮胎管理系统 + 公交轮胎管理系统 @@ -27,7 +27,7 @@

diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index cb745e01..368bde2a 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 智能轮胎管理系统 + 公交轮胎管理系统 @@ -26,7 +26,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 507dd170..ed835d03 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -3,8 +3,8 @@ - 智能轮胎系统登录 - + 公交轮胎管理系统登录 + diff --git a/ruoyi-admin/src/main/resources/templates/main_v1.html b/ruoyi-admin/src/main/resources/templates/main_v1.html index 320f83f1..5eae8c04 100644 --- a/ruoyi-admin/src/main/resources/templates/main_v1.html +++ b/ruoyi-admin/src/main/resources/templates/main_v1.html @@ -30,8 +30,8 @@ @@ -43,7 +43,7 @@
  • -  搜索 +  搜索  重置
    • @@ -213,426 +213,248 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/install/install.html b/ruoyi-admin/src/main/resources/templates/tyre/install/install.html index 1c4cc03c..48766884 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/install/install.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/install/install.html @@ -115,9 +115,17 @@ field : 'tyreModel', title : '规格型号' }, + { + field : 'company', + title : '所属分公司' + }, { field : 'team', - title : '所属分公司车队' + title : '所属分公司修理厂' + }, + { + field : 'carTeam', + title : '车队' }, { field : 'carNo', diff --git a/ruoyi-admin/src/main/resources/templates/tyre/tyre/stat.html b/ruoyi-admin/src/main/resources/templates/tyre/tyre/stat.html index 8fd11c21..e106532a 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/tyre/stat.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/tyre/stat.html @@ -60,8 +60,7 @@ { title : '在车轮胎', align : 'center', - rowspan : 2 - + rowspan : 1 } ], [{ @@ -79,7 +78,11 @@ }, { field : '实验胎', title : '实验胎' - } + }, + { + field : '在车轮胎', + title : '在车轮胎' + } ] ] }; diff --git a/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html b/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html index 8943d057..7a612228 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html @@ -42,7 +42,7 @@
  • -

    所属车队：

    +

    修理厂：

  • @@ -166,10 +166,18 @@ field : 'wheelPostion', title : '安装轮位' }, + { + field : 'company', + title : '所属公司' + }, { field : 'team', - title : '所属车队' + title : '所属修理厂' }, + { + field : 'carTeam', + title : '所属车队' + }, { field : 'remark', title : '备注' diff --git a/ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html index 5c3887ed..136a6340 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html @@ -115,9 +115,17 @@ field : 'tyreModel', title : '规格型号' }, + { + field : 'company', + title : '所属分公司' + }, { field : 'team', - title : '所属分公司车队' + title : '所属分公司修理厂' + }, + { + field : 'carTeam', + title : '车队' }, { field : 'carNo', diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index b2575a39..8d45b577 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -95,6 +95,11 @@ jakarta.servlet jakarta.servlet-api + + org.projectlombok + lombok + provided + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDeptVo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDeptVo.java new file mode 100644 index 00000000..3c2d0802 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDeptVo.java @@ -0,0 +1,9 @@ +package com.ruoyi.common.core.domain.entity; + +import lombok.Data; + +@Data +public class SysDeptVo { + private Long branchCompany; + private Long repairShop; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java index 0489322b..0d335135 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java @@ -57,10 +57,14 @@ public class BaseTyre extends BaseEntity /** 轮胎类别 */ @Excel(name = "轮胎类别") private String tyreType; + @Excel(name = "所属公司") + private String company; /** 所属车队 */ - @Excel(name = "所属车队") + @Excel(name = "所属修理厂") private String team; + @Excel(name = "所属车队") + private String carTeam; @Excel(name = "安装车辆") private String carNo; @@ -68,6 +72,22 @@ public class BaseTyre extends BaseEntity private String wheelPostion; + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + public String getCarTeam() { + return carTeam; + } + + public void setCarTeam(String carTeam) { + this.carTeam = carTeam; + } + public String getPatternDepth() { return patternDepth; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java index 6628c11a..27c762f5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java @@ -25,8 +25,12 @@ public class RecordTyreInstall extends BaseEntity private String tyreNo; @Excel(name = "规格型号") private String tyreModel; - @Excel(name = "所属") + @Excel(name = "分公司") + private String company; + @Excel(name = "修理厂") private String team; + @Excel(name = "车队") + private String carTeam; private String tyreBrand; /** 类型 0安装 1卸下 */ @@ -45,6 +49,21 @@ public class RecordTyreInstall extends BaseEntity private String selfNo; + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + public String getCarTeam() { + return carTeam; + } + + public void setCarTeam(String carTeam) { + this.carTeam = carTeam; + } public String getTyreModel() { return tyreModel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java index d895950e..bb821c18 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseInventoryMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; +import com.ruoyi.common.core.domain.entity.SysDeptVo; import com.ruoyi.system.domain.BaseInventory; import java.util.List; @@ -67,7 +68,7 @@ public interface BaseInventoryMapper int updateBaseInventoryByEpc(BaseInventory baseInventory); - Map querytotal(); + Map querytotal(SysDeptVo sysDeptVo); int queryInCar(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java index 147beff0..df9e0cfe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordWarehousingMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; +import com.ruoyi.common.core.domain.entity.SysDeptVo; import com.ruoyi.system.domain.RecordWarehousing; import java.util.List; @@ -63,7 +64,7 @@ public interface RecordWarehousingMapper */ public int deleteRecordWarehousingByIds(String[] ids); - List selectRecord(); + List selectRecord(SysDeptVo sysDeptVo); List selectTyreModel(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java index 268049d1..09981f26 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseInventoryService.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDeptVo; import com.ruoyi.system.domain.BaseInventory; import com.ruoyi.system.domain.BaseTyre; @@ -68,7 +69,7 @@ public interface IBaseInventoryService AjaxResult OutInventoryByPda(BaseInventory baseInventory, BaseTyre baseTyre); - Map querytotal(); + Map querytotal(SysDeptVo sysDeptVo); int queryInCar(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java index 6e4a53d2..1d848f23 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordWarehousingService.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service; +import com.ruoyi.common.core.domain.entity.SysDeptVo; import com.ruoyi.system.domain.RecordWarehousing; import java.util.List; @@ -62,7 +63,7 @@ public interface IRecordWarehousingService */ public int deleteRecordWarehousingById(Long id); - List selectRecord(); + List selectRecord(SysDeptVo sysDeptVo); List selectTyreModel(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java index b4931474..c9ae9188 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDeptVo; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; @@ -208,8 +209,8 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService } @Override - public Map querytotal() { - return baseInventoryMapper.querytotal(); + public Map querytotal(SysDeptVo sysDeptVo) { + return baseInventoryMapper.querytotal(sysDeptVo); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java index b97480ec..d146ac45 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java @@ -208,6 +208,7 @@ public class BaseTyreServiceImpl implements IBaseTyreService } @Override + @DataScope(deptAlias = "d", userAlias = "u") public List vTyreStockSummary(SysDept sysDept) { List mapList = baseTyreMapper.vTyreStockSummary(sysDept); return mapList; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java index 00288c67..d797db7c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordWarehousingServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.entity.SysDeptVo; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; @@ -101,8 +102,8 @@ public class RecordWarehousingServiceImpl implements IRecordWarehousingService } @Override - public List selectRecord() { - return recordWarehousingMapper.selectRecord(); + public List selectRecord(SysDeptVo sysDeptVo) { + return recordWarehousingMapper.selectRecord(sysDeptVo); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml index 75f962bc..7bdbc9d9 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT COUNT(bi.id) AS total, COUNT(CASE WHEN bt.tyre_type IN ('全新胎', 'new') THEN 1 END) AS new, @@ -69,8 +69,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" COUNT(CASE WHEN bt.tyre_type IN ('renovate') THEN 1 END) AS renovate, COUNT(CASE WHEN bt.tyre_type IN ('experimental') THEN 1 END) AS experimental FROM base_inventory bi - INNER JOIN base_tyre bt ON bi.tyre_rfid = bt.tyre_epc - WHERE bi.status = '0'; + INNER JOIN base_tyre bt ON bi.tyre_rfid = bt.tyre_epc + LEFT JOIN sys_dept d ON d.dept_id = bt.dept_id + WHERE bi.status = '0' + AND (bt.dept_id IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{branchCompany} OR find_in_set( #{branchCompany}, ancestors))) + AND (bt.dept_id IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{repairShop} OR find_in_set( #{repairShop}, ancestors))) diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml index 8b6e19cd..a37d0750 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml @@ -23,7 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + @@ -31,9 +32,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml index 81ded169..77bb06f7 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -30,10 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT - DATE(create_time) AS date, + DATE(rw.create_time) AS date, SUM(CASE WHEN type = 0 THEN 1 ELSE 0 END) AS type_0_count, SUM(CASE WHEN type = 1 THEN 1 ELSE 0 END) AS type_1_count - FROM record_warehousing - WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 MONTH) - AND create_time < CURDATE() + INTERVAL 1 DAY - GROUP BY DATE(create_time) + FROM record_warehousing rw + LEFT JOIN base_tyre bt ON bt.tyre_epc = rw.tyre_rfid + WHERE rw.create_time >= DATE_SUB(CURDATE(), INTERVAL 1 MONTH) + AND rw.create_time < CURDATE() + INTERVAL 1 DAY + GROUP BY DATE(rw.create_time) ORDER BY date;