|
@ -19,8 +19,11 @@ package com.epmet.dataaggre.service.epmettduck.impl; |
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.epmet.commons.dynamic.datasource.annotation.DataSource; |
|
|
import com.epmet.commons.dynamic.datasource.annotation.DataSource; |
|
|
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.epmet.commons.tools.constant.FieldConstant; |
|
|
import com.epmet.commons.tools.constant.FieldConstant; |
|
@ -32,6 +35,7 @@ import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao; |
|
|
import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao; |
|
|
import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao; |
|
|
import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum; |
|
|
import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum; |
|
|
|
|
|
import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO; |
|
|
import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO; |
|
@ -462,6 +466,19 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, |
|
|
return itemList; |
|
|
return itemList; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* @Description 查询问卷调查的头部信息 |
|
|
|
|
|
* @Param formDTO |
|
|
|
|
|
* @author zxc |
|
|
|
|
|
* @date 2021/9/18 10:35 上午 |
|
|
|
|
|
*/ |
|
|
|
|
|
@Override |
|
|
|
|
|
public PrUserProjectEntity headerInfo(TDuckHeaderInfoFormDTO formDTO) { |
|
|
|
|
|
LambdaQueryWrapper<PrUserProjectEntity> w = new LambdaQueryWrapper<>(); |
|
|
|
|
|
LambdaQueryWrapper<PrUserProjectEntity> eq = w.eq(PrUserProjectEntity::getKey, formDTO.getProjectKey()); |
|
|
|
|
|
return eq.getEntity(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private List<Map.Entry<Integer, Integer>> sortMap(Map<Integer, Integer> map, boolean asc) { |
|
|
private List<Map.Entry<Integer, Integer>> sortMap(Map<Integer, Integer> map, boolean asc) { |
|
|
|
|
|
|
|
|
Stream<Map.Entry<Integer, Integer>> stream = null; |
|
|
Stream<Map.Entry<Integer, Integer>> stream = null; |
|
|