Commit b7431310 authored by tianyiming's avatar tianyiming

1、工程装置搜索修改

2、安装告知附件删除修改失败
parent 288959d2
...@@ -1599,7 +1599,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1599,7 +1599,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 工程装置名称模糊查询 // 工程装置名称模糊查询
if (!ObjectUtils.isEmpty(map.getString(PROJECT_CONTRAPTION))) { if (!ObjectUtils.isEmpty(map.getString(PROJECT_CONTRAPTION))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", map.getString(PROJECT_CONTRAPTION).toLowerCase())); pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", map.getString(PROJECT_CONTRAPTION)));
boolMust.must(pBuilder); boolMust.must(pBuilder);
} }
builder.query(boolMust); builder.query(boolMust);
......
...@@ -892,12 +892,18 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -892,12 +892,18 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 处理图片 // 处理图片
if (!ValidationUtil.isEmpty(model.getProxyStatementAttachmentList())) { if (!ValidationUtil.isEmpty(model.getProxyStatementAttachmentList())) {
model.setProxyStatementAttachment(JSON.toJSONString(model.getProxyStatementAttachmentList())); model.setProxyStatementAttachment(JSON.toJSONString(model.getProxyStatementAttachmentList()));
} else {
model.setProxyStatementAttachment("");
} }
if (!ValidationUtil.isEmpty(model.getInstallContractAttachmentList())) { if (!ValidationUtil.isEmpty(model.getInstallContractAttachmentList())) {
model.setInstallContractAttachment(JSON.toJSONString(model.getInstallContractAttachmentList())); model.setInstallContractAttachment(JSON.toJSONString(model.getInstallContractAttachmentList()));
} else {
model.setInstallContractAttachment("");
} }
if (!ValidationUtil.isEmpty(model.getOtherAccessoriesList())) { if (!ValidationUtil.isEmpty(model.getOtherAccessoriesList())) {
model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessoriesList())); model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessoriesList()));
} else {
model.setOtherAccessories("");
} }
// 分割省市区字段 // 分割省市区字段
......
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