From d8cf7aaf91f33eae9861b6352550b856d451754a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 13:47:52 +0800
Subject: [PATCH] 1105测试代码修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java | 7 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 8 ++--
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java | 6 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 6 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java | 4 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml | 31 +++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 8 ++--
7 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 7d9fab4..4356d60 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5324,11 +5324,11 @@
/**
* 导出登记明细数据
*
- * @param reserveId 登记id
+ * @param pageReserveRegisterDetailedAdminDTO
* @return 登记明细数据
*/
- @GetMapping("/reserve/admin/register/list/export")
- R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
+ @PostMapping("/reserve/admin/register/list/export")
+ R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
/**
* 查询预约登记题目列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
index fcd999b..c7a00be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -466,8 +466,8 @@
}
@ApiOperation(value = "导出登记明细")
- @GetMapping("/register/list/export")
- public R exportRegister(@RequestParam("reserveId") Long reserveId) {
+ @PostMapping("/register/list/export")
+ public R exportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
String ftpUrl = "/mnt/data/web/excel/";
String name = "登记明细导出数据.xlsx";
@@ -486,7 +486,7 @@
* 组合导出数据
* 用户问卷答案
*/
- R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(reserveId);
+ R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
QuestnaireAnswersDTO questnaireAnswersDTOS = JSON.parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);
List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.getSubs();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
index b98b028..c87f0d2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -255,12 +255,12 @@
/**
* 导出登记明细数据
- * @param reserveId 登记id
+ * @param pageReserveRegisterDetailedAdminDTO 登记id
* @return 登记明细数据
*/
- @GetMapping("/admin/register/list/export")
- public R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId){
- return comActReserveAnswerContentService.exportRegisterAdmin(reserveId);
+ @PostMapping("/admin/register/list/export")
+ public R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){
+ return comActReserveAnswerContentService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
index f459aa7..e93c132 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
@@ -35,7 +35,12 @@
* @return 某预约登记记录列表
*/
IPage<ComActReserveRegisterDetailedVO> pageRegisterDetailedListAdmin(Page page, @Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
-
+ /**
+ * 导出某预约登记记录列表
+ * @param detailedAdminDTO 请求参数
+ * @return 某预约登记记录列表
+ */
+ List<ComActQuestnaireAnswerContentVO> export(@Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
/**
* 查询登记记录填写的内容列表
* @param reserveRecordId 预约登记记录id
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java
index 2c01310..3862b6c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java
@@ -14,10 +14,10 @@
/**
* 导出登记明细数据
- * @param reserveId 登记id
+ * @param pageReserveRegisterDetailedAdminDTO 登记id
* @return 登记明细数据
*/
- R exportRegisterAdmin(Long reserveId);
+ R exportRegisterAdmin(PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
/**
* 分页查询登记明细列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index 28fd379..3e7a335 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -43,16 +43,16 @@
/**
* 导出登记明细数据
- * @param reserveId 登记id
+ * @param pageReserveRegisterDetailedAdminDTO 登记id
* @return 登记明细数据
*/
@Override
- public R exportRegisterAdmin(Long reserveId){
+ public R exportRegisterAdmin(PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){
QuestnaireAnswersDTO result = new QuestnaireAnswersDTO();
//查询题目
List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
- .eq(ComActReserveSubDO::getReserveId, reserveId).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId));
+ .eq(ComActReserveSubDO::getReserveId, pageReserveRegisterDetailedAdminDTO.getReserveId()).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId));
List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
list.forEach(subDo -> {
if(!subDo.getType().equals(5)){
@@ -64,7 +64,7 @@
result.setSubs(listSubVo);
//查询用户回答
- List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.selectListByReserve(reserveId);
+ List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.export(pageReserveRegisterDetailedAdminDTO);
result.setAnswers(vos);
return R.ok(result);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
index 934142d..b151b56 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
@@ -62,7 +62,7 @@
AND STR_TO_DATE(carac.answer_content,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{detailedAdminDTO.stopTime}
</if>
<if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """>
- AND carac.answer_content like concat ('%',${detailedAdminDTO.keyword},'%')
+ AND carac.answer_content like concat ('%',#{detailedAdminDTO.keyword},'%')
</if>
group by carr.id
</select>
@@ -87,4 +87,33 @@
where carr.id = #{reserveRecordId}
</select>
+ <select id="export" resultType="com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO">
+ SELECT
+ qs.type as optionType,ac.*,su.nick_name,carr.create_at as `time`
+ FROM
+ com_act_reserve_answer_content ac
+ LEFT JOIN com_act_reserve_sub qs ON ac.reserve_sub_id = qs.id
+ LEFT JOIN com_act_reserve qn ON qs.reserve_id = qn.id
+ LEFT JOIN sys_user su ON ac.user_id = su.user_id
+ LEFT JOIN com_act_reserve_record carr ON carr.id = ac.reserve_record_id
+ WHERE
+ qn.id = #{detailedAdminDTO.reserveId}
+ <if test='detailedAdminDTO.startTime != null and detailedAdminDTO.startTime != ""'>
+ AND carr.create_at <![CDATA[ >= ]]> #{detailedAdminDTO.startTime}
+ </if>
+ <if test='detailedAdminDTO.endTime != null and detailedAdminDTO.endTime != ""'>
+ AND carr.create_at <![CDATA[ <= ]]> #{detailedAdminDTO.endTime}
+ </if>
+ <if test='detailedAdminDTO.beginTime != null and detailedAdminDTO.beginTime != ""'>
+ AND STR_TO_DATE(ac.answer_content,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{detailedAdminDTO.beginTime}
+ </if>
+ <if test='detailedAdminDTO.stopTime != null and detailedAdminDTO.stopTime != ""'>
+ AND STR_TO_DATE(ac.answer_content,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{detailedAdminDTO.stopTime}
+ </if>
+ <if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """>
+ AND ac.answer_content like concat ('%',#{detailedAdminDTO.keyword},'%')
+ </if>
+ order by ac.reserve_record_id asc,ac.id asc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1