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/entity/TargetMng.java | 48 +++++++-----
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetExamineService.java | 2
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetMngRepository.java | 4
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 19 ++--
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java | 9 +-
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java | 12 ---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 9 +-
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineMngDto.java | 1
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java | 80 --------------------
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java | 23 +++++
10 files changed, 72 insertions(+), 135 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
index 768aebe..f0dc8cb 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
@@ -84,18 +84,6 @@
// }
- /**
- * 分页查询所有数据
- *
- * @param pageQuery 查询实体
- * @return 所有数据
- */
- @PostMapping(value = "/page/list")
- public ResultVO selectAll(@RequestBody PageQuery<TargetExamineQueryCriteria> pageQuery){
- PageUtils.checkCheck(pageQuery);
- return this.targetExamineService.queryAll(pageQuery);
- }
-
/**
* 通过主键查询单条数据
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
index d7bfeff..68f0a8b 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -35,7 +35,6 @@
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 目标指标(TargetMng)表控制层
@@ -74,7 +73,7 @@
PageUtils.checkCheck(pageQuery);
return this.targetMngService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -96,7 +95,7 @@
@PostMapping(value = "/addOrUpdate")
public ResultVO update(@RequestBody TargetMng targetMng) {
- if( !StringUtils.hasText(targetMng.getqName()) || !StringUtils.hasText(targetMng.getIndexNum())
+ if( !StringUtils.hasText(targetMng.getQName()) || !StringUtils.hasText(targetMng.getIndexNum())
|| !StringUtils.hasText(targetMng.getYear()) || !StringUtils.hasText(targetMng.getValue())
|| targetMng.getTargetType() == null){
return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少必填字段");
@@ -238,7 +237,7 @@
public static void main(String[] args) {
TargetMng mng = new TargetMng();
- mng.setqName("12");
+ mng.setQName("12");
mng.setIndexNum("3");
mng.setYear("2021");
mng.setValue("312");
@@ -250,4 +249,4 @@
System.out.println(JSONObject.toJSONString(mng));
}
-}
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
index bd836e3..f703c92 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 目标指标(TargetMng)表实体类
*
* @author xurui
- * @since 2022-07-20 11:49:22
+ * @since 2022-08-22 10:14:22
*/
@SuppressWarnings("serial")
@TableName("target_mng")
@@ -30,18 +29,17 @@
}
//安全目标指标
- private String qName;
-
- public String getqName() {
+ private String qName;
+
+ public String getQName() {
return qName;
}
- public void setqName(String qName) {
+ public void setQName(String qName) {
this.qName = qName;
}
-
- //目标指标编号
- private String indexNum;
+ //目标指标编号
+ private String indexNum;
public String getIndexNum() {
return indexNum;
@@ -51,7 +49,7 @@
this.indexNum = indexNum;
}
//年度
- private String year;
+ private String year;
public String getYear() {
return year;
@@ -61,7 +59,7 @@
this.year = year;
}
//指标值
- private String value;
+ private String value;
public String getValue() {
return value;
@@ -71,7 +69,7 @@
this.value = value;
}
//指标级别 1:公司级 2:部门分厂级 3:工段班组级
- private Integer level;
+ private Integer level;
public Integer getLevel() {
return level;
@@ -81,8 +79,8 @@
this.level = level;
}
//完成期限
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp completeDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp completeDate;
public Timestamp getCompleteDate() {
return completeDate;
@@ -92,7 +90,7 @@
this.completeDate = completeDate;
}
//备注信息
- private String memo;
+ private String memo;
public String getMemo() {
return memo;
@@ -101,8 +99,8 @@
public void setMemo(String memo) {
this.memo = memo;
}
- //指标类型 1:年指标 2:月指标
- private Integer targetType;
+ //指标类型 1:年指标 2:月指标 3:半年 4:季度
+ private Integer targetType;
public Integer getTargetType() {
return targetType;
@@ -112,7 +110,7 @@
this.targetType = targetType;
}
//分解状态 1:已分解 2:未分解
- private Integer divideStatus;
+ private Integer divideStatus;
public Integer getDivideStatus() {
return divideStatus;
@@ -121,5 +119,15 @@
public void setDivideStatus(Integer divideStatus) {
this.divideStatus = divideStatus;
}
-
+ //目标制定部门
+ private Long makerDepartmentId;
+
+ public Long getMakerDepartmentId() {
+ return makerDepartmentId;
+ }
+
+ public void setMakerDepartmentId(Long makerDepartmentId) {
+ this.makerDepartmentId = makerDepartmentId;
+ }
+
}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineMngDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineMngDto.java
index bf7e42e..bb8f2a6 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineMngDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineMngDto.java
@@ -232,4 +232,5 @@
public void setExamineTemplateName(String examineTemplateName) {
this.examineTemplateName = examineTemplateName;
}
+
}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
index 28a0702..a6cf9d4 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
@@ -140,4 +140,27 @@
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
+
+ //目标制定部门
+ private Long makerDepartmentId;
+
+ public Long getMakerDepartmentId() {
+ return makerDepartmentId;
+ }
+
+ public void setMakerDepartmentId(Long makerDepartmentId) {
+ this.makerDepartmentId = makerDepartmentId;
+ }
+
+
+ //目标制定部门名称
+ private String makerDepartmentName;
+
+ public String getMakerDepartmentName() {
+ return makerDepartmentName;
+ }
+
+ public void setMakerDepartmentName(String makerDepartmentName) {
+ this.makerDepartmentName = makerDepartmentName;
+ }
}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetMngRepository.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetMngRepository.java
index 45d375e..a5204a3 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetMngRepository.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetMngRepository.java
@@ -23,12 +23,12 @@
"</script> ")
Integer selectTotal(Map<String, Object> beanToMap);
- @Select("<script>select COUNT(target_id) from target_divide_detail a INNER JOIN target_mng b on a.target_id = b.id \n" +
+ @Select("<script>select COUNT(1) from (select a.target_id from target_divide_detail a INNER JOIN target_mng b on a.target_id = b.id \n" +
"WHERE a.id not in (select target_divide_detail_id from target_examine where examine_result = 1)\n" +
"<if test =\"divideStatus !='' and divideStatus !=null\">and b.divide_status = #{divideStatus}</if> " +
"<if test =\"targetType !='' and targetType !=null\">and b.target_type = #{targetType}</if>" +
"<if test =\"qName !='' and qName !=null\">and b.q_name = #{qName}</if>" +
"<if test =\"indexNum !='' and indexNum !=null\">and b.index_num = #{indexNum}</if>" +
- "GROUP BY a.target_id</script> ")
+ "GROUP BY a.target_id) x</script> ")
Integer selectNoComplete(Map<String, Object> beanToMap);
}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetExamineService.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetExamineService.java
index 658b287..119456e 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetExamineService.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetExamineService.java
@@ -17,8 +17,6 @@
* @since 2022-07-22 09:30:01
*/
public interface TargetExamineService extends IService<TargetExamine> {
- ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery);
-
List<TargetExamine> queryAll(TargetExamineQueryCriteria criteria);
// void addOrUpdate(TargetExamineSaveOrUpdate infoDto);
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
index d4b353d..9e1704d 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
@@ -16,7 +16,6 @@
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.ExamineMngService;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -56,8 +55,8 @@
@Resource
private CommonService commonService;
-
-
+
+
@Override
public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -88,7 +87,7 @@
List<CurrentExamineDto> list = JSONObject.parseArray( dto.getNumberDetailJson(), CurrentExamineDto.class);
List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());
- if (!idList.isEmpty()){
+ if(!idList.isEmpty()){
List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList);
Map<Long,ExamineItem> itemMap = itemList.stream().collect(
Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
@@ -164,4 +163,4 @@
return dto;
}
-}
+}
\ No newline at end of file
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..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
@@ -56,86 +56,6 @@
@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
- );
- }
-
@Override
public List<TargetExamine> queryAll(TargetExamineQueryCriteria criteria) {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
index b9144f9..5d7f321 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -21,16 +20,13 @@
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
-import com.gkhy.safePlatform.targetDuty.utils.BeanToMapUtil;
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.beans.IntrospectionException;
import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -75,6 +71,9 @@
QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
List<TargetMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetMngDto.class);
respList.forEach(dto->{
+ // --------------------------- 获取部门信息-----------------------
+ dto.setMakerDepartmentName(commonService.getDepName(dto.getMakerDepartmentId()));
+
//查询关联分解信息
TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
criteria.setTargetId(dto.getId());
@@ -88,7 +87,7 @@
collectDepIdSet.add(f.getMakerDepartmentId());
});
//获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+ Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
respList1.forEach(f->{
f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
@@ -105,7 +104,7 @@
//获取目标分类名集合
if(!collectTypeSet.isEmpty()){
List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
- Map<Long,String> typeNameMap = typeList.stream()
+ Map<Long, String> typeNameMap = typeList.stream()
.collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));
respList1.forEach(f->{
@@ -139,6 +138,8 @@
return null;
}
TargetMngDto targetMngDto = BeanCopyUtils.copyBean(targetMng, TargetMngDto.class);
+ // --------------------------- 获取部门信息-----------------------
+ targetMngDto.setMakerDepartmentName(commonService.getDepName(targetMngDto.getMakerDepartmentId()));
//查询关联分解信息
TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
@@ -153,7 +154,7 @@
collectDepIdSet.add(f.getMakerDepartmentId());
});
//获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+ Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
respList.forEach(f->{
f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
@@ -172,7 +173,7 @@
//获取核结果集合
if(!collectExamResultSet.isEmpty()){
List<TargetExamine> typeList = targetExamineRepository.selectList(new QueryWrapper<TargetExamine>().in("target_divide_detail_id",collectExamResultSet));
- Map<Long,TargetExamine> examResultMap = typeList.stream()
+ Map<Long, TargetExamine> examResultMap = typeList.stream()
.collect(Collectors.toMap(TargetExamine::getTargetDivideDetailId, Function.identity(),(k1, k2)->k1));
respList.forEach(f->{
@@ -232,7 +233,7 @@
@Override
public Object statistics(TargetMngQueryCriteria criteria) {
- Map<String,String> map = new HashMap<>();
+ Map<String, String> map = new HashMap<>();
// 查询总数
Integer total = 0;
// 完成数量
--
Gitblit v1.9.2