预约登记代码合并冲突解决

huanghongfa

2021-08-26 f58561357b9d7a47cf32e1aa368498677b043f30

预约登记代码合并冲突解决

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveOperationRecordDO.java

@@ -82,24 +82,6 @@
     */
    private Long createBy;

    /**
     * 类型（1.本人操作 2.社区操作）
     */
    public interface type{
        int br = 1;
        int sq = 2;
    }

    /**
     * 状态（1.提交 2.预约成功 3.预约失败 4.取消）
     */
    public interface status{
        int tj = 1;
        int yycg = 2;
        int yysb = 3;
        int qx = 4;
    }

    @Override
    public String toString() {
        return "ComActReserveOperationRecordDO{" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java

@@ -107,16 +107,6 @@
     */
    private Long updateBy;

    /**
     * 状态（1.待处理 2.预约成功 3.预约失败 4.已取消）
     */
    public interface status{
        int dcl = 1;
        int yycg = 2;
        int yysb = 3;
        int yqx = 4;
    }

    @Override
    public String toString() {
        return "ComActReserveRecordDO{" +

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

@@ -215,15 +215,15 @@
            if(reserveRecordDO != null){
                //判断处理是否通过
                if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.yes)){
                    reserveRecordDO.setStatus(ComActReserveRecordDO.status.yycg);
                    reserveRecordDO.setStatus(ComActReserveRecordDO.status.cg);
                    comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
                            ,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
                            ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.yycg,userId);
                            ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.cg,userId);
                }else if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.no)){
                    reserveRecordDO.setStatus(ComActReserveRecordDO.status.yysb);
                    reserveRecordDO.setStatus(ComActReserveRecordDO.status.sb);
                    comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
                            ,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
                            ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.yysb,userId);
                            ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.sb,userId);
                }
                reserveRecordDO.setActRemark(remark);
                reserveRecordDO.setReserveTime(DateUtils.stringToDate(makeHandleDTO.getMakeTime(),DateUtils.ymdhms_format));