Merge remote-tracking branch 'origin/master'

heheng

昨天 c6901af945ffbabafb4d50f39d2beb3b6a4af677

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java

@@ -56,6 +56,10 @@
        List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
        for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
            List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
            for (QualityTarget qualityTarget : qualityTargets) {
                List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
                qualityTarget.setQualityTargetMesses(qualityTargetMesses);
            }
            qualityTargetVo.setQualityTargets(qualityTargets);
        }
        return CommonPage.restPage(qualityTargetVos);
@@ -98,7 +102,7 @@
    public CommonResult updateQuality(QualityTargetReq qualityTargetReq) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();
        List<QualityTarget> qualityTargets = qualityTargetReq.getQualityTargets();
        List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
//        List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
        Quality quality = new Quality();
        BeanUtils.copyProperties(qualityTargetReq,quality);
        //获取对应企业
@@ -107,7 +111,7 @@
        quality.setUpdateBy(loginUser.getUsername());
        quality.setUpdateTime(LocalDateTime.now());
        int insert = qualityMapper.updateQualityById(quality);
        qualityTargetMapper.deleteByQualityIds(collect);
        qualityTargetMapper.deleteByQualityIds(qualityTargetReq.getId());
        for (QualityTarget qualityTarget : qualityTargets) {
            qualityTarget.setQualityId(quality.getId());
            qualityTarget.setCompanyId(qualityTargetReq.getCompanyId());
@@ -138,6 +142,10 @@
        List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
        for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
            List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
            for (QualityTarget qualityTarget : qualityTargets) {
                List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
                qualityTarget.setQualityTargetMesses(qualityTargetMesses);
            }
            qualityTargetVo.setQualityTargets(qualityTargets);
        }
        return CommonResult.success(qualityTargetVos);