From da981624e169b181b170e5d92986e190b9ff8052 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 22 八月 2022 10:33:24 +0800
Subject: [PATCH] 目标fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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 e4cc475..8f0e114 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
@@ -4,9 +4,18 @@
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.TargetMng;
+import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+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;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngDto;
import com.gkhy.safePlatform.targetDuty.repository.TargetExamineRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
+import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
+import com.gkhy.safePlatform.targetDuty.repository.TargetTypeRepository;
+import com.gkhy.safePlatform.targetDuty.service.CommonService;
+import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetExamineService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +29,8 @@
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import org.springframework.util.StringUtils;
-import java.util.Arrays;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -35,28 +44,17 @@
@Autowired
private TargetExamineRepository targetExamineRepository;
-
-
-
- @Override
- public ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery) {
- Long pageIndex = pageQuery.getPageIndex();
- Long pageSize = pageQuery.getPageSize();
- IPage<TargetExamine> page = new Page<>(pageIndex, pageSize);
- page = baseMapper.selectPage(page,
- QueryHelpPlus.getPredicate(TargetExamine.class, pageQuery.getSearchParams()));
- List<TargetExamineDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetExamineDto.class);
+ @Autowired
+ private TargetMngRepository targetMngRepository;
+ @Resource
+ private CommonService commonService;
- return new SearchResultVO<>(
- true,
- pageIndex,
- pageSize,page.getPages(),
- page.getTotal(),
- respList,
- ResultCodes.OK
- );
- }
+ @Resource
+ private TargetDivideDetailService targetDivideDetailService;
+
+ @Autowired
+ private TargetTypeRepository targetTypeRepository;
@Override
--
Gitblit v1.9.2