From 6c5d6fa6eaa000eca3fa9ac3d7c2ca680e70f1f8 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Sun, 17 Dec 2023 20:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E9=80=80=E6=96=99=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/BackApplyController.java   | 36 ++++++++++++++
 .../bonus/sgzb/app/domain/BackApplyInfo.java  |  4 ++
 .../sgzb/app/mapper/BackApplyMapper.java      |  4 ++
 .../sgzb/app/service/BackApplyService.java    |  4 ++
 .../service/impl/BackApplyServiceImpl.java    | 10 ++++
 .../resources/mapper/app/BackApplyMapper.xml  | 49 +++++++++++++++++++
 6 files changed, 107 insertions(+)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java
index c95ddfa2..4c8584e7 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java
@@ -96,6 +96,23 @@ public class BackApplyController extends BaseController {
         }
     }
 
+    /**
+     * 退料审核明细
+     *
+     * @param record 查询条件
+     * @return AjaxResult对象
+     */
+    @Log(title = "退料审核明细", businessType = BusinessType.QUERY)
+    @GetMapping("examineView")
+    public AjaxResult examineView(@RequestBody BackApplyInfo record) {
+        try {
+            List<BackApplyInfo> list =backApplyService.examineView(record);
+            return success(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * 删除
      *
@@ -236,4 +253,23 @@ public class BackApplyController extends BaseController {
         return code;
     }
 
+
+
+    /**
+     * 退料审核列表
+     *
+     * @param record 查询条件
+     * @return AjaxResult对象
+     */
+    @Log(title = "退料审核列表", businessType = BusinessType.QUERY)
+    @PostMapping("examineList")
+    public AjaxResult examineList(@RequestBody BackApplyInfo record) {
+        try {
+            List<BackApplyInfo> list =backApplyService.examineList(record);
+            return success(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
index dde52ef6..87618774 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
@@ -77,4 +77,8 @@ public class BackApplyInfo {
     private String updateBy;
     private String updateTime;
     private String remark;
+    /**
+     * 审核备注
+     */
+    private String directAuditRemark;
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java
index e552310a..369e5484 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java
@@ -36,4 +36,8 @@ public interface BackApplyMapper {
     List<BackApplyInfo> view(BackApplyInfo record);
 
     int del(BackApplyInfo record);
+
+    List<BackApplyInfo> examineList(BackApplyInfo record);
+
+    List<BackApplyInfo> examineView(BackApplyInfo record);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java
index 52790bdf..d68fb2ec 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java
@@ -39,4 +39,8 @@ public interface BackApplyService {
     List<BackApplyInfo> view(BackApplyInfo record);
 
     int del(BackApplyInfo record);
+
+    List<BackApplyInfo> examineList(BackApplyInfo record);
+
+    List<BackApplyInfo> examineView(BackApplyInfo record);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
index 70a63f1a..8f6730d8 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
@@ -71,4 +71,14 @@ public class BackApplyServiceImpl implements BackApplyService {
         return backApplyMapper.del(record);
     }
 
+    @Override
+    public List<BackApplyInfo> examineList(BackApplyInfo record) {
+        return backApplyMapper.examineList(record);
+    }
+
+    @Override
+    public List<BackApplyInfo> examineView(BackApplyInfo record) {
+        return backApplyMapper.examineView(record);
+    }
+
 }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index 1eb837be..39b0de21 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -404,6 +404,55 @@
     WHERE
       bai.id=#{id}
   </select>
+  <select id="examineList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
+    SELECT
+      bai.id,
+      us.user_name as userName,
+      bai.phone,
+      bpl.lot_name as lotName,
+      bui.unit_name as unitName,
+      bagi.plan_start_time as planStartTime,
+      tt.task_status as taskStatus,
+      GROUP_CONCAT(DISTINCT bad.type_id) as typeId,
+      GROUP_CONCAT(CONCAT_WS('/',  IFNULL(mt3.type_name, ''))) AS typeName,
+      SUM(DISTINCT bad.pre_num) AS num,
+      bai.direct_audit_remark as directAuditRemark
+    FROM
+      back_apply_info bai
+        LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
+        LEFT JOIN tm_task tt on tt.task_id=bai.task_id
+        LEFT JOIN tm_task_agreement tta on tta.task_id=tt.task_id
+        LEFT JOIN bm_agreement_info bagi on bagi.agreement_id=tta.agreement_id
+        LEFT JOIN bm_project_lot bpl on bpl.lot_id=bagi.project_id
+        LEFT JOIN bm_unit_info bui on bui.unit_id=bagi.unit_id
+        LEFT JOIN sys_user us on us.user_id=bai.create_by
+        LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
+        LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
+        LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
+    WHERE
+      bai.company_id=#{companyId}
+      and bad.type_id is not null
+    GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
+  </select>
+  <select id="examineView" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
+    SELECT
+      mt.type_name typeCode,
+      CONCAT_WS('/',  IFNULL(mt3.type_name, '')) AS typeName,
+      bad.pre_num as num,
+      mm.ma_code as maCode
+    FROM
+      back_apply_details bad
+        LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
+        LEFT JOIN ma_type mt on mt.type_id=bad.type_id
+        LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
+        LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
+        LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
+        LEFT JOIN ma_machine mm on mm.type_id=bad.type_id
+    WHERE
+      bai.id=#{id}
+  </select>
 
 
 </mapper>
\ No newline at end of file