代码提交

liusheng

2024-01-15 a0bcee3aa22b79f592c44cdb3dcdbd681490f265

 smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java

@@ -1,10 +1,12 @@
package com.smartor.service.impl;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,8 @@
    private SvyLibTopicMapper svyLibTopicMapper;
    @Autowired
    private SvyLibTopicoptionMapper svyLibTopicoptionMapper;
    @Autowired
    private TempDetpRelevanceMapper tempDetpRelevanceMapper;

    /**
     * 查询问卷
@@ -63,7 +67,7 @@
            a:
            for (int j = 0; j < svyLibTopics.size(); j++) {
                log.info("问题id为：{}", svyLibTopics.get(j).getSvyTopicId());
                if (svyLibTopics.get(j).getTopictype() != null && svyLibTopics.get(j).getTopictype() == 3 || svyLibTopics.get(j).getSvyTopicId() == null) {
                if (StringUtils.isNotEmpty(svyLibTopics.get(j).getTopictype()) && svyLibTopics.get(j).getTopictype().equals("3") || svyLibTopics.get(j).getSvyTopicId() == null) {
                    //作答题，不需要选项
                    continue a;
                } else {
@@ -76,6 +80,12 @@
            }
            //将题目放到问卷列表中
            svyLibTitles.get(i).setSvyLibTopics(svyLibTopics);

            //获取每个问卷对应的科室
            TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
            tempDetpRelevance.setTempid(svyLibTitles.get(i).getSvyid());
            List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
            svyLibTitles.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());
        }

        //先将相同的id的icdname,整理到一块
@@ -152,7 +162,7 @@
                    svyLibTopic.setSvyid(svyLibTitle.getSvyid());
                    //题目的选项目，直接用svy_topicoption表，用svyTopicid去关联
                    svyLibTopicMapper.insertSvyLibTopic(svyLibTopic);
                } else if (svyLibTitle.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
                } else if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
                    //修改
                    svyLibTopic.setSvyid(svyLibTitle.getSvyid());
                    svyLibTopicMapper.updateSvyLibTopic(svyLibTopic);
@@ -176,6 +186,20 @@

            }
        }

        if (CollectionUtils.isNotEmpty(svyLibTitle.getTempDetpRelevances())) {
            for (TempDetpRelevance tempDetpRelevance : svyLibTitle.getTempDetpRelevances()) {
                if (tempDetpRelevance.getId() == null) {
                    //新增
                    tempDetpRelevance.setTempid(svyLibTitle.getSvyid());
                    tempDetpRelevance.setType(1L);
                    tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
                } else {
                    tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
                }
            }

        }
        return i;
    }