From ffd5468e526b10b01261f3057fd89c584f4b0cfe Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 1 Mar 2023 11:04:10 +0800
Subject: [PATCH] 11

---
 .../xujie/pms/controller/EamController.java   | 15 +++++++++++++
 .../com/xujie/pms/service/EamService.java     | 11 ++++++++++
 .../pms/service/Impl/EamServiceImpl.java      | 22 +++++++++++++++++++
 .../src/main/resources/mapper/EamMapper.xml   |  1 +
 4 files changed, 49 insertions(+)

diff --git a/xujie-pms/src/main/java/com/xujie/pms/controller/EamController.java b/xujie-pms/src/main/java/com/xujie/pms/controller/EamController.java
index a77eb2a..35cfcad 100644
--- a/xujie-pms/src/main/java/com/xujie/pms/controller/EamController.java
+++ b/xujie-pms/src/main/java/com/xujie/pms/controller/EamController.java
@@ -965,4 +965,19 @@ public class EamController {
         eamService.eamWorkPlanEdit(inData);
         return R.ok();
     }
+
+    /**
+     * @Description TODO
+     * @Title eamWorkPlanDelete
+      * @param inData
+     * @author rq
+     * @date 2023/3/1 10:26
+     * @return R
+     * @throw
+     */
+    @PostMapping("/eamWorkPlanDelete")
+    public R eamWorkPlanDelete(@RequestBody EamWorkPlanInData inData){
+        eamService.eamWorkPlanDelete(inData);
+        return R.ok();
+    }
 }
diff --git a/xujie-pms/src/main/java/com/xujie/pms/service/EamService.java b/xujie-pms/src/main/java/com/xujie/pms/service/EamService.java
index ef7af75..ef6cce2 100644
--- a/xujie-pms/src/main/java/com/xujie/pms/service/EamService.java
+++ b/xujie-pms/src/main/java/com/xujie/pms/service/EamService.java
@@ -535,4 +535,15 @@ public interface EamService {
      * @throw
      */
     void eamWorkPlanEdit(EamWorkPlanInData inData);
+
+    /**
+     * @Description TODO
+     * @Title eamWorkPlanDelete 
+      * @param inData 
+     * @author rq
+     * @date 2023/3/1 10:28
+     * @return void
+     * @throw
+     */
+    void eamWorkPlanDelete(EamWorkPlanInData inData);
 }
diff --git a/xujie-pms/src/main/java/com/xujie/pms/service/Impl/EamServiceImpl.java b/xujie-pms/src/main/java/com/xujie/pms/service/Impl/EamServiceImpl.java
index 2354561..59fe582 100644
--- a/xujie-pms/src/main/java/com/xujie/pms/service/Impl/EamServiceImpl.java
+++ b/xujie-pms/src/main/java/com/xujie/pms/service/Impl/EamServiceImpl.java
@@ -564,4 +564,26 @@ public class EamServiceImpl implements EamService {
     public void eamWorkPlanEdit(EamWorkPlanInData inData){
 
     }
+
+    @Override
+    public void eamWorkPlanDelete(EamWorkPlanInData inData){
+        //调用存储过程 执行
+        String site = inData.getSite();
+        String planID = inData.getPlanID();
+        String functionType = inData.getFunctionType();
+
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(planID);
+        params.add(functionType);
+
+        //执行方法
+        List<Map<String, Object>> resultList = procedureDao.getProcedureData("eamWorkPlanDelete", params);
+        //判断是否检验成功
+        String code = String.valueOf(resultList.get(0).get("resultCode"));
+        if ("400".equalsIgnoreCase(code)) {
+            String msg = String.valueOf(resultList.get(0).get("resultMsg"));
+            throw new XJException(msg, Integer.parseInt(code));
+        }
+    }
 }
diff --git a/xujie-pms/src/main/resources/mapper/EamMapper.xml b/xujie-pms/src/main/resources/mapper/EamMapper.xml
index 09a0f22..5b6a358 100644
--- a/xujie-pms/src/main/resources/mapper/EamMapper.xml
+++ b/xujie-pms/src/main/resources/mapper/EamMapper.xml
@@ -227,6 +227,7 @@ b.MinValue,b.ItemRemark,b.ItemType
         FROM eam_workPlan a
         left join eam_object b on a.Site=b.Site and a.ObjectID=b.ObjectID
         <where>
+                AND a.DeleteFlag='N'
                 AND a.FunctionType = #{query.functionType}
              <if test="query.planID != null and query.planID != ''">
                 AND a.PlanID like '%' + #{query.planID} +'%'