From 3fb4ac8d176568fe36e446c6acf631de272e8618 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 18 Dec 2024 13:24:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=87=BA=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 | 29 +++++- .../basic/domain/InputRecordInfo.java | 2 +- .../domain/MachineHistoryRecordBean.java | 1 + .../material/basic/domain/OutRecordInfo.java | 93 +++++++++++++++++++ .../basic/mapper/ComplexQueryMapper.java | 8 ++ .../basic/service/ComplexQueryService.java | 8 ++ .../service/impl/ComplexQueryServiceImpl.java | 32 +++++++ .../material/basic/ComplexQueryMapper.xml | 62 ++++++++++++- 8 files changed, 227 insertions(+), 8 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.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 a100cd38..909a950d 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,10 +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; +import com.bonus.material.basic.domain.*; import com.bonus.material.basic.service.ComplexQueryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -122,11 +119,33 @@ public class ComplexQueryController extends BaseController { */ @ApiOperation("导出综合查询机具入库查询") @PostMapping("/exportInputRecord") - public void exportMachineHistoryRecord(HttpServletResponse response, InputRecordInfo bean) + public void exportInputRecord(HttpServletResponse response, InputRecordInfo bean) { List list = complexQueryService.getInputRecordList(bean); ExcelUtil util = new ExcelUtil<>(InputRecordInfo.class); util.exportExcel(response, list, "综合查询--机具入库查询"); } + /** + * 机具出库查询列表 + * @param bean + * @return + */ + @ApiOperation(value = "综合查询--机具出库查询列表") + @GetMapping("/getOutRecordList") + public AjaxResult getOutRecordList(OutRecordInfo bean) { + startPage(); + List list = complexQueryService.getOutRecordList(bean); + return AjaxResult.success(getDataTable(list)); + } + + @ApiOperation("导出综合查询机具出库查询") + @PostMapping("/exportOutRecord") + public void exportOutRecord(HttpServletResponse response, OutRecordInfo bean) + { + List list = complexQueryService.getOutRecordList(bean); + ExcelUtil util = new ExcelUtil<>(OutRecordInfo.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 index 160d99b0..b133978b 100644 --- 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 @@ -12,7 +12,7 @@ import java.util.Date; /** * @description 综合查询--机具入库查询 -* @author hay +* @author ma_sh * @date 2024/2/26 14:51 */ @ApiModel(description = "机具入库查询") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java index 04a65039..038eb582 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java @@ -8,6 +8,7 @@ import lombok.Data; import java.util.Date; /** + * 综合查询-设备使用追溯查询 * @Author ma_sh * @create 2024/12/16 14:03 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java new file mode 100644 index 00000000..fd8159cd --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java @@ -0,0 +1,93 @@ +package com.bonus.material.basic.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 综合查询-机具出库列表查询 + * @Author ma_sh + * @create 2024/12/18 9:23 + */ +@Data +public class OutRecordInfo { + + @ApiModelProperty(value = "主键id") + private Integer id; + + @ApiModelProperty(value = "工程Id") + private Integer proId; + + @ApiModelProperty(value = "工程名称") + @Excel(name = "工程名称") + private String proName; + + @ApiModelProperty(value = "往来单位Id") + private Integer unitId; + + @ApiModelProperty(value = "往来单位") + @Excel(name = "往来单位") + private String unitName; + + @ApiModelProperty(value = "协议号") + @Excel(name = "协议号") + private String agreementCode; + + @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 outNum; + + @ApiModelProperty(value = "出库人员") + @Excel(name = "出库人员") + private String outUser; + + @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 outTime; + + @ApiModelProperty(value = "领料单号") + @Excel(name = "领料单号") + private String leaseCode; + + @ApiModelProperty(value = "出库方式") + @Excel(name = "出库方式") + private String outStyle; + + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + + @ApiModelProperty(value = "装备管理方式") + private String manageType; +} 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 176d839c..bbd018e9 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 @@ -2,6 +2,7 @@ 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.OutRecordInfo; import com.bonus.material.basic.domain.ProjUsingRecord; import java.util.List; @@ -32,4 +33,11 @@ public interface ComplexQueryMapper { * @return */ List getInputRecordList(InputRecordInfo bean); + + /** + * 机具出库查询列表 + * @param bean + * @return + */ + List getOutRecordList(OutRecordInfo 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 445b7d2e..5026dd95 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 @@ -2,6 +2,7 @@ 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.OutRecordInfo; import com.bonus.material.basic.domain.ProjUsingRecord; import java.util.List; @@ -39,4 +40,11 @@ public interface ComplexQueryService { * @return */ List getInputRecordList(InputRecordInfo bean); + + /** + * 机具出库查询列表 + * @param bean + * @return + */ + List getOutRecordList(OutRecordInfo 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 441067af..da66ea6e 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 @@ -4,6 +4,7 @@ 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.OutRecordInfo; import com.bonus.material.basic.domain.ProjUsingRecord; import com.bonus.material.basic.mapper.ComplexQueryMapper; import com.bonus.material.basic.service.ComplexQueryService; @@ -123,4 +124,35 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { return list; } + /** + * 机具出库查询列表 + * @param bean + * @return + */ + @Override + public List getOutRecordList(OutRecordInfo bean) { + List recordList = complexQueryMapper.getOutRecordList(bean); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(recordList)) { + for (OutRecordInfo outRecordInfo : recordList) { + if (StringUtils.isNotBlank(outRecordInfo.getMaCode())) { + String[] split = outRecordInfo.getMaCode().split(","); + if (split.length > 1) { + for (String code : split) { + OutRecordInfo recordInfo = new OutRecordInfo(); + BeanUtils.copyProperties(outRecordInfo, recordInfo); + recordInfo.setMaCode(code); + list.add(recordInfo); + } + } else { + list.add(outRecordInfo); + } + } else { + list.add(outRecordInfo); + } + } + } + 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 2ac97d70..4e3be870 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 @@ -156,8 +156,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +