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 df77a2ba..e6e3401f 100644 Binary files a/ruoyi-admin/src/main/resources/static/favicon.ico and b/ruoyi-admin/src/main/resources/static/favicon.ico differ 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;