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); } /** * 通过主键查询单条数据 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)表控制层 @@ -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"); 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") @@ -32,14 +31,13 @@ //安全目标指标 private String qName; public String getqName() { public String getQName() { return qName; } public void setqName(String qName) { public void setQName(String qName) { this.qName = qName; } //目标指标编号 private String indexNum; @@ -101,7 +99,7 @@ public void setMemo(String memo) { this.memo = memo; } //指标类型 1:年指标 2:月指标 //指标类型 1:年指标 2:月指标 3:半年 4:季度 private Integer targetType; public Integer getTargetType() { @@ -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; } } 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; } } 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; } } 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); } 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); 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; 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) { 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()); @@ -139,6 +138,8 @@ return null; } TargetMngDto targetMngDto = BeanCopyUtils.copyBean(targetMng, TargetMngDto.class); // --------------------------- 获取部门信息----------------------- targetMngDto.setMakerDepartmentName(commonService.getDepName(targetMngDto.getMakerDepartmentId())); //查询关联分解信息 TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
