From a1a2bc44adacc0f0f5368c50d343c3ccc57ffd19 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 23 Oct 2025 18:45:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E5=BA=93=E5=AD=98=E3=80=81?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComplexQueryController.java | 19 ++++++ .../basic/mapper/ComplexQueryMapper.java | 8 +++ .../basic/service/ComplexQueryService.java | 9 +++ .../service/impl/ComplexQueryServiceImpl.java | 14 +++++ .../material/part/domain/PartInventory.java | 32 ++++++++++ .../material/repair/domain/RepairTask.java | 14 +++++ .../service/impl/RepairServiceImpl.java | 7 ++- .../material/basic/ComplexQueryMapper.xml | 27 +++++++++ .../mapper/material/repair/RepairMapper.xml | 60 +++++++++++-------- 9 files changed, 165 insertions(+), 25 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java index 48c55cc9..a67a851c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java @@ -8,13 +8,19 @@ import com.bonus.common.core.utils.bean.BeanUtils; 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.common.security.utils.SecurityUtils; import com.bonus.material.basic.domain.ProjUsingRecordExports; import com.bonus.material.basic.domain.*; import com.bonus.material.basic.domain.vo.MaTypeSelectInfo; import com.bonus.material.basic.service.ComplexQueryService; +import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.lease.mapper.LeaseApplyInfoMapper; import com.bonus.material.ma.domain.Type; +import com.bonus.material.part.domain.PartInventory; +import com.bonus.material.part.domain.PartTypeCheckInfo; +import com.bonus.material.part.domain.PartTypeQueryDto; import com.bonus.system.api.model.LoginUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -474,6 +480,19 @@ public class ComplexQueryController extends BaseController { return AjaxResult.success(getDataTable(pageList)); } + /** + * 导出配件库存 + */ + @ApiOperation("导出配件库存") + @PreventRepeatSubmit + @SysLog(title = "导出配件库存", businessType = OperaType.EXPORT, module = "配件库存->导出配件库存") + @PostMapping("/export") + public void export(HttpServletResponse response, RetainedEquipmentInfo bean) { + List list = complexQueryService.getPartInventory(bean); + ExcelUtil util = new ExcelUtil<>(PartInventory.class); + util.exportExcel(response, list, "配件库存"); + } + /** * 施工机具需求、供应分析统计表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java index 525d260e..08d7bacd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java @@ -3,6 +3,7 @@ package com.bonus.material.basic.mapper; import com.bonus.material.basic.domain.*; import com.bonus.material.basic.domain.vo.MaTypeSelectInfo; import com.bonus.material.ma.domain.Type; +import com.bonus.material.part.domain.PartInventory; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -240,4 +241,11 @@ public interface ComplexQueryMapper { * @return */ List getRepairAuditList(RepairStorageInfo bean); + + /** + * 获取配件库存数量 + * @param bean + * @return + */ + List getPartInventory(RetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java index b1656e7f..716d5ddb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java @@ -3,6 +3,8 @@ package com.bonus.material.basic.service; import com.bonus.material.basic.domain.*; import com.bonus.material.basic.domain.vo.MaTypeSelectInfo; import com.bonus.material.ma.domain.Type; +import com.bonus.material.part.domain.PartInventory; +import com.bonus.material.part.domain.PartTypeQueryDto; import java.util.List; @@ -152,4 +154,11 @@ public interface ComplexQueryService { * @return */ List getStorageNumLogDetails(Type bean); + + /** + * 配件库存查询 + * @param bean + * @return + */ + List getPartInventory(RetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index ce39bc7b..621d1669 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -10,6 +10,8 @@ import com.bonus.material.basic.domain.vo.MaTypeSelectInfo; import com.bonus.material.basic.mapper.ComplexQueryMapper; import com.bonus.material.basic.service.ComplexQueryService; import com.bonus.material.ma.domain.Type; +import com.bonus.material.part.domain.PartInventory; +import com.bonus.material.part.domain.PartTypeQueryDto; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -790,4 +792,16 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { return new ArrayList<>(); } } + + @Override + public List getPartInventory(RetainedEquipmentInfo bean) { + try { + Long userId = SecurityUtils.getLoginUser().getUserid(); + bean.setUserId(userId); + return complexQueryMapper.getPartInventory(bean); + } catch (Exception e) { + e.printStackTrace(); + return new ArrayList<>(); + } + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java new file mode 100644 index 00000000..555ca6ef --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java @@ -0,0 +1,32 @@ +package com.bonus.material.part.domain; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; + +import java.math.BigDecimal; + +@Data +public class PartInventory { + private Long id; + + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + @ApiModelProperty(value = "物资名称") + @Excel(name = "配件名称") + private String typeName; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "计量单位") + @Excel(name = "单位") + private String unit; + + @ApiModelProperty(value = "在库数量") + @Excel(name = "库存",cellType = Excel.ColumnType.NUMERIC) + private BigDecimal storeNum; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java index c6a1b11b..a3d91145 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java @@ -212,4 +212,18 @@ public class RepairTask { @ApiModelProperty(value = "退料ID") private Long backId; + + /** + * 签名地址 + */ + @ApiModelProperty(value = "签名地址") + private String signUrl; + + @ApiModelProperty(value = "签名类型 手写0 和 图片上传1") + private int signType; + + /** + * 维修完成时间 + */ + private String repairTime; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 05ff731b..9e4e4c1b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -326,6 +326,11 @@ public class RepairServiceImpl implements RepairService { if (Objects.isNull(repairTaskInfo)) { return AjaxResult.error("未查询到维修任务信息"); } + if (StringUtils.isNotBlank(repairTaskInfo.getSignUrl())) { + if (!repairTaskInfo.getSignUrl().startsWith("http")) { + repairTaskInfo.setSignUrl("data:image/png;base64," + repairTaskInfo.getSignUrl()); + } + } // 查询维修任务详情 // List repairMaTypeGroupList = getRepairMaTypeList(new RepairTaskDetails(taskId), true); // repairMaTypeGroupList.removeIf(Objects::isNull); @@ -1026,7 +1031,7 @@ public class RepairServiceImpl implements RepairService { } repairApplyRecord.setCreateBy(loginUser.getSysUser().getNickName()); repairApplyRecord.setStatus(0L); - if (bean.getInRepairList() != null) { + if (bean.getInRepairList() != null && bean.getInRepairList().size() > 0) { repairApplyRecord.setRemark(StringUtils.isNotBlank(bean.getInRepairList().get(0).getRemark()) ? bean.getInRepairList().get(0).getRemark() : ""); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index aa4a5119..a5b70710 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -1819,5 +1819,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY mm.ma_id,tt.`code`,mt.type_id + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 96559bc0..91e78a23 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -230,31 +230,43 @@