Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java

@@ -53,7 +53,7 @@

        return this.examineMngService.queryAll(pageQuery);
    }
	


    /**
     * 通过主键查询单条数据
@@ -76,9 +76,9 @@
    @PostMapping(value = "/addOrUpdate")
    public ResultVO update(Authentication authentication, @RequestBody ExamineMng examineMng) {
        // 获取当前用户
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
/*        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        examineMng.setExamineDepartmentId(currentUser.getDepId());
        examineMng.setExaminePersonId(currentUser.getUid());
        examineMng.setExaminePersonId(currentUser.getUid());*/
        if (examineMng.getId() == null) {
            return new ResultVO<>(ResultCodes.OK,examineMngBaseService.save(examineMng));
        } else {
@@ -117,4 +117,4 @@

        System.out.println(JSONObject.toJSONString(examineTemplateSaveOrUpdate));
    }
}
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java

@@ -51,8 +51,8 @@

    @Resource
    private CommonService commonService;
    
	


    @Override
    public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
        PageUtils.checkCheck(pageQuery);
@@ -135,19 +135,21 @@
        List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class);
        List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());

        List<ExamineItem> itemList = examineItemBaseService.selectBatchIds(idList);
        Map<Long,ExamineItem> itemMap = itemList.stream().collect(
                Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
        if(!idList.isEmpty()) {
            List<ExamineItem> itemList = examineItemBaseService.selectBatchIds(idList);
            Map<Long, ExamineItem> itemMap = itemList.stream().collect(
                    Collectors.toMap(ExamineItem::getId, Function.identity(), (k1, k2) -> k1));

        if(itemMap != null){
            list.forEach(f->{
                ExamineItem item = itemMap.get(f.getId());
                if(item != null){
                    f.setItemDetail(item.getItemDetail());
                    f.setContent(item.getContent());
                    f.setJudgeStandard(item.getJudgeStandard());
                }
            });
            if (itemMap != null) {
                list.forEach(f -> {
                    ExamineItem item = itemMap.get(f.getId());
                    if (item != null) {
                        f.setItemDetail(item.getItemDetail());
                        f.setContent(item.getContent());
                        f.setJudgeStandard(item.getJudgeStandard());
                    }
                });
            }
        }
        dto.setCurrentExamineDtoList(list);

@@ -177,4 +179,4 @@
        });
        examineMngBaseService.updateBatchById(delList);
    }
}
}