springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java
@@ -25,4 +25,6 @@ @ApiModelProperty("预约时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date reserveTime; @ApiModelProperty("姓名") private String name; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -240,7 +240,7 @@ R r = communityService.exportMakeAdmin(pageMakeDTO); if (R.isOk(r)) { List<ComActReserveMakeDetailedExcelAdminVO> resultList = new ArrayList<>(); List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class); List<ComActReserveMakeListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class); rightStatisticsList.forEach(rightStatistics -> { ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeDetailedExcelAdminVO(); BeanUtils.copyProperties(rightStatistics,makeRightExcelAdminVO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.service_community.dao.ComActReserveAnswerContentMapper; import com.panzhihua.service_community.dao.ComActReserveSubMapper; import com.panzhihua.service_community.model.dos.ComActQuestnaireAnswerContentDO; @@ -24,10 +25,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; /** * @auther lyq @@ -106,7 +104,7 @@ //渲染登记流水号 map.put("id",registerDetailed.getId()); //渲染登记时间 map.put("time",registerDetailed.getCreateAt()); map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format)); resultMapList.add(map); nub++; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -58,7 +58,8 @@ ComActReserveRecordDO comActReserveRecordDO=comActReserveRecordMapper.selectById(comActReserveRecord.getId()); if(comActReserveRecordDO!=null&&comActReserveRecordDO.getStatus()!=ComActReserveRecordDO.status.yqx){ comActReserveRecordDO.setStatus(ComActReserveRecordDO.status.yqx); comActReserveRecordDO.setContent(comActReserveRecord.getContent()); comActReserveRecordDO.setRemark(comActReserveRecord.getContent()); comActReserveRecordDO.setReserveTime(DateUtil.date()); int result =comActReserveRecordMapper.updateById(comActReserveRecordDO); //判断取消状态并添加操作记录 if(result>0){ @@ -71,6 +72,7 @@ comActReserveOperationRecordDO.setPhone(comActReserveRecordDO.getPhone()); comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.qx); comActReserveOperationRecordDO.setUserId(comActReserveRecordDO.getUserId()); comActReserveOperationRecordDO.setReserveTime(DateUtil.date()); comActReserveOperationRecordMapper.insert(comActReserveOperationRecordDO); return R.ok(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -85,7 +85,7 @@ //查询当前用户是否已预约并判断是否能继续预约 if(comActReserveDO.getJoinAllCount()!=0){ Integer count=comActReserveRecordMapper.selectCount(new QueryWrapper<ComActReserveRecordDO>().eq("reserve_id",comActReserveCommitVO.getId())); if(count>=comActReserveDO.getJoinCount()){ if(count>=comActReserveDO.getJoinAllCount()){ return R.fail("预约已上限"); } } @@ -175,6 +175,7 @@ comActReserveMapper.updateById(comActReserveDO); //新增用户答题记录 ComActReserveRecordDO userAnswerDO = new ComActReserveRecordDO(); userAnswerDO.setName(comActReserveCommitVO.getName()); userAnswerDO.setCommunityId(comActReserveCommitVO.getCommunityId()); userAnswerDO.setPhone(comActReserveCommitVO.getPhone()); userAnswerDO.setReserveId(questId);
