springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5671,11 +5671,12 @@ /** * 导出登记明细数据 * @param reserveId 登记id * @return 登记明细数据 * * @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); /** * 查询预约登记题目列表 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(); 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); } /** 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 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); /** * 分页查询登记明细列表 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); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
@@ -61,10 +61,10 @@ <if test='detailedAdminDTO.stopTime != null and detailedAdminDTO.stopTime != ""'> 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},'%') </if> group by carr.id <if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """> AND carac.answer_content like concat ('%',#{detailedAdminDTO.keyword},'%') </if> group by carr.id </select> <select id="getRegisterDetailedAnswerList" resultType="com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO"> @@ -87,4 +87,32 @@ 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>
