Commit 9de3f67b authored by Lambertliu's avatar Lambertliu

fix(jg):管道登记功能开发

parent 26531076
...@@ -3971,14 +3971,38 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -3971,14 +3971,38 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.filter(Objects::nonNull) .filter(Objects::nonNull)
.mapToDouble(value -> Double.parseDouble((String) value)) .mapToDouble(value -> Double.parseDouble((String) value))
.sum(); .sum();
MapBuilder<String, Object> resultBuilder = MapBuilder.<String, Object>create()
return MapBuilder.<String, Object>create()
.put("equipmentLists", equList) .put("equipmentLists", equList)
.put("projectContraption", projectContraption.getProjectContraption()) .put("projectContraption", projectContraption.getProjectContraption())
.put("projectContraptionId", projectContraptionSeq) .put("projectContraptionId", projectContraptionSeq)
.put("projectContraptionNo", projectContraption.getProjectContraptionNo()) .put("projectContraptionNo", projectContraption.getProjectContraptionNo())
.put("pipelineLength", totalPipelineLength) .put("pipelineLength", totalPipelineLength);
.build(); setProjectContraptionInfo(projectContraptionSeq, resultBuilder);
return resultBuilder.build();
}
private void setProjectContraptionInfo(String projectContraptionSeq, MapBuilder<String, Object> re) {
LambdaQueryWrapper<IdxBizJgProjectConstruction> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(IdxBizJgProjectConstruction::getProjectContraptionId, projectContraptionSeq)
.orderByDesc(IdxBizJgProjectConstruction::getUscDate).last("limit 1");
IdxBizJgProjectConstruction construction = idxBizJgProjectConstructionMapper.selectOne(queryWrapper);
if(construction != null){
re.put("installLeaderName", construction.getConstructionLeaderName());
re.put("installLeaderPhone",construction.getConstructionLeaderPhone());
re.put("installStartDate", construction.getUscDate());
re.put("installPropertyUnitName", construction.getConstructionLeaderName());
re.put("installProxyStatementAttachment", JSON.parse(construction.getProxyStatementAttachment()));
re.put("installContractAttachment", JSON.parse(construction.getConstructionContractAttachment()));
re.put("insOtherAccessories", JSON.parse(construction.getConstructionOtherAccessories()));
re.put("installStreet", construction.getStreetName());
re.put("installProvince", construction.getProvinceName());
re.put("installAddress", construction.getAddress());
re.put("installCity", construction.getCityName());
re.put("installIsXixian", construction.getIsXixian());
re.put("installCounty", construction.getCountyName());
re.put("uscUnitCreditCode", construction.getUscUnitCreditCode());
re.put("uscUnitName", construction.getUscUnitName());
}
} }
private void setConstructionInfo(String projectContraptionSeq, Map<String, Object> re) { private void setConstructionInfo(String projectContraptionSeq, Map<String, Object> re) {
......
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