|
@@ -168,22 +168,20 @@ public class OnceWorkOrderProductionController extends BaseController {
|
|
|
}
|
|
|
l.setOnWorkDetail(str.toString());
|
|
|
Integer style = l.getAddressStyle();
|
|
|
- if(style!=null){
|
|
|
+ if(null != style){
|
|
|
if (l.getTaskTypeId() == 5L && style == 1 && StringUtils.isNotEmpty(l.getInputProvince())) {
|
|
|
//自有地址
|
|
|
l.setExplain("自有地址:" + l.getInputProvince() + l.getInputCity() + l.getInputDistrict());
|
|
|
} else if (l.getTaskTypeId() == 5L && style == 2 && l.getFictionAddressId() != null) {
|
|
|
//虚拟地址
|
|
|
SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getFictionAddressId());
|
|
|
- if (sysDictData == null) {
|
|
|
- return;
|
|
|
+ if (sysDictData != null) {
|
|
|
+ l.setExplain("虚拟地址:" + sysDictData.getDictLabel());
|
|
|
}
|
|
|
- l.setExplain("虚拟地址:" + sysDictData.getDictLabel());
|
|
|
} else {
|
|
|
- if (StringUtils.isEmpty(l.getInputProvince())) {
|
|
|
- return;
|
|
|
+ if (!StringUtils.isEmpty(l.getInputProvince())) {
|
|
|
+ l.setExplain("办理地区:" + l.getInputProvince() + l.getInputCity() + l.getInputDistrict());
|
|
|
}
|
|
|
- l.setExplain("办理地区:" + l.getInputProvince() + l.getInputCity() + l.getInputDistrict());
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -279,7 +277,7 @@ public class OnceWorkOrderProductionController extends BaseController {
|
|
|
if(null != sysFileStorage.getFileUrl()){
|
|
|
sysFileStorage.setMasterId(statusVo.getWorkOrderId());
|
|
|
sysFileStorage.setMasterTableName("biz_work_order_record");
|
|
|
- sysFileStorageService.save(sysFileStorage);
|
|
|
+ sysFileStorageService.saveOrUpdate(sysFileStorage);
|
|
|
}
|
|
|
}
|
|
|
//把文件地址放到数据库里
|