From 651b9df2ab8972c2b36908ef968a8ef9bbc5f041 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 14 Nov 2024 14:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=AE=A1=E6=A0=B8--=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=E3=80=81SQL=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RepairAuditDetailsController.java           | 17 ++++++++---------
 .../repair/domain/RepairAuditDetails.java       | 13 ++++++++++++-
 .../repair/RepairAuditDetailsMapper.xml         |  4 ++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
index 147a3670..c7c9a8d8 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
@@ -55,15 +55,14 @@ public class RepairAuditDetailsController extends BaseController {
     @RequiresPermissions("service:auditing:list")
     public TableDataInfo questList(RepairAuditDetails repairAuditDetails) {
         startPage();
-//        Map<String, Object> params = repairAuditDetails.getParams();
-        Map<String, Object> params = new HashMap<>();
-//        if (params != null && !params.isEmpty()) {
-//            String beginTime = (String) params.get("beginTime");
-//            String endTime = (String) params.get("endTime");
-//            params.put("beginTime", beginTime + " 00:00:00");
-//            params.put("endTime", endTime + " 23:59:59");
-//            repairAuditDetails.setParams(params);
-//        }
+        Map<String, Object> params = repairAuditDetails.getParams();
+        if (params != null && !params.isEmpty()) {
+            String beginTime = (String) params.get("beginTime");
+            String endTime = (String) params.get("endTime");
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            repairAuditDetails.setParams(params);
+        }
         List<ScrapApplyDetailsVO> list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails);
         return getDataTable(list);
     }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java
index 4db91c34..5e5f3617 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java
@@ -85,7 +85,18 @@ public class RepairAuditDetails extends BaseEntity {
     @ApiModelProperty(value = "数据所属组织")
     private Integer companyId;
 
-    /** 关键字 */
+
+    /**传入参数*/
+    @ApiModelProperty(value = "单位id")
+    private Integer backUnit;
+    @ApiModelProperty(value = "工程id")
+    private Integer backPro;
+    @ApiModelProperty(value = "工机具类型id")
+    private Integer type;
+    @ApiModelProperty(value = "维修单号")
+    private String backCode;
     @ApiModelProperty(value = "关键字")
     private String keyword;
+    @ApiModelProperty(value = "规格型号")
+    private String typeName;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
index a2159d6f..abcea1bb 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
@@ -284,7 +284,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND (locate(#{keyword}, su.nick_name) > 0
             or locate(#{keyword}, tk.CODE) > 0
             or locate(#{keyword}, bui.unit_name) > 0
-            or locate(#{keyword}, bpl.lot_name) > 0)
+            or locate(#{keyword}, bpl.pro_name) > 0)
         </if>
         <if test="backUnit != null and backUnit != ''">
             and bui.unit_id = #{backUnit}
@@ -293,7 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and tk.task_status = #{taskStatus}
         </if>
         <if test="backPro != null and backPro != ''">
-            and bpl.lot_id = #{backPro}
+            and bpl.pro_id = #{backPro}
         </if>
         <if test="type != null and type != ''">
             and mt1.type_id = #{type}