花城-智慧社区
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
manailin
2022-04-08 8d5fb4ee9d27fd6a61b210eaee74af265f76aa7c 
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java


@@ -1,20 +1,33 @@


package com.panzhihua.service_community.service.impl;




import java.io.BufferedOutputStream;


import java.io.File;


import java.io.FileOutputStream;


import java.io.IOException;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;




import javax.annotation.Resource;




import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import com.alibaba.fastjson.JSON;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import cn.hutool.core.date.DateUtil;


import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.google.common.collect.Lists;


import com.panzhihua.common.model.dtos.community.OperationDetailDTO;


import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;


import com.panzhihua.common.model.dtos.community.reserve.*;


import com.panzhihua.common.model.helper.AESUtil;


import com.panzhihua.common.model.vos.R;


import com.panzhihua.common.model.vos.community.ComActReserveIndexVo;


import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;


import com.panzhihua.common.model.vos.community.bigscreen.IndexBackReserve;


import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;


import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubSelectionVO;


@@ -22,46 +35,15 @@


import com.panzhihua.common.model.vos.community.reserve.*;


import com.panzhihua.common.utlis.Snowflake;


import com.panzhihua.common.utlis.StringUtils;


import com.panzhihua.service_community.dao.ComActReserveMapper;


import com.panzhihua.service_community.dao.ComActReserveSubMapper;


import com.panzhihua.service_community.model.dos.*;


import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;


import com.panzhihua.common.model.vos.R;


import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;


import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubVO;


import com.panzhihua.service_community.dao.*;


import com.panzhihua.service_community.model.dos.*;


import com.panzhihua.service_community.service.ComActReserveAnswerContentService;


import com.panzhihua.service_community.service.ComActReserveRecordService;


import com.panzhihua.service_community.service.ComActReserveService;


import com.panzhihua.service_community.service.ComActReserveSubSelectionService;




import cn.hutool.core.date.DateUtil;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import java.io.BufferedOutputStream;


import java.io.File;


import java.io.FileOutputStream;


import java.io.IOException;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.security.InvalidKeyException;


import java.security.NoSuchAlgorithmException;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import javax.crypto.BadPaddingException;


import javax.crypto.IllegalBlockSizeException;


import javax.crypto.NoSuchPaddingException;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;




/**


 * @auther lyq


@@ -213,16 +195,19 @@


                                if(questnaiteSub.getType().equals(QuestnaiteSubVO.type.address)){


                                    houseId=questnaiteSub.getValues();


                                    comMngPopulationHouseDO=comMngPopulationHouseDAO.selectById(houseId);


                                    ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO();


                                    answerContentDO.setUserId(userId);


                                    answerContentDO.setCreateAt(nowDate);


                                    answerContentDO.setCreateBy(userId);


                                    answerContentDO.setReserveSubId(queSubId);


                                    answerContentDO.setType(2);


                                    if(comMngPopulationHouseDO!=null){


                                        ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO();


                                        answerContentDO.setUserId(userId);


                                        answerContentDO.setCreateAt(nowDate);


                                        answerContentDO.setCreateBy(userId);


                                        answerContentDO.setReserveSubId(queSubId);


                                        answerContentDO.setType(2);


                                        answerContentDO.setAnswerContent(comMngPopulationHouseDO.getAddress());


                                        answerContentList.add(answerContentDO);


                                    }


                                    else {


                                        answerContentDO.setAnswerContent("");


                                    }


                                    answerContentList.add(answerContentDO);


                                }


                            }


                        }


@@ -683,7 +668,7 @@


     * @return  预约登记详情


     */


    @Override


    public R detailReserveAdmin(Long reserveId){


    public R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId) {


        ComActReserveDetailAdminVO reserveDetailAdminVO = new ComActReserveDetailAdminVO();


        //查询预约登记信息


        ComActReserveDO reserveDO = this.baseMapper.selectById(reserveId);