Commit 3ca20bd1 authored by tianbo's avatar tianbo

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents d18283dd 7b3a362e
......@@ -1205,7 +1205,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useInfoMapper.updateById(useInfo);
// 更新es
//为批量回滚es将equipId放入list中
mapData.put("equipId", new ArrayList<>().add(mapData.get("equipId")));
mapData.put("equipId", Arrays.asList(mapData.get("equipId").toString()));
updateEsData(usePlace, mapData, otherInfo, jgUseRegistration, jsonObject, Boolean.FALSE);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgUseRegistration.getApplyNo())
......@@ -1394,7 +1394,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
.eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
recordJsonObject.put("equipId", new ArrayList<>().add(jgUseRegistrationEq.getEquId()));
recordJsonObject.put("equipId", Arrays.asList(jgUseRegistrationEq.getEquId()));
// 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IdxBizJgRegisterInfo::getCarNumber, carNumber);
......
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