From 0b5bc3ec52397efad552c0ed16b35afb9caa7cba Mon Sep 17 00:00:00 2001
From: "1539530615@qq.com" <1539530615@qq.com>
Date: Sun, 18 Feb 2024 09:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E7=AE=A1=E7=90=86=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/app/PurchaseInputMapper.xml | 3 +-
.../RepairAuditDetailsController.java | 13 ++
.../sgzb/material/domain/RepairPart.java | 98 ++++++++++++++
.../sgzb/material/domain/RepairRecord.java | 125 ++++++++++++++++++
.../service/IRepairAuditDetailsService.java | 3 +
.../impl/RepairAuditDetailsServiceImpl.java | 5 +
.../material/PurchaseCheckDetailsMapper.xml | 2 +-
.../material/PurchaseMacodeInfoMapper.xml | 2 +-
8 files changed, 247 insertions(+), 4 deletions(-)
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairRecord.java
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
index b5bf9372..5cd9ab47 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
@@ -162,7 +162,6 @@
select IFNULL(input_num,0) from purchase_check_details where task_id = #{taskId} and type_id = #{typeId}
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java
index 8e6e169f..7459299d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java
@@ -5,6 +5,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairRecord;
import com.bonus.sgzb.material.service.IRepairAuditDetailsService;
import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
@@ -88,6 +89,18 @@ public class RepairAuditDetailsController extends BaseController
return getDataTable(list);
}
+ /**
+ * 查看维修记录
+ */
+ @ApiOperation("查看维修记录")
+ @GetMapping("/getRepairRecord")
+ public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails)
+ {
+ startPage();
+ List list = repairAuditDetailsService.getRepairRecord(repairAuditDetails);
+ return getDataTable(list);
+ }
+
/**
* 修饰任务审核
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
new file mode 100644
index 00000000..1ca3301c
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
@@ -0,0 +1,98 @@
+package com.bonus.sgzb.material.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author c liu
+ * @date 2023/12/11
+ */
+@Data
+@ApiModel(value="维修配件")
+public class RepairPart {
+ /**
+ * 任务ID
+ */
+ @ApiModelProperty(value = "任务ID")
+ private String taskId;
+ /**
+ * 机具ID
+ */
+ @ApiModelProperty(value = "机具ID")
+ private String maId;
+ /**
+ * 规格ID
+ */
+ @ApiModelProperty(value = "规格ID")
+ private String typeId;
+ /**
+ * 配件ID
+ */
+ @ApiModelProperty(value = "配件ID")
+ private Long partId;
+ /**
+ * 配件名称
+ */
+ @ApiModelProperty(value = "配件名称")
+ private String partName;
+ /**
+ * 返厂id
+ */
+ @ApiModelProperty(value = "返厂id")
+ private String supplierId;
+ /**
+ * 配件数量
+ */
+ @ApiModelProperty(value = "配件数量")
+ private int partNum;
+ /**
+ * 配件费用
+ */
+ @ApiModelProperty(value = "配件费用")
+ private String partCost;
+ /**
+ * 配件单价
+ */
+ @ApiModelProperty(value = "配件单价")
+ private String partPrice;
+ /**
+ * 类型（0不收费，1收费）
+ */
+ @ApiModelProperty(value = "类型（0不收费，1收费）")
+ private String partType;
+ /**
+ * 创建者
+ */
+ @ApiModelProperty(value = "创建者")
+ private Long createBy;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private String createTime;
+ /**
+ * 更新者
+ */
+ @ApiModelProperty(value = "更新者")
+ private String updateBy;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private String updateTime;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 维修内容
+ */
+ @ApiModelProperty(value = "维修内容")
+ private String repairContent;
+ private Long companyId;
+ private Long repairer;
+ @ApiModelProperty(value = "维修数量")
+ private int repairNum;
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairRecord.java
new file mode 100644
index 00000000..e82fbc22
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairRecord.java
@@ -0,0 +1,125 @@
+package com.bonus.sgzb.material.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author c liu
+ * @date 2023/12/11
+ */
+@Data
+@ApiModel(value="维修任务详细")
+public class RepairRecord implements Serializable {
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ /**
+ * 任务ID
+ */
+ @ApiModelProperty(value = "任务ID")
+ private String taskId;
+ /**
+ * 机具ID
+ */
+ @ApiModelProperty(value = "机具ID")
+ private String maId;
+ /**
+ * 规格ID
+ */
+ @ApiModelProperty(value = "规格ID")
+ private String typeId;
+ /**
+ * 维修数量
+ */
+ @ApiModelProperty(value = "维修数量")
+ private int repairNum;
+ /**
+ * 报废数量
+ */
+ @ApiModelProperty(value = "报废数量")
+ private int scrapNum;
+ /**
+ * 维修方式（1内部2返厂3报废）
+ */
+ @ApiModelProperty(value = "维修方式（1内部2返厂3报废）")
+ private String repairType;
+ /**
+ * 创建者
+ */
+ @ApiModelProperty(value = "创建者")
+ private Long createBy;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private String createTime;
+ /**
+ * 更新者
+ */
+ @ApiModelProperty(value = "更新者")
+ private String updateBy;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private String updateTime;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 报废原因
+ */
+ @ApiModelProperty(value = "报废原因")
+ private String scrapReason;
+ /**
+ * 报废类型（0：自然报废，1任务报废）
+ */
+ @ApiModelProperty(value = "报废类型（0：自然报废，1任务报废）")
+ private String scrapType;
+ /**
+ * 返厂id
+ */
+ @ApiModelProperty(value = "返厂id")
+ private String supplierId;
+ /**
+ * 配件数量
+ */
+ @ApiModelProperty(value = "配件数量")
+ private int partNum;
+ /**
+ * 配件单价
+ */
+ @ApiModelProperty(value = "配件单价")
+ private String partPrice;
+ /**
+ * 维修内容
+ */
+ @ApiModelProperty(value = "维修内容")
+ private String repairContent;
+ /**
+ * 类型（0不收费，1收费）
+ */
+ @ApiModelProperty(value = "类型（0不收费，1收费）")
+ private String partType;
+ /**
+ * 配件名称
+ */
+ @ApiModelProperty(value = "配件名称")
+ private String partName;
+ /**
+ * 维修人
+ */
+ @ApiModelProperty(value = "维修人")
+ private Long repairer;
+ private String partStrList;
+ private Long companyId;
+ /**
+ * 损坏照片id
+ */
+ @ApiModelProperty(value = "损坏照片id")
+ private String fileIds;
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IRepairAuditDetailsService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IRepairAuditDetailsService.java
index 4adb39bb..5ad1efca 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IRepairAuditDetailsService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IRepairAuditDetailsService.java
@@ -1,6 +1,7 @@
package com.bonus.sgzb.material.service;
import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairRecord;
import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
import com.bonus.sgzb.material.vo.ScrapAudit;
@@ -91,5 +92,7 @@ public interface IRepairAuditDetailsService
* @return
*/
List exportRepairQuestList(RepairAuditDetails bean);
+
+ List getRepairRecord(RepairAuditDetails repairAuditDetails);
}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index 567cae13..19e0731c 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -136,6 +136,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
return repairAuditDetailsMapper.exportRepairQuestList(bean);
}
+ @Override
+ public List getRepairRecord(RepairAuditDetails repairAuditDetails) {
+ return null;
+ }
+
/**
* @param repairAuditDetails
* @return
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
index 9e0a1720..451e55b6 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_supplier_info msi on pcd.supplier_id = msi.supplier_id
left join tm_task tk on pcd.task_id = tk.task_id
- where pcd.status !=3 and pcd.status!=5
+ where 1=1
and pcd.task_id = #{taskId}
and (mt.type_name like concat('%',#{keyWord},'%')
or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord}))
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index fce564b9..9c134137 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"