diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/SysDeptController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/SysDeptController.java index ba5fbd0..64ccec9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/SysDeptController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/SysDeptController.java @@ -8,6 +8,8 @@ import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.InnerAuth; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; +import com.bonus.material.equipment.domain.DeptConfigRateSummary; +import com.bonus.material.equipment.domain.DeptConfigTypeSummary; import com.bonus.material.equipment.domain.DeptEquipmentConfig; import com.bonus.material.equipment.service.ISysDeptService; import com.bonus.system.api.domain.SysDept; @@ -52,6 +54,20 @@ public class SysDeptController extends BaseController { return getDataTableError(new ArrayList<>()); } + @GetMapping("/listRate") + @SysLog(title = "装备列表", businessType = OperaType.QUERY, logType = 0, module = "系统管理->装备列表", details = "查询装备列表") + public TableDataInfo listRate(DeptConfigRateSummary user) { + try { + startPage(); + List list = service.selectDeptConfigRatePivot(user); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + @PostMapping("/selectConfigList") public AjaxResult selectConfigList(@RequestBody DeptEquipmentConfig user) { return service.selectConfigList(user); @@ -61,4 +77,17 @@ public class SysDeptController extends BaseController { public AjaxResult getTree() { return service.getTree(); } + + @GetMapping("/listConfigType") + @SysLog(title = "装备列表", businessType = OperaType.QUERY, logType = 0, module = "系统管理->装备列表", details = "查询装备列表") + public TableDataInfo listConfigType(DeptConfigTypeSummary user) { + try { + startPage(); + List list = service.selectDeptConfigTypeSummary(user); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptConfigRateSummary.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptConfigRateSummary.java new file mode 100644 index 0000000..445c602 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptConfigRateSummary.java @@ -0,0 +1,23 @@ +package com.bonus.material.equipment.domain; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class DeptConfigRateSummary { + + /** 部门ID */ + private Long deptId; + + private String deptName; + + /** 配置类型A的装备配置率累计值 */ + private BigDecimal valueA; + + /** 配置类型B的装备配置率累计值 */ + private BigDecimal valueB; + + /** 配置类型C的装备配置率累计值 */ + private BigDecimal valueC; +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptConfigTypeSummary.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptConfigTypeSummary.java new file mode 100644 index 0000000..c4159a6 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptConfigTypeSummary.java @@ -0,0 +1,23 @@ +package com.bonus.material.equipment.domain; + +import lombok.Data; +import java.math.BigDecimal; + +@Data +public class DeptConfigTypeSummary { + /** 部门ID */ + private Long deptId; + + /** 子类型名称(mt1.type_name) */ + private String typeName; + + /** 父类型名称(mt2.type_name) */ + private String parentTypeName; + + /** 配置率(已转数值) */ + private BigDecimal configRate; + + /** 配置说明 */ + private String configDescription; +} + diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java index 92742e2..d1e75ea 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java @@ -4,6 +4,7 @@ import com.bonus.material.equipment.domain.ConfigEntity; import com.bonus.material.equipment.domain.DeptEquipmentConfig; import com.bonus.material.equipment.domain.DeptTreeSelect; import com.bonus.material.equipment.domain.SysDept; +import com.bonus.material.equipment.domain.*; import com.bonus.system.api.domain.SysUser; import java.util.List; @@ -13,10 +14,14 @@ public interface SysDeptMapper { List selectDeptList(com.bonus.system.api.domain.SysDept dept); - List selectUserList(DeptEquipmentConfig user); + List selectUserList(DeptEquipmentConfig user); List selectConfigList(DeptEquipmentConfig user); + List selectDeptConfigRatePivot(DeptConfigRateSummary entity); + + List selectDeptConfigTypeSummary(DeptConfigTypeSummary entity); + List getTree(); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/ISysDeptService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/ISysDeptService.java index e49c9ec..1fb8f42 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/ISysDeptService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/ISysDeptService.java @@ -1,6 +1,7 @@ package com.bonus.material.equipment.service; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.equipment.domain.*; import com.bonus.material.equipment.domain.DeptEquipmentConfig; import com.bonus.material.equipment.domain.DeptTreeSelect; import com.bonus.system.api.domain.SysDept; @@ -18,4 +19,8 @@ public interface ISysDeptService { AjaxResult selectConfigList(DeptEquipmentConfig user); AjaxResult getTree(); + + List selectDeptConfigRatePivot(DeptConfigRateSummary entity); + + List selectDeptConfigTypeSummary(DeptConfigTypeSummary entity); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java index 2e31475..20ad552 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java @@ -8,9 +8,7 @@ import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.datascope.annotation.DataScope; import com.bonus.common.datascope.utils.CommonDataPermissionInfo; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.equipment.domain.ConfigEntity; -import com.bonus.material.equipment.domain.DeptEquipmentConfig; -import com.bonus.material.equipment.domain.DeptTreeSelect; +import com.bonus.material.equipment.domain.*; import com.bonus.material.equipment.mapper.SysDeptMapper; import com.bonus.material.equipment.service.ISysDeptService; import com.bonus.system.api.domain.SysDept; @@ -68,6 +66,16 @@ public class SysDeptServiceImpl implements ISysDeptService { } } + @Override + public List selectDeptConfigRatePivot(DeptConfigRateSummary entity) { + return mapper.selectDeptConfigRatePivot(entity); + } + + @Override + public List selectDeptConfigTypeSummary(DeptConfigTypeSummary entity) { + return mapper.selectDeptConfigTypeSummary(entity); + } + /** * 查询部门管理数据 * diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml index ea17313..68acf5e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml @@ -101,6 +101,30 @@ WHERE mt.level = 3 GROUP BY mt.type_id, mt2.type_name, mt.type_name + +