预约登记后台接口问题修改

huanghongfa

2021-08-27 b7968492c4876c1e2b7656e48ba535a2002ab105

预约登记后台接口问题修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/AddReserveAdminDTO.java

@@ -44,6 +44,6 @@
    private String jsonObject;

    @ApiModelProperty("是否发布（1.是 2.否）")
    private Integer isPublish;
    private Integer isPublish = 2;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveOperationRecordService.java

@@ -24,7 +24,8 @@
     * @param remark    备注
     * @param status    状态（1.提交 2.预约成功 3.预约失败 4.取消）
     * @param createBy  创建人
     * @param reserveTime  成功预约时间
     */
    void addReserveOperationRecord(Long reserveId, Long reserveRecordId, Long userId, Integer type
            , String phone, String reserveContent,String remark,Integer status,Long createBy);
            , String phone, String reserveContent,String remark,Integer status,Long createBy,Date reserveTime);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java

@@ -79,7 +79,7 @@
     */
    @Override
    public R registerDetailedListAdmin(PageReserveRegisterDetailedAdminDTO detailedAdminDTO){
        IPage<List<Map<String,Object>>> resultPage = new Page<>();
        IPage<HashMap<String,Object>> resultPage = new Page<>();

        IPage<ComActReserveRegisterDetailedVO> registerDetailedPage = this.baseMapper.pageRegisterDetailedListAdmin(new Page(detailedAdminDTO.getPageNum(),detailedAdminDTO.getPageSize()),detailedAdminDTO);
        resultPage.setCurrent(registerDetailedPage.getCurrent());
@@ -87,39 +87,31 @@
        resultPage.setSize(registerDetailedPage.getSize());
        resultPage.setPages(registerDetailedPage.getPages());

        List<List<Map<String,Object>>> resultMapList = new ArrayList<>();
        List<HashMap<String,Object>> resultMapList = new ArrayList<>();
        Integer nub = 1;
        for (ComActReserveRegisterDetailedVO registerDetailed:registerDetailedPage.getRecords()) {
            List<Map<String,Object>> mapList = new ArrayList<>();
            //渲染序号
            Map<String,Object> nubMap = new HashMap<>();
            nubMap.put("nub",nub);
            mapList.add(nubMap);
            //渲染用户昵称
            Map<String,Object> nickNameMap = new HashMap<>();
            nickNameMap.put("nickName",registerDetailed.getNickName());
            mapList.add(nickNameMap);

            //查询记录填写答案并装载到数据集中
            List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(registerDetailed.getId());
            registerDetailedAnswerList.forEach(detailed -> {
                Map<String,Object> detailedMap = new HashMap<>();
                detailedMap.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
                mapList.add(detailedMap);
            });

            //渲染登记流水号
            Map<String,Object> idMap = new HashMap<>();
            idMap.put("id",registerDetailed.getId());
            mapList.add(idMap);
            //渲染登记时间
            Map<String,Object> timeMap = new HashMap<>();
            timeMap.put("time",registerDetailed.getCreateAt());
            mapList.add(timeMap);
            resultMapList.add(mapList);
            nub++;
        if(!registerDetailedPage.getRecords().isEmpty()){
            for (ComActReserveRegisterDetailedVO registerDetailed:registerDetailedPage.getRecords()) {
                //渲染序号
                HashMap<String,Object> map = new HashMap<>();
                map.put("nub",nub);
                //渲染用户昵称
                map.put("nickName",registerDetailed.getNickName());
                //查询记录填写答案并装载到数据集中
                List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(registerDetailed.getId());
                if(!registerDetailedAnswerList.isEmpty()){
                    for (ComActReserveRegisterDetailedAnswerVO detailed:registerDetailedAnswerList) {
                        map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
                    }
                }
                //渲染登记流水号
                map.put("id",registerDetailed.getId());
                //渲染登记时间
                map.put("time",registerDetailed.getCreateAt());
                resultMapList.add(map);
                nub++;
            }
        }
        resultPage.setRecords(resultMapList);
        return R.ok(registerDetailedPage);
        return R.ok(resultPage);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveOperationRecordServiceImpl.java

@@ -29,10 +29,11 @@
     * @param remark    备注
     * @param status    状态（1.提交 2.预约成功 3.预约失败 4.取消）
     * @param createBy  创建人
     * @param reserveTime  预约成功时间
     */
    @Override
    public void addReserveOperationRecord(Long reserveId, Long reserveRecordId, Long userId, Integer type
            , String phone, String reserveContent,String remark,Integer status,Long createBy){
            , String phone, String reserveContent,String remark,Integer status,Long createBy,Date reserveTime){
        Date nowDate = new Date();
        ComActReserveOperationRecordDO operationRecordDO = new ComActReserveOperationRecordDO();
        operationRecordDO.setReserveId(reserveId);
@@ -45,7 +46,7 @@
        operationRecordDO.setStatus(status);
        operationRecordDO.setCreateBy(createBy);
        operationRecordDO.setCreateAt(nowDate);
        operationRecordDO.setReserveTime(nowDate);
        operationRecordDO.setReserveTime(reserveTime);
        this.baseMapper.insert(operationRecordDO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java

@@ -127,7 +127,7 @@
                    //添加操作记录
                    comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
                            ,reserveRecordDO.getId(),reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
                            ,"社区管理员取消预约",reserveRecordDTO.getRemark(),ComActReserveOperationRecordDO.status.qx,userId);
                            ,"社区管理员取消预约",reserveRecordDTO.getRemark(),ComActReserveOperationRecordDO.status.qx,userId,null);
                }
            });
            return R.ok();
@@ -215,20 +215,21 @@
        makeHandleDTO.getIds().forEach(id -> {
            ComActReserveRecordDO reserveRecordDO = this.baseMapper.selectById(id);
            if(reserveRecordDO != null){
                Date reserveTime = DateUtils.stringToDate(makeHandleDTO.getMakeTime(),DateUtils.ymdhms_format);
                //判断处理是否通过
                if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.yes)){
                    reserveRecordDO.setStatus(ComActReserveRecordDO.status.cg);
                    comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
                            ,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
                            ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.cg,userId);
                            ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.cg,userId,reserveTime);
                }else if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.no)){
                    reserveRecordDO.setStatus(ComActReserveRecordDO.status.sb);
                    comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
                            ,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
                            ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.sb,userId);
                            ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.sb,userId,null);
                }
                reserveRecordDO.setActRemark(remark);
                reserveRecordDO.setReserveTime(DateUtils.stringToDate(makeHandleDTO.getMakeTime(),DateUtils.ymdhms_format));
                reserveRecordDO.setReserveTime(reserveTime);
                reserveRecordDO.setUpdateAt(nowDate);
                reserveRecordDO.setUpdateBy(userId);
                updateList.add(reserveRecordDO);