From 9d0d798e1a1c3c81fe751835696636855185a066 Mon Sep 17 00:00:00 2001 From: lizhenhua <1075222162@qq.com> Date: Thu, 10 Jul 2025 10:46:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=AE=A1=E7=90=86=20youhua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/device/domain/vo/DevInfoVo.java | 4 ++ .../DeptEquipmentConfigController.java | 47 ++++++++++++++++++ .../equipment/domain/EquipmentDetail.java | 1 + .../mapper/DeptEquipmentConfigMapper.java | 2 + .../service/IDeptEquipmentConfigService.java | 3 ++ .../impl/DeptEquipmentConfigServiceImpl.java | 13 +++-- .../equipment/DeptEquipmentConfigMapper.xml | 48 +++++++++++++++++++ .../material/equipment/SysDeptMapper.xml | 4 +- 8 files changed, 115 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 96177ec..60d806a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -174,4 +174,8 @@ public class DevInfoVo extends DevInfo { @ApiModelProperty(value = "订单金额") private BigDecimal cost; + private String devicenewName; + + private String deviceTypeName; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/DeptEquipmentConfigController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/DeptEquipmentConfigController.java index 223c4ad..ce64eec 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/DeptEquipmentConfigController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/controller/DeptEquipmentConfigController.java @@ -1,12 +1,25 @@ package com.bonus.material.equipment.controller; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.material.basic.domain.BmCompanyAddress; +import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.device.domain.vo.DevInfoVo; +import com.bonus.material.equipment.domain.DeptConfigTypeSummary; import com.bonus.material.equipment.domain.DeptEquipmentConfig; +import com.bonus.material.equipment.domain.EquipmentDetail; import com.bonus.material.equipment.service.IDeptEquipmentConfigService; +import com.bonus.material.equipment.service.ISysDeptService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + @RestController @RequestMapping("/equipmentConfig") @@ -16,6 +29,8 @@ public class DeptEquipmentConfigController extends BaseController { @Autowired private IDeptEquipmentConfigService service; + @Autowired + private ISysDeptService isyservice; @GetMapping("/{deptId}") public AjaxResult getConfigByDept(@PathVariable Long deptId) { return AjaxResult.success(service.selectByDeptId(deptId)); @@ -30,4 +45,36 @@ public class DeptEquipmentConfigController extends BaseController { return AjaxResult.error("操作失败"); } } + /** + * 导出企业信息列表 + */ + @ApiOperation(value = "导出机械化施工装备配置率") + @PreventRepeatSubmit + @SysLog(title = "机械化施工装备配置率信息", businessType = OperaType.EXPORT, logType = 1,module = "出租方管理->机械化施工装备配置率信息") + @PostMapping("/export") + public void export(HttpServletResponse response, @RequestBody EquipmentDetail equipmentDetail) { + try { + List list = isyservice.detailsInfo(equipmentDetail); + ExcelUtil util = new ExcelUtil(EquipmentDetail.class); + util.exportExcel(response, list, "装备详情数据"); + } catch (Exception e) { + logger.error(e.toString(), e); + } + + } + + /** + * + * 查询机械化施工装备 + * + * 自有装备数据的数量 + * @param devInfoVo + * @return + */ + @PostMapping("/getdeviceInfo") + public AjaxResult getdeviceInfo( @RequestBody DevInfoVo devInfoVo) { + List list = service.selectDevInfoLists(devInfoVo); + return AjaxResult.success(list); + } + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java index 4dc0e08..6b5aa74 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java @@ -53,6 +53,7 @@ public class EquipmentDetail { private String ifExist; private String orderCount; private String combinedName; + private String labelVol; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/DeptEquipmentConfigMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/DeptEquipmentConfigMapper.java index f0fd3c5..cdcdfa3 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/DeptEquipmentConfigMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/DeptEquipmentConfigMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.equipment.mapper; +import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.equipment.domain.DeptEquipmentConfig; import java.util.List; @@ -11,4 +12,5 @@ public interface DeptEquipmentConfigMapper { int deleteByDeptIdAndTypeId(DeptEquipmentConfig team); + List selectDevInfoLists(DevInfoVo devInfoVo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/IDeptEquipmentConfigService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/IDeptEquipmentConfigService.java index ebfc6d1..9f26ce6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/IDeptEquipmentConfigService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/IDeptEquipmentConfigService.java @@ -1,5 +1,6 @@ package com.bonus.material.equipment.service; +import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.equipment.domain.DeptEquipmentConfig; import java.util.List; @@ -7,4 +8,6 @@ import java.util.List; public interface IDeptEquipmentConfigService { List selectByDeptId(Long deptId); int saveBatch( DeptEquipmentConfig configList); + + List selectDevInfoLists(DevInfoVo devInfoVo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/DeptEquipmentConfigServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/DeptEquipmentConfigServiceImpl.java index f7037cf..7a3c9c9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/DeptEquipmentConfigServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/DeptEquipmentConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.material.equipment.service.impl; +import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.equipment.domain.ConfigEntity; import com.bonus.material.equipment.domain.DeptEquipmentConfig; import com.bonus.material.equipment.mapper.DeptEquipmentConfigMapper; @@ -7,10 +8,7 @@ import com.bonus.material.equipment.service.IDeptEquipmentConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class DeptEquipmentConfigServiceImpl implements IDeptEquipmentConfigService { @@ -65,6 +63,13 @@ public class DeptEquipmentConfigServiceImpl implements IDeptEquipmentConfigServi configList.setConfigs(new ArrayList<>(mergedMap.values())); return mapper.insertOrUpdateBatch(configList); } + + @Override + public List selectDevInfoLists(DevInfoVo devInfoVo) { + List list = mapper.selectDevInfoLists(devInfoVo); + return list; + } + private double parseDoubleOrZero(String value) { if (value == null || value.trim().isEmpty()) { return 0.0; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml index fc6098c..4cb732e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml @@ -11,6 +11,54 @@ + INSERT INTO ma_dept_config ( 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 39d65aa..ab768c3 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 @@ -161,6 +161,7 @@