From e5e2b286b26540077f930a16eb4843dce7ad3a02 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 18 Dec 2024 09:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=85=A5=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComplexQueryController.java | 31 +++++++ .../basic/domain/InputRecordInfo.java | 84 +++++++++++++++++++ .../basic/mapper/ComplexQueryMapper.java | 8 ++ .../basic/service/ComplexQueryService.java | 7 ++ .../service/impl/ComplexQueryServiceImpl.java | 45 ++++++++++ .../material/basic/ComplexQueryMapper.xml | 50 +++++++++++ 6 files changed, 225 insertions(+) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.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 3077b41c..a100cd38 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 @@ -4,6 +4,7 @@ import com.alibaba.nacos.common.utils.CollectionUtils; 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.material.basic.domain.InputRecordInfo; import com.bonus.material.basic.domain.MachineHistoryRecordBean; import com.bonus.material.basic.domain.ProjUsingDto; import com.bonus.material.basic.domain.ProjUsingRecord; @@ -89,6 +90,11 @@ public class ComplexQueryController extends BaseController { return AjaxResult.success(getDataTable(list)); } + /** + * 导出设备使用追溯查询 + * @param response + * @param bean + */ @ApiOperation("导出综合查询设备使用追溯查询") @PostMapping("/exportMachineHistoryRecord") public void exportMachineHistoryRecord(HttpServletResponse response, MachineHistoryRecordBean bean) @@ -98,4 +104,29 @@ public class ComplexQueryController extends BaseController { util.exportExcel(response, list, "综合查询--设备使用追溯查询"); } + /** + * 机具入库查询列表 + */ + @ApiOperation(value = "综合查询--机具入库查询列表") + @GetMapping("/getInputRecordList") + public AjaxResult getInputRecordList(InputRecordInfo bean) { + startPage(); + List list = complexQueryService.getInputRecordList(bean); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 导出机具入库查询 + * @param response + * @param bean + */ + @ApiOperation("导出综合查询机具入库查询") + @PostMapping("/exportInputRecord") + public void exportMachineHistoryRecord(HttpServletResponse response, InputRecordInfo bean) + { + List list = complexQueryService.getInputRecordList(bean); + ExcelUtil util = new ExcelUtil<>(InputRecordInfo.class); + util.exportExcel(response, list, "综合查询--机具入库查询"); + } + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java new file mode 100644 index 00000000..160d99b0 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java @@ -0,0 +1,84 @@ +package com.bonus.material.basic.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** +* @description 综合查询--机具入库查询 +* @author hay +* @date 2024/2/26 14:51 +*/ +@ApiModel(description = "机具入库查询") +@Data +public class InputRecordInfo { + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "主键id") + private Integer id; + + @ApiModelProperty(value = "物资名称") + @Excel(name = "物资名称") + private String typeName; + + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + @ApiModelProperty(value = "计量单位") + @Excel(name = "计量单位") + private String unit; + + @ApiModelProperty(value = "入库数量") + @Excel(name = "入库数量") + private BigDecimal inputNum; + + @ApiModelProperty(value = "入库人员") + @Excel(name = "入库人员") + private String inputUser; + + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date inputTime; + + @ApiModelProperty(value = "入库单号") + @Excel(name = "入库单号") + private String inputCode; + + @ApiModelProperty(value = "入库类型") + @Excel(name = "入库类型") + private String inputType; + + @ApiModelProperty(value = "入库方式") + @Excel(name = "入库方式") + private String inputStyle; + + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + + @ApiModelProperty(value = "装备管理方式") + private String manageType; + +} \ No newline at end of file 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 2bfe998d..176d839c 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 @@ -1,5 +1,6 @@ package com.bonus.material.basic.mapper; +import com.bonus.material.basic.domain.InputRecordInfo; import com.bonus.material.basic.domain.MachineHistoryRecordBean; import com.bonus.material.basic.domain.ProjUsingRecord; @@ -24,4 +25,11 @@ public interface ComplexQueryMapper { * @return */ List getMachineHistoryRecordList(MachineHistoryRecordBean bean); + + /** + * 机具入库查询列表 + * @param bean + * @return + */ + List getInputRecordList(InputRecordInfo 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 49db68ac..445b7d2e 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 @@ -1,5 +1,6 @@ package com.bonus.material.basic.service; +import com.bonus.material.basic.domain.InputRecordInfo; import com.bonus.material.basic.domain.MachineHistoryRecordBean; import com.bonus.material.basic.domain.ProjUsingRecord; @@ -32,4 +33,10 @@ public interface ComplexQueryService { */ List exportProjUsingRecord(ProjUsingRecord bean); + /** + * 机具入库查询列表 + * @param bean + * @return + */ + List getInputRecordList(InputRecordInfo 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 d1da792f..441067af 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 @@ -1,16 +1,20 @@ package com.bonus.material.basic.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.common.utils.StringUtils; +import com.bonus.material.basic.domain.InputRecordInfo; import com.bonus.material.basic.domain.MachineHistoryRecordBean; import com.bonus.material.basic.domain.ProjUsingRecord; import com.bonus.material.basic.mapper.ComplexQueryMapper; import com.bonus.material.basic.service.ComplexQueryService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * 综合查询服务实现类 @@ -78,4 +82,45 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { return list; } + /** + * 机具入库查询列表 + * @param bean + * @return + */ + @Override + public List getInputRecordList(InputRecordInfo bean) { + List recordList = complexQueryMapper.getInputRecordList(bean); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(recordList)) { + for (InputRecordInfo inputRecordInfo : recordList) { + if (StringUtils.isNotBlank(inputRecordInfo.getMaCode())) { + String[] split = inputRecordInfo.getMaCode().split(","); + if (split.length > 1) { + for (String code : split) { + InputRecordInfo newRecord = new InputRecordInfo(); + BeanUtils.copyProperties(inputRecordInfo, newRecord); + newRecord.setMaCode(code); + list.add(newRecord); + } + } else { + list.add(inputRecordInfo); + } + } else { + list.add(inputRecordInfo); + } + } + } + if (StringUtils.isNotBlank(bean.getKeyWord())) { + String keyword = bean.getKeyWord(); + return list.stream().filter(item -> { + return (StringUtils.isNotBlank(item.getMaCode()) && item.getMaCode().contains(keyword)) || + (StringUtils.isNotBlank(item.getTypeName()) && item.getTypeName().contains(keyword)) || + (StringUtils.isNotBlank(item.getTypeModelName()) && item.getTypeModelName().contains(keyword)) || + (StringUtils.isNotBlank(item.getInputUser()) && item.getInputUser().contains(keyword)) || + (StringUtils.isNotBlank(item.getInputCode()) && item.getInputCode().contains(keyword)); + }).collect(Collectors.toList()); + } + return list; + } + } 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 bc2ab0a1..2ac97d70 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 @@ -230,4 +230,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bai.agreement_code + +