From 23f7fb06946dc1c1b627fb4045c00fd31dec60f6 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Fri, 15 Nov 2024 11:26:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=B8=8E=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=9A=84SQL=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0,=E4=BC=98=E5=8C=96import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/repair/domain/RepairTask.java  |  2 ++
 .../material/repair/domain/RepairTaskDetails.java | 15 +++++++++++++++
 .../impl/RepairAuditDetailsServiceImpl.java       |  2 +-
 .../mapper/material/repair/RepairMapper.xml       | 12 ++++++++----
 4 files changed, 26 insertions(+), 5 deletions(-)

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 bed292e1..6155f031 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
@@ -147,4 +147,6 @@ public class RepairTask {
     @ApiModelProperty(value = "导出选中列表")
     private List<Long> dataCondition;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
index 4fcf5db4..49aef973 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
@@ -18,6 +18,7 @@ public class RepairTaskDetails extends BaseEntity {
      */
     @ApiModelProperty(value = "id")
     private Long id;
+
     /**
      * 任务ID
      */
@@ -38,6 +39,13 @@ public class RepairTaskDetails extends BaseEntity {
      */
     @ApiModelProperty(value = "规格型号")
     private String type;
+
+    @ApiModelProperty(value = "物资单位")
+    private String unitName;
+
+    @ApiModelProperty(value = "管理模式")
+    private Integer manageType;
+
     /**
      * 编码
      */
@@ -73,5 +81,12 @@ public class RepairTaskDetails extends BaseEntity {
     @ApiModelProperty(value = "组织id")
     private Long companyId;
 
+    @ApiModelProperty(value = "退料id")
     private Long backId;
+
+    @ApiModelProperty(value = "维修人员")
+    private String repairer;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
index 39568b11..1e47370a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
@@ -23,7 +23,7 @@ import com.bonus.material.task.domain.TmTaskAgreement;
 import com.bonus.material.task.mapper.TmTaskAgreementMapper;
 import com.bonus.material.task.mapper.TmTaskMapper;
 import com.bonus.material.task.domain.TmTask;
-import org.jetbrains.annotations.NotNull;
+import javax.validation.constraints.NotNull;
 import org.springframework.stereotype.Service;
 import com.bonus.material.repair.mapper.RepairAuditDetailsMapper;
 import com.bonus.material.repair.service.IRepairAuditDetailsService;
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 a3c6e1db..2dc94a4b 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
@@ -80,15 +80,17 @@
 
     <select id="getRepairTaskList" resultType="com.bonus.material.repair.domain.RepairTask">
         SELECT
-            rd.task_id,
+            rd.task_id as taskId,
+            rd.repairer,
             tt.CODE AS repairCode,
+            tt.create_time AS createTime,
+            tt.task_status AS repairStatusCode,
+            tt.company_id AS companyId,
+            tt.remark,
             bui.unit_name AS backUnit,
             bpi.pro_name AS backPro,
             su.nick_name AS createName,
-            tt.create_time AS createTime,
             bai.CODE AS backCode,
-            tt.task_status AS repairStatusCode,
-            tt.company_id AS companyId,
             GROUP_CONCAT(DISTINCT mt2.type_name) as type
         FROM
             repair_apply_details rd
@@ -202,6 +204,8 @@
             rad.ma_id as maId,
             mt2.type_name as typeName,
             mt.type_name as type,
+            mt.unit_name as unitName,
+            mt.manage_type as manageType,
             mm.ma_code as code,
             rad.repair_num as repairNum,
             rad.repaired_num as repairedNum,