fix

songhuangfeng123

2022-09-20 f1f506172a3edff8d31e4db77b8940f115660919

fix

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

@@ -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 {

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

@@ -135,6 +135,7 @@
        List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class);
        List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());

        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));
@@ -149,6 +150,7 @@
                }
            });
        }
        }
        dto.setCurrentExamineDtoList(list);

        //获取合格分数