Commit 78330b8c authored by 刘凡's avatar 刘凡

优化:移装变更记录冗余设备移装地址信息

parent 46e43c55
...@@ -22,13 +22,12 @@ ...@@ -22,13 +22,12 @@
crt.use_registration_code as useRegistrationCode, crt.use_registration_code as useRegistrationCode,
crt.next_execute_user_ids as nextExecuteUserIds, crt.next_execute_user_ids as nextExecuteUserIds,
crt.create_user_id as createUserId, crt.create_user_id as createUserId,
crt.full_address as address, crt.full_address as allAddress,
use.USE_UNIT_NAME as useUnitName, use.USE_UNIT_NAME as useUnitName,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory, (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
jri.PRODUCT_NAME as productName, jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode, jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode, use.USE_INNER_CODE as innerCode,
concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as allAddress,
crteq.equ_id as equipId crteq.equ_id as equipId
from tzs_jg_change_registration_transfer crt from tzs_jg_change_registration_transfer crt
LEFT JOIN tzs_jg_change_registration_transfer_eq crteq on crt.sequence_nbr = crteq.equip_transfer_id LEFT JOIN tzs_jg_change_registration_transfer_eq crteq on crt.sequence_nbr = crteq.equip_transfer_id
......
...@@ -238,25 +238,25 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -238,25 +238,25 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
if (!ObjectUtils.isEmpty(province)) { if (!ObjectUtils.isEmpty(province)) {
String[] provinceList = province.split("_"); String[] provinceList = province.split("_");
if (provinceList.length > 1) { if (provinceList.length > 1) {
fullAddress+=provinceList[1]+"/"; fullAddress+=provinceList[1];
} }
} }
if (!ObjectUtils.isEmpty(city)) { if (!ObjectUtils.isEmpty(city)) {
String[] cityList = city.split("_"); String[] cityList = city.split("_");
if (cityList.length > 1) { if (cityList.length > 1) {
fullAddress+=cityList[1]+"/"; fullAddress+=cityList[1];
} }
} }
if (!ObjectUtils.isEmpty(county)) { if (!ObjectUtils.isEmpty(county)) {
String[] countyList = county.split("_"); String[] countyList = county.split("_");
if (countyList.length > 1) { if (countyList.length > 1) {
fullAddress+=countyList[1]+"/"; fullAddress+=countyList[1];
} }
} }
if (!ObjectUtils.isEmpty(street)) { if (!ObjectUtils.isEmpty(street)) {
String[] streetList = street.split("_"); String[] streetList = street.split("_");
if (streetList.length > 1) { if (streetList.length > 1) {
fullAddress+=streetList[1]+"/"; fullAddress+=streetList[1];
} }
} }
if (!ObjectUtils.isEmpty(address)) { if (!ObjectUtils.isEmpty(address)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment