From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java
index 287af74..8aa7c7d 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java
@@ -14,6 +14,8 @@
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetDivideDetailBaseService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetMngBaseService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -27,6 +29,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,13 +41,13 @@
* @since 2022-07-20 13:32:39
*/
@Service("targetDivideDetailService")
-public class TargetDivideDetailServiceImpl extends ServiceImpl<TargetDivideDetailRepository, TargetDivideDetail> implements TargetDivideDetailService {
+public class TargetDivideDetailServiceImpl implements TargetDivideDetailService {
@Autowired
- private TargetDivideDetailRepository targetDivideDetailRepository;
+ private TargetDivideDetailBaseService targetDivideDetailBaseService;
@Autowired
- private TargetMngRepository targetMngRepository;
+ private TargetMngBaseService targetMngBaseService;
@@ -54,7 +57,7 @@
Long pageSize = pageQuery.getPageSize();
IPage<TargetDivideDetail> page = new Page<>(pageIndex, pageSize);
- page = baseMapper.selectPage(page,
+ page = targetDivideDetailBaseService.selectPage(page,
QueryHelpPlus.getPredicate(TargetDivideDetail.class, pageQuery.getSearchParams()));
List<TargetDivideDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetDivideDetailDto.class);
@@ -71,12 +74,15 @@
@Override
public List<TargetDivideDetail> queryAll(TargetDivideDetailQueryCriteria criteria) {
- return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetDivideDetail.class, criteria));
+ return targetDivideDetailBaseService.queryAll(criteria);
}
@Override
public void addOrUpdate(TargetDivideDetailSaveOrUpdate infoDto) {
- TargetMng targetMng = targetMngRepository.selectOne(new QueryWrapper<TargetMng>().eq("id",infoDto.getTargetId()));
+ if(infoDto.getTargetId() == null){
+ throw new TargetDutyException("缺少targetId");
+ }
+ TargetMng targetMng = targetMngBaseService.getOne(new QueryWrapper<TargetMng>().eq("id",infoDto.getTargetId()));
if(targetMng == null){
throw new TargetDutyException(TargetDutyResultCodes.E1);
}
@@ -84,7 +90,14 @@
if(StringUtils.hasText(infoDto.getDelTargetDivideDetails())){
List<Long> idList = Arrays.stream(infoDto.getDelTargetDivideDetails().split(",")).map(s-> Long.parseLong(s.trim()))
.collect(Collectors.toList());
- this.removeByIds(idList);
+ List<TargetDivideDetail> delList = new ArrayList<>();
+ idList.forEach(f->{
+ TargetDivideDetail info = new TargetDivideDetail();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ targetDivideDetailBaseService.updateBatchById(delList);
}
//保存主数据
@@ -95,18 +108,18 @@
List<TargetDivideDetail> list = infoDto.getTargetDivideDetailList();
list.forEach(f->{f.setTargetId(infoDto.getTargetId());});
- this.saveOrUpdateBatch(list);
+ targetDivideDetailBaseService.saveOrUpdateBatch(list);
//查询最新的分解数量，如果>0，设置状态为 《已分解》，否则设置为未分解
int divideStatus = 2;
if(infoDto.getTargetId() != null){
- long number = this.count(new QueryWrapper<TargetDivideDetail>().eq("target_id",infoDto.getTargetId()));
+ long number = targetDivideDetailBaseService.count(new QueryWrapper<TargetDivideDetail>().eq("target_id",infoDto.getTargetId()));
if(number > 0){
divideStatus = 1;
}
}
targetMng.setDivideStatus(divideStatus);
- targetMngRepository.update(targetMng,new UpdateWrapper<TargetMng>().eq("id",targetMng.getId()));
+ targetMngBaseService.update(targetMng,new UpdateWrapper<TargetMng>().eq("id",targetMng.getId()));
}
--
Gitblit v1.9.2