From f542f7cc79d1e5b5678b28449acbf46dfb5f8619 Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Wed, 14 Jan 2026 16:10:38 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E9=80=80=E6=96=99=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BackApplyInfoController.java   | 28 ++++++++++-
 .../back/mapper/BackApplyInfoMapper.java      |  7 ++-
 .../back/service/IBackApplyInfoService.java   |  3 ++
 .../impl/BackApplyInfoServiceImpl.java        |  6 +++
 .../material/back/BackApplyInfoMapper.xml     | 46 +++++++++++++++++++
 5 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
index 3bbe2d0d..fd11cff8 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.biz.domain.lease.LeaseApplyQuery;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.ServletUtils;
@@ -736,6 +737,31 @@ public class BackApplyInfoController extends BaseController {
         util.exportExcel(response, list, fileName, title);
     }
 
+    /**
+     * 查询退料任务列表
+     */
+    @ApiOperation(value = "查询退料查询列表")
+//    @RequiresPermissions("back:info:list")
+    @GetMapping("/queryList")
+    public AjaxResult queryList(BackApplyQuery backApplyQuery) {
+        Long deptId = typeService.getUserDeptId();
+        backApplyQuery.setCompanyId(deptId);
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
+        List<BackApplyQuery> list = backApplyInfoService.selectBackApplyQueryList(backApplyQuery);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
+    }
 
-
+    @ApiOperation(value = "导出退料查询列表")
+    @PreventRepeatSubmit
+    //@RequiresPermissions("lease:info:export")
+    @SysLog(title = "退料查询", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出退料查询")
+    @PostMapping("/exportBackQueryOutRecord")
+    public void exportBackQueryOutRecord(HttpServletResponse response, BackApplyQuery backApplyQuery) {
+        Long deptId = typeService.getUserDeptId();
+        backApplyQuery.setCompanyId(deptId);
+        List<BackApplyQuery> list = backApplyInfoService.selectBackApplyQueryList(backApplyQuery);
+        ExcelUtil<BackApplyQuery> util = new ExcelUtil<>(BackApplyQuery.class);
+        util.exportExcel(response, list, "退料查询");
+    }
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java
index 44b2c491..7c935a4c 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java
@@ -6,10 +6,7 @@ import java.util.List;
 
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.back.domain.*;
-import com.bonus.material.back.domain.vo.BackApplyInfoVo;
-import com.bonus.material.back.domain.vo.BackApplyVo;
-import com.bonus.material.back.domain.vo.BackExportDetailsVo;
-import com.bonus.material.back.domain.vo.MaCodeVo;
+import com.bonus.material.back.domain.vo.*;
 import com.bonus.material.basic.domain.BmAgreementInfo;
 import com.bonus.material.clz.domain.back.MaterialBackApplyDetails;
 import com.bonus.material.settlement.domain.SltAgreementInfo;
@@ -584,4 +581,6 @@ public interface BackApplyInfoMapper {
      * @return
      */
     List<SltAgreementInfo> getXmInfoList(BackApplyInfo bean);
+
+    List<BackApplyQuery> selectBackApplyQueryList(BackApplyQuery backApplyQuery);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java
index 26c91459..63eb881b 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java
@@ -272,5 +272,8 @@ public interface IBackApplyInfoService {
      * @return
      */
     List<BackExportDetailsVo> exportBackDetailsList(BackApplyInfo dto);
+
+
+    List<BackApplyQuery> selectBackApplyQueryList(BackApplyQuery backApplyQuery);
 }
 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
index e5e473b2..4d1a88db 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
@@ -10,6 +10,7 @@ import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.bonus.common.biz.constant.GlobalConstants;
 import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.domain.TypeTreeNode;
+import com.bonus.common.biz.domain.lease.LeaseApplyQuery;
 import com.bonus.common.biz.domain.lease.LeaseOutDetails;
 import com.bonus.common.biz.domain.lease.LeaseOutSign;
 import com.bonus.common.biz.enums.*;
@@ -446,6 +447,11 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         }
     }
 
+    @Override
+    public List<BackApplyQuery> selectBackApplyQueryList(BackApplyQuery backApplyQuery) {
+        return backApplyInfoMapper.selectBackApplyQueryList(backApplyQuery);
+    }
+
     /**
      * 检查是否有编码设备
      */
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index 1292c251..398f062a 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -1959,4 +1959,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by start_time asc
     </select>
+
+    <select id="selectBackApplyQueryList" parameterType="com.bonus.material.back.domain.vo.BackApplyQuery" resultType="com.bonus.material.back.domain.vo.BackApplyQuery">
+        SELECT
+            bai.agreement_code as agreementCode,
+            bc.task_id,
+            sd.dept_name as deptName,
+            bu.unit_name as unitName,
+            bp.pro_name as proName,
+            bc.`code` as code,
+            mt2.type_name as typeName,
+            mt.type_name as modelName,
+            bcd.back_num as backNum,
+            bcd.create_time as inTime,
+            bc.print_status,
+            mt.jiju_type AS jijuType
+        FROM
+            back_check_details bcd
+                LEFT JOIN back_apply_info bc on bcd.parent_id = bc.id
+                LEFT JOIN ma_type mt on bcd.type_id = mt.type_id
+                LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+                LEFT JOIN tm_task_agreement tta on bc.task_id = tta.task_id
+                LEFT JOIN bm_agreement_info bai on tta.agreement_id = bai.agreement_id
+                LEFT JOIN bm_unit bu on bai.unit_id = bu.unit_id
+                LEFT JOIN bm_project bp on bai.project_id = bp.pro_id
+                LEFT JOIN sys_dept sd on bp.imp_unit = sd.dept_id
+        WHERE bc.direct_id IS NULL
+        <if test="startTime != null and startTime != ''">
+            and SUBSTR(bcd.create_time,1,10)>=#{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and #{endTime}>=SUBSTR(bcd.create_time,1,10)
+        </if>
+        <if test="deptName != null and deptName != ''">
+            and sd.dept_name like concat('%', #{deptName} ,'%')
+        </if>
+        <if test="proName != null and proName != ''">
+            and bp.pro_name like concat('%', #{proName} ,'%')
+        </if>
+        <if test="keyWord != null and keyWord != ''">
+            and ( bp2.pro_name like concat('%', #{keyWord} ,'%')
+            or  sd.dept_name like concat('%', #{keyWord} ,'%')
+            or  mt2.type_name like concat('%', #{keyWord} ,'%')
+            or  mt.type_name like concat('%', #{keyWord} ,'%'))
+        </if>
+    </select>
+
 </mapper>