|
@@ -1,6 +1,7 @@
|
|
|
package cn.ezhizao.project.business.workOrder.controller;
|
|
|
|
|
|
import cn.ezhizao.common.exception.ServiceException;
|
|
|
+import cn.ezhizao.common.utils.StringUtils;
|
|
|
import cn.ezhizao.common.utils.poi.ExcelUtil;
|
|
|
import cn.ezhizao.framework.aspectj.lang.annotation.Log;
|
|
|
import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
|
|
@@ -14,6 +15,7 @@ import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderOnce;
|
|
|
import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderOnceExport;
|
|
|
import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
|
|
|
import cn.ezhizao.project.system.domain.SysCurrentMonth;
|
|
|
+import cn.ezhizao.project.system.domain.SysDictData;
|
|
|
import cn.ezhizao.project.system.service.ISysCurrentMonthService;
|
|
|
import cn.ezhizao.project.system.service.ISysDictDataService;
|
|
|
import cn.ezhizao.project.tenant.domain.Tenant;
|
|
@@ -69,13 +71,20 @@ public class WorkOrderOnceController extends BaseController {
|
|
|
if(style ==null){
|
|
|
return;
|
|
|
}
|
|
|
- if (v.getTaskTypeId() == 5L && style == 1){
|
|
|
+ if (v.getTaskTypeId() == 5L && style == 1 && StringUtils.isNotEmpty(v.getInputProvince()) ){
|
|
|
//自有地址
|
|
|
v.setExplain("自有地址:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
|
|
|
- }else if (v.getTaskTypeId() == 5L && style == 2){
|
|
|
+ }else if (v.getTaskTypeId() == 5L && style == 2 && v.getFictionAddressId() != null){
|
|
|
//虚拟地址
|
|
|
- v.setExplain("虚拟地址:"+sysDictDataService.selectDictDataById(v.getFictionAddressId()).getDictLabel());
|
|
|
+ SysDictData sysDictData = sysDictDataService.selectDictDataById(v.getFictionAddressId());
|
|
|
+ if(sysDictData == null){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ v.setExplain("虚拟地址:"+sysDictData.getDictLabel());
|
|
|
}else {
|
|
|
+ if (StringUtils.isEmpty(v.getInputProvince())){
|
|
|
+ return;
|
|
|
+ }
|
|
|
v.setExplain("办理地区:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
|
|
|
}
|
|
|
|