Commit 4a7f03f3 authored by suhuiguang's avatar suhuiguang

fix(使用登记):使用登记详情接口少返回字段

1.增加字段主键sequenceNbr、登记类型regType
parent 40b684cc
...@@ -165,8 +165,8 @@ public class CommonServiceImpl implements ICommonService { ...@@ -165,8 +165,8 @@ public class CommonServiceImpl implements ICommonService {
// 业务通用发起——基本信息 // 业务通用发起——基本信息
private static final String basic = "basic"; private static final String basic = "basic";
private static final String useRegFormUpload = "useRegFormUpload"; private static final String useRegFormUpload = "useRegFormUpload";
private static final String HISTORY_EQU_TYPE = "historyEquType"; public static final String HISTORY_EQU_TYPE = "historyEquType";
private static final String SECOND = "second"; public static final String SECOND = "second";
// 业务通用发起——告知单详情 // 业务通用发起——告知单详情
public static final String notice = "notice"; public static final String notice = "notice";
// 业务通用发起——技术参数-改造变更登记使用 // 业务通用发起——技术参数-改造变更登记使用
......
...@@ -2235,6 +2235,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2235,6 +2235,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
lambda.eq(JgRegistrationHistory::getIsDelete, false); lambda.eq(JgRegistrationHistory::getIsDelete, false);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda); JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData()); JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
jsonObject.put("sequenceNbr", jgUseRegistration.getSequenceNbr());
jsonObject.put("manageType", jgUseRegistration.getManageType()); jsonObject.put("manageType", jgUseRegistration.getManageType());
jsonObject.put("createUserId", jgUseRegistration.getCreateUserId()); jsonObject.put("createUserId", jgUseRegistration.getCreateUserId());
jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName()); jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
...@@ -2260,7 +2261,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2260,7 +2261,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record); LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper); IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber()); jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber());
jsonObject.put("regType", jgUseRegistration.getRegType());
} else { } else {
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists"); List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(toList()); List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(toList());
...@@ -2285,6 +2285,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2285,6 +2285,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
} }
} }
} }
jsonObject.put("regType", jgUseRegistration.getRegType());
jsonObject.put("useRegistrationCode", jgUseRegistration.getUseRegistrationCode()); jsonObject.put("useRegistrationCode", jgUseRegistration.getUseRegistrationCode());
jsonObject.put("useRegistrationFormUrl", jgUseRegistration.getUseRegistrationFormUrl()); jsonObject.put("useRegistrationFormUrl", jgUseRegistration.getUseRegistrationFormUrl());
jsonObject.put("useRegistrationFormFile", JSONArray.parseArray(jgUseRegistration.getUseRegistrationFormFile())); jsonObject.put("useRegistrationFormFile", JSONArray.parseArray(jgUseRegistration.getUseRegistrationFormFile()));
......
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