From 759358ba9aa4090cdc366f7b98f36cd4d4cc07ee Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 15 十一月 2023 18:58:26 +0800
Subject: [PATCH] 组织共建项目完成接口报错3

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectPlanServiceImpl.java |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectPlanServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectPlanServiceImpl.java
index cf14ed8..886087d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectPlanServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectPlanServiceImpl.java
@@ -48,6 +48,23 @@
     public R editProjectPlanAccomplish(String id)
     {
         int accomplishNum=baseMapper.getNum(id,"1");
+        NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
+        int pNum=baseMapper.getNum(id,null);
+        accomplishNum++;
+        NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
+        dto.setId(planDTO.getProjectId());
+        if(pNum==accomplishNum)
+        {
+            //已完成
+            dto.setStatus("3");
+        }
+        else
+        {
+            //进行中
+            dto.setStatus("2");
+        }
+        constructionService.editData(dto);
+
         NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
         item.setId(id);
         item.setAffirmTime(new Date());
@@ -57,22 +74,6 @@
 
         if(num>0)
         {
-            NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
-            int pNum=baseMapper.getNum(id,null);
-            accomplishNum++;
-            NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
-            dto.setId(planDTO.getProjectId());
-            if(pNum==accomplishNum)
-            {
-                //已完成
-                dto.setStatus("3");
-            }
-            else
-            {
-                //进行中
-                dto.setStatus("2");
-            }
-            constructionService.editData(dto);
             return R.ok();
         }
         return R.fail("操作失败");

--
Gitblit v1.7.1