> regList;
- /**
- * 创建时间
- */
- private Date createTime;
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
index 0e1e8ce4f5..7c565fed9e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
@@ -68,14 +68,4 @@ public class PrUserProjectLogicEntity extends BaseEpmetEntity {
*/
private String conditionList;
- /**
- * 创建时间
- */
- private Date createTime;
-
- /**
- * 更新时间
- */
- private Date updateTime;
-
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
index 5d1cfa1f7f..9f46a03222 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
@@ -113,14 +113,4 @@ public class PrUserProjectResultEntity extends BaseEpmetEntity {
*/
private String wxUserInfo;
- /**
- * 创建时间
- */
- private Date createTime;
-
- /**
- * 更新时间
- */
- private Date updateTime;
-
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
index 89de31449a..d4b352e21b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
@@ -158,14 +158,4 @@ public class PrUserProjectSettingEntity extends BaseEpmetEntity {
*/
private String shareDesc;
- /**
- * 更新时间
- */
- private Date updateTime;
-
- /**
- * 创建时间
- */
- private Date createTime;
-
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
index 09eb0a1f35..db6d6192a8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
@@ -98,14 +98,4 @@ public class PrUserProjectThemeEntity extends BaseEpmetEntity {
*/
private Integer showNumber;
- /**
- * 更新时间
- */
- private Date updateTime;
-
- /**
- * 创建时间
- */
- private Date createTime;
-
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
index fb748bc4fd..00864276e1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
@@ -63,19 +63,4 @@ public class PrVistRecordEntity extends BaseEpmetEntity {
*/
private String projectKey;
- /**
- * 状态
- */
- private Integer deleted;
-
- /**
- *
- */
- private Date createTime;
-
- /**
- *
- */
- private Date updateTime;
-
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
index 3562215829..e51905536c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
@@ -98,14 +98,4 @@ public class WxMpUserEntity extends BaseEpmetEntity {
*/
private String userId;
- /**
- * 更新时间
- */
- private Date updateTime;
-
- /**
- * 创建时间
- */
- private Date createTime;
-
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
index 6ac1399035..74d1ddd332 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
@@ -1,25 +1,10 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
package com.epmet.dataaggre.service.epmettduck;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
import java.util.List;
@@ -31,65 +16,13 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-09-15
*/
-public interface PrUserProjectItemService extends BaseService {
-
- /**
- * 默认分页
- *
- * @param params
- * @return PageData
- * @author generator
- * @date 2021-09-15
- */
- PageData page(Map params);
-
- /**
- * 默认查询
- *
- * @param params
- * @return java.util.List
- * @author generator
- * @date 2021-09-15
- */
- List list(Map params);
-
- /**
- * 单条查询
- *
- * @param id
- * @return PrUserProjectItemDTO
- * @author generator
- * @date 2021-09-15
- */
- PrUserProjectItemDTO get(String id);
-
- /**
- * 默认保存
- *
- * @param dto
- * @return void
- * @author generator
- * @date 2021-09-15
- */
- void save(PrUserProjectItemDTO dto);
-
- /**
- * 默认更新
- *
- * @param dto
- * @return void
- * @author generator
- * @date 2021-09-15
- */
- void update(PrUserProjectItemDTO dto);
+public interface PrUserProjectItemService extends IService {
/**
- * 批量删除
- *
- * @param ids
- * @return void
- * @author generator
- * @date 2021-09-15
+ * @Description 问卷调查详情
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/9/16 2:51 下午
*/
- void delete(String[] ids);
+ List queryProjectItem(TDuckDetailFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
index c6b97866b1..32d849ea89 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
@@ -17,23 +17,32 @@
package com.epmet.dataaggre.service.epmettduck.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao;
import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -44,61 +53,27 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-09-15
*/
-@Slf4j
-@DataSource(DataSourceConstant.EPMETTDUCK)
@Service
-public class PrUserProjectItemServiceImpl extends BaseServiceImpl implements PrUserProjectItemService {
+@Slf4j
+@DataSource(DataSourceConstant.EPMET_T_DUCK)
+public class PrUserProjectItemServiceImpl extends ServiceImpl implements PrUserProjectItemService {
+ /**
+ * @Description 问卷调查详情
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/9/16 2:51 下午
+ */
@Override
- public PageData page(Map params) {
- IPage page = baseDao.selectPage(
- getPage(params, FieldConstant.CREATED_TIME, false),
- getWrapper(params)
+ public List queryProjectItem(TDuckDetailFormDTO formDTO) {
+ List itemEntityList = list(Wrappers.lambdaQuery()
+ .eq(PrUserProjectItemEntity::getProjectKey, formDTO.getKey())
+ .eq(PrUserProjectItemEntity::getDisplayType,formDTO.getDisplayType())
+ .orderByAsc(PrUserProjectItemEntity::getSort)
);
- return getPageData(page, PrUserProjectItemDTO.class);
- }
-
- @Override
- public List list(Map params) {
- List entityList = baseDao.selectList(getWrapper(params));
-
- return ConvertUtils.sourceToTarget(entityList, PrUserProjectItemDTO.class);
- }
-
- private QueryWrapper getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
-
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
- return wrapper;
+ if (CollectionUtils.isEmpty(itemEntityList)){
+ return new ArrayList<>();
+ }
+ return itemEntityList;
}
-
- @Override
- public PrUserProjectItemDTO get(String id) {
- PrUserProjectItemEntity entity = baseDao.selectById(id);
- return ConvertUtils.sourceToTarget(entity, PrUserProjectItemDTO.class);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void save(PrUserProjectItemDTO dto) {
- PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
- insert(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(PrUserProjectItemDTO dto) {
- PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- // 逻辑删除（@TableLogic 注解）
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
}
\ No newline at end of file