|
@@ -558,21 +558,21 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
|
|
|
if(ObjectUtil.isNotEmpty(oldItp.getStructuremachineno())
|
|
|
&& ObjectUtil.isNotEmpty(updatecolumns.get("STRUCTUREMACHINENO")) ) {
|
|
|
if(!oldItp.getStructuremachineno().equals(updatecolumns.get("STRUCTUREMACHINENO"))) {
|
|
|
- structuremachineno = StrUtil.concat(true, "机构机号:", oldItp.getStructuremachineno()
|
|
|
+ structuremachineno = StrUtil.concat(true, "结构机号:", oldItp.getStructuremachineno()
|
|
|
, " 变更为:", StringUtils.toString(updatecolumns.get("STRUCTUREMACHINENO"), ""));
|
|
|
}
|
|
|
}
|
|
|
//旧数据不为空
|
|
|
else if(ObjectUtil.isNotEmpty(oldItp.getStructuremachineno())) {
|
|
|
if(!oldItp.getStructuremachineno().equals(updatecolumns.get("STRUCTUREMACHINENO"))) {
|
|
|
- structuremachineno = StrUtil.concat(true, "机构机号:", oldItp.getStructuremachineno()
|
|
|
+ structuremachineno = StrUtil.concat(true, "结构机号:", oldItp.getStructuremachineno()
|
|
|
, " 变更为:", StringUtils.toString(updatecolumns.get("STRUCTUREMACHINENO"), ""));
|
|
|
}
|
|
|
}
|
|
|
//新数据不为空
|
|
|
else if(ObjectUtil.isNotEmpty(updatecolumns.get("STRUCTUREMACHINENO"))) {
|
|
|
if(!updatecolumns.get("STRUCTUREMACHINENO").toString().equals(oldItp.getStructuremachineno())) {
|
|
|
- structuremachineno = StrUtil.concat(true, "机构机号:", oldItp.getStructuremachineno()
|
|
|
+ structuremachineno = StrUtil.concat(true, "结构机号:", oldItp.getStructuremachineno()
|
|
|
, " 变更为:", StringUtils.toString(updatecolumns.get("STRUCTUREMACHINENO"), ""));
|
|
|
}
|
|
|
}
|