From 56316859a4cf0238466f3ecfb77314fcb0f2cb6b Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 2 Feb 2021 18:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=BB=B6=E6=9C=9F-?=
 =?UTF-8?q?=E7=86=94=E6=96=AD=E3=80=91-=E3=80=90=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?=
 =?UTF-8?q?=EF=BC=89-2021/2/2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/result/ItemHandleListDTO.java     | 10 ++++++++++
 .../item/controller/ItemFusingDelayController.java  |  8 ++++++++
 .../epdc/modules/item/dao/ItemFusingDelayDao.java   | 10 ++++++++++
 .../service/impl/ItemFusingDelayServiceImpl.java    | 13 ++++++++-----
 .../resources/mapper/item/ItemFusingDelayDao.xml    | 10 +++++++++-
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java
index 1c88944c8..cfdce6608 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java
@@ -67,6 +67,11 @@ public class ItemHandleListDTO implements Serializable {
 
     //-------------------------------------------------
 
+    /**
+     * 申请记录id
+     */
+    private String delayId;
+
     /**
      * 申请状态
      */
@@ -82,6 +87,11 @@ public class ItemHandleListDTO implements Serializable {
      */
     private String handleState;
 
+    /**
+     * 处理理由
+     */
+    private String handleReason;
+
     /**
      * 处理状态名称
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java
index 5fc5cd8ee..826794a4c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java
@@ -72,6 +72,14 @@ public class ItemFusingDelayController {
         return new Result();
     }
 
+    @PostMapping("submitApply")
+    public Result submitApply(@RequestBody ItemFusingDelayInsertDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        itemFusingDelayService.save(dto);
+        return new Result();
+    }
+
     @PutMapping
     public Result update(@RequestBody ItemFusingDelayDTO dto){
         //效验数据
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java
index f0ff37547..0f20d7f41 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.item.form.ItemFusingDelayInsertDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleListDTO;
 import com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +43,13 @@ public interface ItemFusingDelayDao extends BaseDao<ItemFusingDelayEntity> {
     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleListDTO>
     */
     List<ItemHandleListDTO> selectHandleItemsList(Map<String, Object> params);
+
+    /**
+    * @describe: 查询实体类
+    * @author wangtong
+    * @date 2021/2/2 18:37
+    * @params [dto]
+    * @return com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity
+    */
+    ItemFusingDelayEntity selectHandleInfo(ItemFusingDelayInsertDTO dto);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
index 72f8dbbf3..b8cc42811 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
@@ -136,13 +136,12 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl<ItemFusingDelayD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(ItemFusingDelayInsertDTO dto) {
-        ItemFusingDelayEntity queryData = new ItemFusingDelayEntity();
-        queryData.setItemId(dto.getItemId());
-        QueryWrapper<ItemFusingDelayEntity> wrapper = new QueryWrapper<>(queryData);
-        ItemFusingDelayEntity handleInfo = baseDao.selectOne(wrapper);
+        ItemFusingDelayEntity handleInfo = baseDao.selectHandleInfo(dto);
         if(handleInfo != null && handleInfo.getState().equals(dto.getState())){
             throw new RenException("此项目已存在该项的申请记录。");
         }
+        dto.setItemId(dto.getId());
+        dto.setId(null);
         ItemFusingDelayEntity entity = ConvertUtils.sourceToTarget(dto, ItemFusingDelayEntity.class);
         insert(entity);
     }
@@ -176,7 +175,11 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl<ItemFusingDelayD
             ItemEntity item =  itemDao.selectById(entity.getItemId());
             ItemHandleProcessEntity process = new ItemHandleProcessEntity();
             process.setItemId(item.getId());
-            process.setState(85);//项目熔断-延期审核通过
+            if(0 == entity.getState()){
+                process.setState(85);//项目延期审核通过
+            }else{
+                process.setState(90);//项目熔断-审核通过
+            }
             process.setHandleAdvice(dto.getHandleReason());
             process.setOutHandleAdvice(dto.getHandleReason());
             process.setHandlerDeptId(SecurityUser.getUser().getDeptId());
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml
index 5e58feeaa..d6dbffbde 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml
@@ -51,7 +51,9 @@
                     ELSE ''
                     END as handleStateName,
                 ifd.DELAY_START_TIME,
-                ifd.DELAY_END_TIME
+                ifd.DELAY_END_TIME,
+                ifd.id as delayId,
+                ifd.HANDLE_REASON as handleReason
         FROM
             epdc_item item
             LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
@@ -116,6 +118,12 @@
         ifd.CREATED_TIME DESC
 
     </select>
+    <select id="selectHandleInfo" resultMap="itemFusingDelayMap">
+        SELECT * FROM `epdc_item_fusing_delay`
+        where ITEM_ID=#{id}
+                    AND state=#{state}
+                    AND (HANDLE_STATE IS NULL OR HANDLE_STATE='10')
+    </select>
 
 
 </mapper>
\ No newline at end of file