From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
index 22a1fa8..97f67e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
@@ -5,13 +5,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO;
+import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectPlanDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.NeedProblemUnitTaskDAO;
import com.panzhihua.service_dangjian.dao.NewFightCommunityConstructionDAO;
import com.panzhihua.service_dangjian.service.NeedProblemUnitTaskService;
import com.panzhihua.service_dangjian.service.NewFightCommunityConstructionService;
+import com.panzhihua.service_dangjian.service.NewFightProjectPlanService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -24,12 +28,16 @@
NewFightCommunityConstructionDTO> implements NewFightCommunityConstructionService
{
+ @Resource
+ private NewFightProjectPlanService projectPlanService;
+
@Override
- public IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize)
+ public IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize,
+ String communityId,String userId)
{
Page page = new Page<>(pageNum,pageSize);
- return baseMapper.getList(page);
+ return baseMapper.getList(page,communityId,userId);
}
@Override
@@ -44,7 +52,15 @@
int num=baseMapper.addData(item);
if(num>0)
{
- return R.ok(num);
+ if(item.getList()!=null && item.getList().size()>0 )
+ {
+ for (NewFightProjectPlanDTO dto:item.getList())
+ {
+ dto.setProjectId(item.getId());
+ projectPlanService.addData(dto);
+ }
+ }
+ return R.ok();
}
return R.fail("操作失败");
}
@@ -55,6 +71,17 @@
int num=baseMapper.editData(item);
if(num>0)
{
+ if(item.getList()!=null && item.getList().size()>0 )
+ {
+ for (NewFightProjectPlanDTO dto:item.getList())
+ {
+ if(StringUtils.isEmpty(dto.getId()))
+ {
+ return R.fail("项目规划进度id不能为空");
+ }
+ projectPlanService.editData(dto);
+ }
+ }
return R.ok();
}
return R.fail("操作失败");
@@ -66,6 +93,8 @@
int num= baseMapper.expurgateData(id);
if(num>0)
{
+ //删除相关项目规划进度
+ projectPlanService.expurgateData(null,id);
return R.ok();
}
return R.fail("操作失败");
--
Gitblit v1.7.1