Commit 35417484 authored by suhuiguang's avatar suhuiguang

fix(jyjc): 报检规则4.0开发

1.修正字段maxiLiftingHeight为maxLiftingHeight,兼容maxiLiftingHeight和maxLiftingHeight
parent 356a8052
...@@ -581,7 +581,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -581,7 +581,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
private void fillResultParamData(JyjcInspectionResultDataModel r, JyjcInspectionResult jyjcInspectionResult, List<JyjcInspectionResultParam> resultParams) { private void fillResultParamData(JyjcInspectionResultDataModel r, JyjcInspectionResult jyjcInspectionResult, List<JyjcInspectionResultParam> resultParams) {
JyjcInspectionResultParam resultParam = new JyjcInspectionResultParam(); JyjcInspectionResultParam resultParam = new JyjcInspectionResultParam();
resultParam.setResultSeq(jyjcInspectionResult.getSequenceNbr()); resultParam.setResultSeq(jyjcInspectionResult.getSequenceNbr());
resultParam.setParamJson(JSON.toJSONString(r.getTechParams())); resultParam.setParamJson(JSON.toJSONString(this.fixTechParams(r.getTechParams())));
resultParam.setRecUserId(RequestContext.getExeUserId()); resultParam.setRecUserId(RequestContext.getExeUserId());
resultParam.setRecDate(new Date()); resultParam.setRecDate(new Date());
resultParam.setRemark("同步数据"); resultParam.setRemark("同步数据");
...@@ -590,6 +590,16 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -590,6 +590,16 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
resultParams.add(resultParam); resultParams.add(resultParam);
} }
private JSONObject fixTechParams(JSONObject techParams) {
// 技术参数字段修正
if(techParams != null && techParams.containsKey("maxiLiftingHeight")){
Object value = techParams.get("maxiLiftingHeight");
techParams.put("maxLiftingHeight", value);
techParams.remove("maxiLiftingHeight");
}
return techParams;
}
private void fillResultParamData(PipelineInspectionResultDto r, JyjcInspectionResult jyjcInspectionResult, List<JyjcInspectionResultParam> resultParams) { private void fillResultParamData(PipelineInspectionResultDto r, JyjcInspectionResult jyjcInspectionResult, List<JyjcInspectionResultParam> resultParams) {
List<JyjcInspectionResultParam> paramList = iJyjcInspectionResultParamService.getParamByResultSeq(jyjcInspectionResult.getSequenceNbr()); List<JyjcInspectionResultParam> paramList = iJyjcInspectionResultParamService.getParamByResultSeq(jyjcInspectionResult.getSequenceNbr());
if (!paramList.isEmpty()) { if (!paramList.isEmpty()) {
......
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