From acaa99650ec9bd7e5adf674e046db808775ee434 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 11 Nov 2024 09:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=98=8E=E7=BB=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/controller/PlanOutController.java    | 16 +++----
 .../business/plan/mapper/PlanOutMapper.java   |  2 +-
 .../business/plan/service/PlanOutService.java |  2 +-
 .../plan/service/PlanOutServiceImpl.java      |  6 +--
 .../resources/mappers/plan/PlanOutMapper.xml  | 48 ++++++++++++-------
 5 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java
index 1aac7b6..1ad15ed 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java
@@ -135,7 +135,7 @@ public class PlanOutController {
         return  service.getOutDetails(dto.getData());
     }
     /**
-     *  X详情接口
+     *  单个批次发货详情列表接口
      * @param dto
      * @return
      */
@@ -147,7 +147,7 @@ public class PlanOutController {
         return pageInfo;
     }
     /**
-     *  X详情接口
+     *  待发货 接口
      * @param dto
      * @return
      */
@@ -160,7 +160,7 @@ public class PlanOutController {
     }
 
     /**
-     *  查询工程 -需求计划 列表
+     *  查询工程 -需求计划   列表
      * @param dto
      * @return
      */
@@ -263,7 +263,7 @@ public class PlanOutController {
     }
 
     /**
-     *  数据总览
+     *  数据总览-查询
      * @param dto
      * @return
      */
@@ -284,10 +284,10 @@ public class PlanOutController {
      */
     @GetMapping("getDataPlanByPage")
     @DecryptAndVerify(decryptedClass = ProNeedInfo.class)
-    public PageInfo<ProNeedInfo> getDataPlanByPage(EncryptedReq<ProNeedInfo> dto) {
+    public PageInfo<PlanApplyBean> getDataPlanByPage(EncryptedReq<ProNeedInfo> dto) {
         PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
-        List<ProNeedInfo> list = service.getDataPlanByPage(dto.getData());
-        PageInfo<ProNeedInfo> pageInfo = new PageInfo<>(list);
+        List<PlanApplyBean> list = service.getDataPlanByPage(dto.getData());
+        PageInfo<PlanApplyBean> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }
 
@@ -347,7 +347,7 @@ public class PlanOutController {
 
 
     /**
-     *  查看来源-计划分页
+     *  告警内容详情
      * @param dto
      * @return
      */
diff --git a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java
index a7b494a..072e908 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java
@@ -159,7 +159,7 @@ public interface PlanOutMapper {
      * @param data
      * @return
      */
-    List<ProNeedInfo> getDataPlanByPage(ProNeedInfo data);
+    List<PlanApplyBean> getDataPlanByPage(ProNeedInfo data);
 
 
     /**
diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java
index 7b93214..8282447 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java
@@ -102,7 +102,7 @@ public interface PlanOutService {
      * @param data
      * @return
      */
-    List<ProNeedInfo> getDataPlanByPage(ProNeedInfo data);
+    List<PlanApplyBean> getDataPlanByPage(ProNeedInfo data);
     /**
      * 查询 基础信息
      * @param data
diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java
index 9dea4b8..ad27314 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java
@@ -140,7 +140,7 @@ public class PlanOutServiceImpl implements PlanOutService{
     }
 
     /**
-     * 数据总览 查询
+     * 数据总览-- 查询
      * @param data
      * @return
      */
@@ -156,8 +156,8 @@ public class PlanOutServiceImpl implements PlanOutService{
     }
 
     @Override
-    public List<ProNeedInfo> getDataPlanByPage(ProNeedInfo data) {
-        List<ProNeedInfo> list = new ArrayList<>();
+    public List<PlanApplyBean> getDataPlanByPage(ProNeedInfo data) {
+        List<PlanApplyBean> list = new ArrayList<>();
         try {
             list = mapper.getDataPlanByPage(data);
         } catch (Exception e) {
diff --git a/src/main/resources/mappers/plan/PlanOutMapper.xml b/src/main/resources/mappers/plan/PlanOutMapper.xml
index ff2faf9..b1297e0 100644
--- a/src/main/resources/mappers/plan/PlanOutMapper.xml
+++ b/src/main/resources/mappers/plan/PlanOutMapper.xml
@@ -263,22 +263,25 @@
             </where>
 
     </select>
-    <select id="getDataPlanByPage" resultType="com.bonus.gzgqj.business.plan.entity.ProNeedInfo">
-            select pni.id,pni.type,pni.name,pni.module,pni.module_id moduleId,pni.need_num,pni.fh_num,pni.tz_num,
-                   pro.num  proNum,plan.num planNum,pni.unit
-            from t_pro_need_info  pni
-                     LEFT JOIN(
-                select count(pro_id) num  ,module_id
-                FROM  t_pro_need_info
-                GROUP BY  module_id
-            )pro  on pro.module_id=pni.module_id
-                     LEFT JOIN (
-                select model_id  ,count(apply_id)   num
-                FROM t_plan_details
-                GROUP BY  model_id
-            )plan on plan.model_id=pni.module_id
-            where  pni.module_id=#{moduleId}
-
+    <select id="getDataPlanByPage" resultType="com.bonus.gzgqj.business.plan.entity.PlanApplyBean">
+        SELECT
+            plan.id,
+            plan.CODE,pro.name proName ,
+            plan.project_id projectId,
+            plan.project_part projectPart,
+            plan.project_content projectContent,
+            plan.need_time needTime,
+            plan.creator,
+            plan.create_time createTime,
+            plan.remark,
+            plan.STATUS,
+            plan.updater,
+            plan.status_type statusType ,tdd.model_id
+        FROM
+            t_plan_apply plan
+                left join bm_project pro on plan.project_id=pro.ID
+                left join t_plan_details tdd on plan.id=tdd.apply_id
+        where tdd.model_id=#{moduleId}  and   plan.status_type=1
 
     </select>
 
@@ -286,8 +289,19 @@
     <!--查询模型-->
     <select id="getDataInfoDetails" resultType="com.bonus.gzgqj.business.plan.entity.PlanApplyBean">
         select pni.id,pni.type,pni.name,pni.module,pni.module_id moduleId,pni.need_num,pni.fh_num,pni.tz_num,
-               pro.num  proNum,plan.num planNum
+               pro.num  proNum,plan.num planNum,pni.unit
         from t_pro_need_info  pni
+                 LEFT JOIN(
+            select count(pro_id) num  ,module_id
+            FROM  t_pro_need_info
+            GROUP BY  module_id
+        )pro  on pro.module_id=pni.module_id
+                 LEFT JOIN (
+            select model_id  ,count(apply_id)   num
+            FROM t_plan_details
+            GROUP BY  model_id
+        )plan on plan.model_id=pni.module_id
+        where  pni.module_id=#{moduleId}
     </select>
     <select id="getWarnInfoPage" resultType="com.bonus.gzgqj.business.plan.entity.ProNeedInfo">
         select tni.pro_id,tni.type,tni.`name`,tni.module,tni.module_id moduleId ,tni.unit,tni.need_num  needNum,tni.id ,mt.num,