From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java | 131 +++++++------------------------------------
1 files changed, 22 insertions(+), 109 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java
index 9031014..d3ed49c 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDivideDetailQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDivideDetailDto;
@@ -17,6 +18,7 @@
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetExamineService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetExamineBaseService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -40,121 +42,32 @@
* @since 2022-07-22 09:30:01
*/
@Service("targetExamineService")
-public class TargetExamineServiceImpl extends ServiceImpl<TargetExamineRepository, TargetExamine> implements TargetExamineService {
+public class TargetExamineServiceImpl implements TargetExamineService {
@Autowired
- private TargetExamineRepository targetExamineRepository;
-
- @Autowired
- private TargetMngRepository targetMngRepository;
- @Resource
- private CommonService commonService;
-
- @Resource
- private TargetDivideDetailService targetDivideDetailService;
-
- @Autowired
- private TargetTypeRepository targetTypeRepository;
-
- @Override
- public ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery) {
- Long pageIndex = pageQuery.getPageIndex();
- Long pageSize = pageQuery.getPageSize();
- IPage<TargetMng> page = new Page<>(pageIndex, pageSize);
-
- page = targetMngRepository.selectPage(page,
- QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
- List<TargetExamineDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetExamineDto.class);
- respList.forEach(dto->{
- //查询关联分解信息
- TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
- criteria.setTargetId(dto.getId());
- List<TargetDivideDetailDto> respList1 = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);
-
- // --------------------------- 获取部门信息-----------------------
- //收集所用到的部门ID
- Set<Long> collectDepIdSet = new HashSet();
- respList1.forEach(f->{
- collectDepIdSet.add(f.getDutyDepartmentId());
- collectDepIdSet.add(f.getMakerDepartmentId());
- });
- //获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
-
- respList1.forEach(f->{
- f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
- f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
- });
-
-
- // --------------------------- 获取目标分类名称-----------------------
- //收集所用到的目标分类ID
- Set<Long> collectTypeSet = new HashSet();
- respList1.forEach(f->{
- collectTypeSet.add(f.getTargetTypeId());
- });
- //获取目标分类名集合
- if(!collectTypeSet.isEmpty()){
- List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
- Map<Long,String> typeNameMap = typeList.stream()
- .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));
-
- respList1.forEach(f->{
- f.setTargetTypeName(typeNameMap.get(f.getTargetTypeId()));
- });
- }
-
-
- // --------------------------- 获取考核结果-----------------------
- //收集所用到的分解详情ID
- Set<Long> collectExamResultSet = new HashSet();
- respList1.forEach(f->{
- collectExamResultSet.add(f.getId());
- });
- //获取核结果集合
- if(!collectTypeSet.isEmpty()){
- List<TargetExamine> typeList = targetExamineRepository.selectBatchIds(collectTypeSet);
- Map<Long,Integer> examResultMap = typeList.stream()
- .collect(Collectors.toMap(TargetExamine::getId, TargetExamine::getExamineResult,(k1, k2)->k1));
-
- respList1.forEach(f->{
- f.setExamineResult(examResultMap.get(f.getId()));
- });
- }
-
-
- dto.setTargetDivideDetailList(respList1);
- });
-
- return new SearchResultVO<>(
- true,
- pageIndex,
- pageSize,page.getPages(),
- page.getTotal(),
- respList,
- ResultCodes.OK
- );
- }
+ private TargetExamineBaseService targetExamineBaseService;
@Override
public List<TargetExamine> queryAll(TargetExamineQueryCriteria criteria) {
- return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetExamine.class, criteria));
+ return targetExamineBaseService.queryAll(criteria);
}
-// @Override
-// public void addOrUpdate(TargetExamineSaveOrUpdate infoDto) {
-//
-//
-// if(StringUtils.hasText(infoDto.getDelIds())) {
-// List<Long> idList = Arrays.stream(infoDto.getDelIds().split(",")).map(s-> Long.parseLong(s.trim()))
-// .collect(Collectors.toList());
-// this.removeByIds(idList);
-// }
-//
-// infoDto.getExamineList().forEach(f->{
-// f.setTargetId(infoDto.getId());
-// });
-// this.saveOrUpdateBatch(infoDto.getExamineList());
-// }
+ @Override
+ public void delete(Long[] ids) {
+ if(ids == null){
+ throw new TargetDutyException(ResultCodes.CLIENT_PARAM_ILLEGAL);
+ }
+ List<Long> idList = Arrays.asList(ids);
+
+ List<TargetExamine> delList = new ArrayList<>();
+ idList.forEach(f->{
+ TargetExamine info = new TargetExamine();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ targetExamineBaseService.updateBatchById(delList);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.2