bugfixed：59

CeDo

2021-05-17 f4c88a49217a99b017e67b4c0ccca1432774111a

bugfixed：59

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java

@@ -63,7 +63,6 @@
            if (null==jumpId||0==jumpId.intValue()) {
                return R.fail("跳转内容不能为空");
            }
            comOpsAdvDTO.setJumpUrl(comOpsAdvDTO.getJumpUrl());
        } else {
            String jumpUrl = comOpsAdvDTO.getJumpUrl();
            if (ObjectUtils.isEmpty(jumpUrl)) {
@@ -92,7 +91,6 @@
            if (null==jumpId||0==jumpId.intValue()) {
                return R.fail("跳转内容不能为空");
            }
            comOpsAdvDTO.setJumpUrl(comOpsAdvDTO.getJumpUrl());
        } else {
            String jumpUrl = comOpsAdvDTO.getJumpUrl();
            if (ObjectUtils.isEmpty(jumpUrl)) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComCvtServeExcelListen.java

@@ -2,6 +2,7 @@

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
@@ -57,4 +58,23 @@
            throw new ServiceException(r.getMsg());
        }
    }


    /**
     * 在转换异常
     * @param exception
     * @param context
     * @throws Exception
     */
    @Override
    public void onException(Exception exception, AnalysisContext context) throws ServiceException {
        log.error("抛出异常:{}", exception.getMessage());
        if (exception instanceof ExcelDataConvertException) {
            ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
            log.error("第{}行，第{}列解析异常，数据为:{}", excelDataConvertException.getRowIndex(),
                    excelDataConvertException.getColumnIndex(), excelDataConvertException.getCellData());
        }else{
            throw new ServiceException(exception.getMessage());
        }
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,5 +33,9 @@
    @ApiModelProperty("志愿者参加的已经完成的活动")
    private List<ComActActivityVO> comActActivityVOList;

    @ApiModelProperty("时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}