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 | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 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 633f17b..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
@@ -26,7 +26,7 @@
NewFightProjectPlanDTO> implements NewFightProjectPlanService
{
@Resource
- private NewFightCommunityConstructionDAO constructionService;
+ private NewFightCommunityConstructionService constructionService;
@Override
@@ -45,34 +45,33 @@
@Override
public R editProjectPlanAccomplish(String id)
{
- int accomplishNum=baseMapper.getNum(id,"1");
- NewFightProjectPlanDTO planDTO=baseMapper.getDetails(id);
- int pNum=baseMapper.getNum(id,null);
- accomplishNum++;
+ 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");
- baseMapper.editData(item);
+ int num=baseMapper.editData(item);
- NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
- dto.setId(planDTO.getProjectId());
- if(pNum==accomplishNum)
- {
- //已完成
- dto.setStatus("3");
- }
- else
- {
- //进行中
- dto.setStatus("2");
- }
- int num=constructionService.editData(dto);
if(num>0)
{
+ int accomplishNum=baseMapper.getNum(planDTO.getProjectId(),"1");
+ 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