springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedAnswerVO.java
@@ -15,6 +15,9 @@ @ApiModelProperty("题目id") private Long reserveSubId; @ApiModelProperty("题目内容") private String reserveSubContent; @ApiModelProperty("回答内容") private String answerContent; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedVO.java
@@ -18,10 +18,19 @@ @ApiModelProperty("用户昵称") private String nickName; @ApiModelProperty("身份") private String identity; @ApiModelProperty("提交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("是否是党员（0.否 1.是）") private Integer isPartymember; @ApiModelProperty("是否是志愿者（0.否 1.是）") private Integer isVolunteer; @ApiModelProperty("答案列表") private List<ComActReserveRegisterDetailedAnswerVO> answerList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -4525,7 +4525,7 @@ * @param communityId 社区id * @return 预约信息列表 */ @GetMapping("/reserve/admin/make/list") @GetMapping("/reserve/admin/list") R listReserveAdmin(@RequestParam("communityId") Long communityId); /** @@ -4551,4 +4551,12 @@ */ @PostMapping("/reserve/admin/register/detailed/list") R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO); /** * 查询登记详情记录 * @param reserveRecordId 登记记录id * @return 登记详情记录 */ @GetMapping("/reserve/admin/register/detailed/detail") R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -614,4 +614,10 @@ return communityService.registerDetailedListAdmin(detailedAdminDTO); } @ApiOperation(value = "查询登记明细详情",response = ComActReserveRegisterDetailedVO.class) @PostMapping("/register/detailed/detail") public R registerDetailedDetail(@RequestParam("reserveRecordId") Long reserveRecordId) { return communityService.registerDetailedDetailAdmin(reserveRecordId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -317,4 +317,9 @@ public R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO){ return comActReserveAnswerContentService.registerDetailedListAdmin(detailedAdminDTO); } @GetMapping("/admin/register/detailed/detail") public R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId){ return comActReserveRecordService.registerDetailedDetailAdmin(reserveRecordId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveRecordMapper.java
@@ -6,10 +6,7 @@ import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailAdminVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeHandleListAdminVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeListAdminVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterStatisticsAdminVO; import com.panzhihua.common.model.vos.community.reserve.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageUserReserveDTO; @@ -98,4 +95,6 @@ * @return 预约处理列表 */ List<ComActReserveMakeHandleListAdminVO> exportMakeHandleAdmin(@Param("pageMakeHandleDTO") PageReserveMakeHandleAdminDTO pageMakeHandleDTO); ComActReserveRegisterDetailedVO getRegisterDetailedByRecordId(@Param("reserveRecordId") Long reserveRecordId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveRecordService.java
@@ -80,4 +80,6 @@ */ R exportMakeHandleAdmin(PageReserveMakeHandleAdminDTO pageMakeHandleDTO); R registerDetailedDetailAdmin(Long reserveRecordId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -6,10 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailAdminVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeOperationAdminVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterStatisticsAdminVO; import com.panzhihua.common.model.vos.community.reserve.*; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.service_community.dao.ComActReserveAnswerContentMapper; import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper; import com.panzhihua.common.model.dtos.community.CancelRecordDTO; import com.panzhihua.common.model.vos.R; @@ -43,6 +42,8 @@ public class ComActReserveRecordServiceImpl extends ServiceImpl<ComActReserveRecordMapper, ComActReserveRecordDO> implements ComActReserveRecordService { @Resource private ComActReserveRecordMapper comActReserveRecordMapper; @Resource private ComActReserveAnswerContentMapper comActReserveAnswerContentMapper; @Resource private ComActReserveOperationRecordMapper comActReserveOperationRecordMapper; @Resource @@ -252,4 +253,29 @@ return R.ok(this.baseMapper.exportMakeHandleAdmin(pageMakeHandleDTO)); } @Override public R registerDetailedDetailAdmin(Long reserveRecordId){ //查询用户信息 ComActReserveRegisterDetailedVO registerDetailedVO = this.baseMapper.getRegisterDetailedByRecordId(reserveRecordId); if(registerDetailedVO != null){ //组装用户身份信息 StringBuilder sb = new StringBuilder(); if(registerDetailedVO.getIsPartymember().equals(1)){ sb.append("党员/"); } if(registerDetailedVO.getIsVolunteer().equals(1)){ sb.append("志愿者/"); } if(sb.length() == 0){ sb.append("居民/"); } String identity = sb.toString(); registerDetailedVO.setIdentity(identity.substring(0,identity.length()-1)); //查询答题数据 List<ComActReserveRegisterDetailedAnswerVO> answerList = comActReserveAnswerContentMapper.getRegisterDetailedAnswerList(reserveRecordId); registerDetailedVO.setAnswerList(answerList); } return R.ok(registerDetailedVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
@@ -57,7 +57,12 @@ </select> <select id="getRegisterDetailedAnswerList" resultType="com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO"> select reserve_sub_id,answer_content from com_act_reserve_answer_content where reserve_record_id = #{reserveRecordId} order by id asc SELECT car.content as reserveSubContent, carac.answer_content as answerContent,carac.reserve_sub_id as reserveSubId FROM com_act_reserve_answer_content AS carac LEFT JOIN com_act_reserve_sub AS car ON car.reserve_id = carac.reserve_record_id where carac.reserve_record_id = #{reserveRecordId} order by carac.id asc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml
@@ -177,6 +177,6 @@ adver_position_application FROM com_act_reserve where is_del = 2 and `type` = 1 and communityId = #{communityId} where is_del = 2 and `type` = 1 and community_id = #{communityId} </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml
@@ -281,4 +281,17 @@ </if> order by carr.create_at desc </select> <select id="getRegisterDetailedByRecordId" resultType="com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO"> SELECT carr.create_at, carr.id, su.nick_name, su.is_partymember, su.is_volunteer FROM com_act_reserve_record AS carr LEFT JOIN sys_user AS su ON su.user_id = carr.user_id where carr.id = #{reserveRecordId} </select> </mapper>
