From 0839cb4c353535445b0917183eb0a29822b47147 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Sat, 11 Apr 2020 17:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=A8=8B=E5=BA=8F=E5=8A=A0=E9=80=BB=E8=BE=91=E9=99=90?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResiWarmheartedVisitConstant.java         |  5 +++++
 .../impl/ResiWarmheartedApplyServiceImpl.java | 21 +++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
index 336b6f6f11..57c6199abc 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
@@ -50,4 +50,9 @@ public interface ResiWarmheartedVisitConstant {
      * 数据库操作异常
      */
     String OPERATION_EXCEPTION = "数据库操作异常";
+
+    /**
+     * 数据库操作异常
+     */
+    String REPEAT_EXCEPTION = "已存在待审核的申请，不能重复申请";
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 513a351ab4..6955858e65 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -167,12 +167,21 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     @Transactional(rollbackFor = Exception.class)
     public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
         Result result = new Result();
-        //1:将申请记录存入热心居民申请表中
-        saveResiWarmApply(formDTO);
-        //2:将最后一次操作行为更新到热心居民申请行为记录表中
-        resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
-        result.setCode(EpmetErrorCode.RESI_WARM_SUBMIT.getCode());
-        result.setMsg(EpmetErrorCode.RESI_WARM_SUBMIT.getMsg());
+        //0:为防止前台点击多次提交 先查询一下是否有已提交数据
+        ResiWarmheartedFormDTO ResiWarmheartedFormDTO = ConvertUtils.sourceToTarget(formDTO, ResiWarmheartedFormDTO.class);
+        ResiWarmheartedFormDTO.setAuditStatus(ResiWarmheartedVisitConstant.REJECTED);
+        ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(ResiWarmheartedFormDTO);
+        if (null != resiWarmheartedApplyDTO) {
+            result.error(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
+            return result;
+        }else{
+            //1:将申请记录存入热心居民申请表中
+            saveResiWarmApply(formDTO);
+            //2:将最后一次操作行为更新到热心居民申请行为记录表中
+            resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
+            result.setCode(EpmetErrorCode.RESI_WARM_SUBMIT.getCode());
+            result.setMsg(EpmetErrorCode.RESI_WARM_SUBMIT.getMsg());
+        }
         return result;
     }