springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
@@ -31,5 +31,9 @@ private Long selectionId; @ApiModelProperty("答题记录id") private Long reserveRecordId; @ApiModelProperty("填报时间") private Date time; @ApiModelProperty("用户昵称") private String nickName; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -482,7 +482,7 @@ List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.getSubs(); //构造表头 List<List<String>> headList = new ArrayList<List<String>>(); String firstRowContent = "调查结果"; String firstRowContent = "登记明细"; List<String> head0 = new ArrayList<>(); head0.add(firstRowContent); head0.add("姓名"); @@ -503,23 +503,23 @@ List<Object> userData = new ArrayList<>(); List<ComActQuestnaireAnswerContentVO> usersAnswers = questnaireAnswersDTOS.getAnswers(); //查询用户回答的所有答案，并新增到答案列表中 ComActReserveRegisterDetailedVO recordListVO = questnaireAnswersDTOS.getRecordListVO(); userData.add(recordListVO.getNickName()); userData.add(DateUtils.format(recordListVO.getCreateAt(),DateUtils.ymdhms_format)); Long reserveRecordId = null; for (ComActQuestnaireAnswerContentVO userAnswers:usersAnswers) { if(reserveRecordId == null){ reserveRecordId = userAnswers.getReserveRecordId(); userData.add(userAnswers.getNickName()); userData.add(DateUtils.format(userAnswers.getTime(),DateUtils.ymdhms_format)); } if(!reserveRecordId.equals(userAnswers.getReserveRecordId())){ datalist.add(userData); userData = new ArrayList<>(); userData.add(recordListVO.getNickName()); userData.add(DateUtils.format(recordListVO.getCreateAt(),DateUtils.ymdhms_format)); reserveRecordId = userAnswers.getReserveRecordId(); userData.add(userAnswers.getNickName()); userData.add(DateUtils.format(userAnswers.getTime(),DateUtils.ymdhms_format)); } userData.add(userAnswers.getAnswerContent()); } datalist.add(userData); } WriteCellStyle headWriteCellStyle = new WriteCellStyle(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO; import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO; import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO; @@ -25,7 +26,7 @@ * @param reserveId 预约登记id * @return 登记类答案记录列表 */ List<ComActReserveAnswerContentDO> selectListByReserve(@Param("reserveId")Long reserveId); List<ComActQuestnaireAnswerContentVO> selectListByReserve(@Param("reserveId")Long reserveId); /** * 分页查询用户填写某预约登记记录列表 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -59,23 +59,10 @@ }); result.setSubs(listSubVo); Long reserveRecordId = null; //查询用户回答 List<ComActReserveAnswerContentDO> questnaireAnswerContentDOList = this.baseMapper.selectListByReserve(reserveId); List<ComActQuestnaireAnswerContentVO> vos = new ArrayList<>(); for (ComActReserveAnswerContentDO dos:questnaireAnswerContentDOList) { ComActQuestnaireAnswerContentVO vo = new ComActQuestnaireAnswerContentVO(); BeanUtils.copyProperties(dos, vo); reserveRecordId = dos.getReserveRecordId(); vos.add(vo); } List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.selectListByReserve(reserveId); result.setAnswers(vos); //查询用户提交信息 ComActReserveRegisterDetailedVO recordListVO = this.baseMapper.getRegisterDetailedById(reserveRecordId); if(recordListVO != null){ result.setRecordListVO(recordListVO); } return R.ok(result); }
@@ -12,6 +12,7 @@ import com.panzhihua.common.model.dtos.community.CancelRecordDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper; import com.panzhihua.service_community.model.dos.ComActReserveDO; import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO; import com.panzhihua.service_community.model.dos.ComActReserveRecordDO; import com.panzhihua.service_community.service.ComActReserveOperationRecordService; @@ -63,6 +64,11 @@ int result =comActReserveRecordMapper.updateById(comActReserveRecordDO); //判断取消状态并添加操作记录 if(result>0){ //更新回答用户数量 ComActReserveDO comActReserveDO=comActReserveMapper.selectById(comActReserveRecordDO.getReserveId()); Integer joinCount = comActReserveDO.getJoinCount(); comActReserveDO.setJoinCount(joinCount != null ? joinCount - 1 : 0); comActReserveMapper.updateById(comActReserveDO); ComActReserveOperationRecordDO comActReserveOperationRecordDO=new ComActReserveOperationRecordDO(); comActReserveOperationRecordDO.setReserveId(comActReserveRecordDO.getReserveId()); comActReserveOperationRecordDO.setReserveRecordId(comActReserveRecordDO.getId()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -209,6 +209,7 @@ comActReserveOperationRecordDO.setPhone(comActReserveCommitVO.getPhone()); comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.ytj); comActReserveOperationRecordDO.setUserId(comActReserveCommitVO.getUserId()); comActReserveOperationRecordDO.setRemark(comActReserveCommitVO.getContent()); comActReserveOperationRecordMapper.insert(comActReserveOperationRecordDO); return R.ok("提交成功"); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
@@ -23,13 +23,15 @@ id, reserve_sub_id, reserve_selection_id, user_id, type, choice, answer_content, create_by, create_at, update_by, update_at, reserve_record_id </sql> <select id="selectListByReserve" resultType="com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO"> <select id="selectListByReserve" resultType="com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO"> SELECT ac.* 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 = #{reserveId} </select> @@ -58,7 +60,7 @@ 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 LEFT JOIN com_act_reserve_sub AS car ON car.id = carac.reserve_sub_id where carac.reserve_record_id = #{reserveRecordId} order by carac.id asc </select>
