Merge remote-tracking branch 'origin/master'

heheng

13 小时以前 c6901af945ffbabafb4d50f39d2beb3b6a4af677

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

@@ -10,6 +10,7 @@
import com.gkhy.exam.system.domain.Quality;
import com.gkhy.exam.system.domain.QualityDecompose;
import com.gkhy.exam.system.domain.QualityTarget;
import com.gkhy.exam.system.domain.QualityTargetMess;
import com.gkhy.exam.system.domain.req.DecomposeTargetReq;
import com.gkhy.exam.system.domain.req.QualityReq;
import com.gkhy.exam.system.domain.vo.QualityDecomposeVo;
@@ -42,7 +43,7 @@

    @Override
    public CommonPage selectQualityDecomposeList(QualityReq qualityReq) {
        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
        if (!SecurityUtils.adminUser()){
            if (qualityReq.getCompanyId()==null){
                throw new ApiException("非管理员，查询条件不可为空");
            }
@@ -51,6 +52,10 @@
        List<QualityDecomposeVo> qualityDecomposeVos = qualityDecomposeMapper.selectDecomposeList(qualityReq);
        for (QualityDecomposeVo qualityDecomposeVo : qualityDecomposeVos) {
            List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityDecomposeVo.getQualityId());
            for (QualityTarget qualityTarget : qualityTargets) {
                List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
                qualityTarget.setQualityTargetMesses(qualityTargetMesses);
            }
            qualityDecomposeVo.setQualityTargets(qualityTargets);
        }
        return CommonPage.restPage(qualityDecomposeVos);
@@ -71,8 +76,9 @@
        for (QualityTarget qualityTarget : qualityTargets) {
            qualityTarget.setCreateTime(LocalDateTime.now());
            qualityTarget.setCreateBy(loginUser.getUsername());
            qualityTargetMapper.insertQualityTargetMess(qualityTarget.getQualityTargetMesses());
        }
        qualityTargetMapper.updateQualityTargetById(qualityTargets);
//        qualityTargetMapper.updateQualityTargetById(qualityTargets);
        return CommonResult.success();
    }

@@ -85,7 +91,11 @@
        BeanUtils.copyProperties(decomposeTargetReq,qualityDecompose);
        qualityDecomposeMapper.updateById(qualityDecompose);
        List<QualityTarget> qualityTargets = decomposeTargetReq.getQualityTargets();
        qualityTargetMapper.updateQualityTargetById(qualityTargets);
        for (QualityTarget qualityTarget : qualityTargets) {
            qualityTargetMapper.deletedByQualityTargetId(qualityTarget.getId());
            qualityTargetMapper.insertQualityTargetMess(qualityTarget.getQualityTargetMesses());
        }
//        qualityTargetMapper.updateQualityTargetById(qualityTargets);
        return CommonResult.success();
    }