From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 ca56269..efad5df 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
@@ -26,6 +27,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;
@@ -60,7 +62,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -83,12 +85,19 @@
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);
+ });
+ this.updateBatchById(delList);
}
//保存主数据
//如果目标指标已经被分解，那么就不能再次增加
- if(targetMng.getDivideStatus() == 1){
+ if(targetMng.getDivideStatus() == 1 && infoDto.getTargetId() == null){
throw new TargetDutyException(TargetDutyResultCodes.E2);
}
@@ -96,8 +105,15 @@
list.forEach(f->{f.setTargetId(infoDto.getTargetId());});
this.saveOrUpdateBatch(list);
- //设置状态为 《已分解》
- targetMng.setDivideStatus(1);
+ //查询最新的分解数量，如果>0，设置状态为 《已分解》，否则设置为未分解
+ int divideStatus = 2;
+ if(infoDto.getTargetId() != null){
+ long number = this.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()));
--
Gitblit v1.9.2