|
|
@@ -158,7 +158,11 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
|
|
|
OutRdDetails bo = rdDetailsMapper.details(id);
|
|
|
OutWordRdDetails data =new OutWordRdDetails();
|
|
|
BeanUtils.copyProperties(bo,data);
|
|
|
- data.setStartEndTime(bo.getRdStartStr()+"~"+bo.getRdEndStr());
|
|
|
+ if (bo.getRdStartStr()!=null&&bo.getRdEndStr()!=null){
|
|
|
+ data.setStartEndTime(bo.getRdStartStr()+"~"+bo.getRdEndStr());
|
|
|
+ }else {
|
|
|
+ data.setStartEndTime("");
|
|
|
+ }
|
|
|
WordUtils wordUtils=new WordUtils();
|
|
|
try {
|
|
|
wordUtils.download(response,data.getRdName(),data,uploadPath);
|