From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectPlanServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 3a18b56..21de7b3 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
@@ -25,8 +25,6 @@
public class NewFightProjectPlanServiceImpl extends ServiceImpl<NewFightProjectPlanDAO,
NewFightProjectPlanDTO> implements NewFightProjectPlanService
{
-
-
@Resource
private NewFightCommunityConstructionService constructionService;
@@ -47,17 +45,20 @@
@Override
public R editProjectPlanAccomplish(String id)
{
+
+ NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
+ int pNum=baseMapper.getNum(planDTO.getProjectId(),null);
+
NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
item.setId(id);
item.setAffirmTime(new Date());
item.setAccomplish("1");
int num=baseMapper.editData(item);
+
if(num>0)
{
- NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
- int pNum=baseMapper.getNum(id,null);
- int accomplishNum=baseMapper.getNum(id,"1");
+ int accomplishNum=baseMapper.getNum(planDTO.getProjectId(),"1");
NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
dto.setId(planDTO.getProjectId());
if(pNum==accomplishNum)
--
Gitblit v1.7.1