|
@@ -110,6 +110,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
private final InformationQueryClient informationQueryClient;
|
|
|
private final ContractClient contractClient;
|
|
|
private final ITableFileService tableFileService;
|
|
|
+ private final TableInfoMapper tableInfoMapper;
|
|
|
+ private final WbsFormElementMapper wbsFormElementMapper;
|
|
|
|
|
|
|
|
|
@Autowired
|
|
@@ -1657,12 +1659,80 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
sgTabMaps.put(s + "---" + wbsTreeContract.getPKeyId(), wbsTreeContract.getInitTableName());
|
|
|
}
|
|
|
}
|
|
|
+ //获取 CL08水准测量记录表(监理)的 实际标高、高程偏差 对应字段 m_20220928134702_1574999102784012288
|
|
|
+ String leveling = "CL08水准测量记录表(监理)";
|
|
|
+ String levelingTableName = "m_20220928134702_1574999102784012288";
|
|
|
+
|
|
|
+ String designedElevation = "设置标高";
|
|
|
+ //负值+0/1 正值-0/1
|
|
|
+ String heightDeviation = "高度偏差";
|
|
|
+ //设置标高 + (高度偏差 / 100)
|
|
|
+ String actualElevation = "实际标高";
|
|
|
+
|
|
|
+ //m_20220928134725_1574999197613031424
|
|
|
+ String planePosition = "CL10平面位置检测记录表(监理)";
|
|
|
+ String planePositionTableName = "m_20220928134725_1574999197613031424";
|
|
|
+
|
|
|
+ //负值+0/1 正值-0/1
|
|
|
+ String difference = "差值";
|
|
|
+ //差值X + 差值Y 的开平方
|
|
|
+ String deviation = "偏差";
|
|
|
+ //指定表单和指定字段
|
|
|
+ Map<String, Map<String, String>> dataMaps = new HashMap<>();
|
|
|
+
|
|
|
for (WbsTreeContract wbsTreeContract : jlTabSort) {
|
|
|
//监理表
|
|
|
String s = extractAlphameric(wbsTreeContract.getNodeName());
|
|
|
if (StringUtils.isNotEmpty(s)) {
|
|
|
jlTabMaps.put(s + "---" + wbsTreeContract.getPKeyId(), wbsTreeContract.getInitTableName());
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 如果是
|
|
|
+ * CL08水准测量记录表(监理)
|
|
|
+ * 1、“实际标高”不获取数据,改为计算得来,计算规则为:实际标高 = 设计标高 + (高程偏差 / 100)。其中高程偏差需带符号进行计算,特别是负号;
|
|
|
+ * 2、获取的【高程偏差】需要做随机加减(规则为:如果是负数则+0/1,如果是正数则-0/1)
|
|
|
+ * CL10平面位置检测记录表(监理)
|
|
|
+ * 1、“差值”的两列和“偏位”数据不获取
|
|
|
+ * 2、获取的【差值】两列 需要做随机加减(规则为:如果是负数则+0/1,如果是正数则-0/1)
|
|
|
+ * 3、“偏差”不获取数据,改为计算得来,计算规则为:(差值x的平方 + 差值y的平方)的和开平方,四舍五入保留整数。
|
|
|
+ */
|
|
|
+ HashMap<String, String> map = new HashMap<>();
|
|
|
+
|
|
|
+ //判断当前表单是否是CL08、CL10
|
|
|
+ if (wbsTreeContract.getNodeName().contains(leveling) || wbsTreeContract.getNodeName().contains(planePosition)) {
|
|
|
+ TableInfo tableInfo = tableInfoMapper.selectOne(Wrappers.<TableInfo>lambdaQuery()
|
|
|
+ .eq(TableInfo::getTabEnName, wbsTreeContract.getInitTableName()));
|
|
|
+ List<WbsFormElement> wbsFormElements = wbsFormElementMapper.selectList(Wrappers.<WbsFormElement>lambdaQuery()
|
|
|
+ .eq(WbsFormElement::getFId, tableInfo.getId()));
|
|
|
+ for (WbsFormElement wbsFormElement : wbsFormElements) {
|
|
|
+ String eName = wbsFormElement.getEName();
|
|
|
+ if(eName.contains(designedElevation)){
|
|
|
+ //设置标高
|
|
|
+ map.put(designedElevation, wbsFormElement.getEKey());
|
|
|
+ }else if(eName.contains(heightDeviation)){
|
|
|
+ //高度偏差
|
|
|
+ map.put(heightDeviation, wbsFormElement.getEKey());
|
|
|
+ }else if(eName.contains(actualElevation)){
|
|
|
+ //实际标高
|
|
|
+ map.put(actualElevation, wbsFormElement.getEKey());
|
|
|
+ }else if(eName.contains(difference)){
|
|
|
+ //差值
|
|
|
+ if(eName.contains("X")){
|
|
|
+ map.put(difference + "X", wbsFormElement.getEKey());
|
|
|
+ }else if (eName.contains("Y")){
|
|
|
+ map.put(difference + "Y", wbsFormElement.getEKey());
|
|
|
+ }
|
|
|
+ }else if(eName.contains(deviation)){
|
|
|
+ //偏差
|
|
|
+ map.put(deviation, wbsFormElement.getEKey());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //存储
|
|
|
+ dataMaps.put(wbsTreeContract.getInitTableName(),map);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//构造表数据
|
|
@@ -1753,6 +1823,47 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
filedNames.add(vo.getName());
|
|
|
}*/
|
|
|
}
|
|
|
+
|
|
|
+ Map<String, String> stringStringMap = dataMaps.get(initTabName);
|
|
|
+
|
|
|
+ //CL08水准测量记录表(监理)
|
|
|
+ if(levelingTableName.equals(initTabName)){
|
|
|
+ String designedElevationNew = stringStringMap.get(designedElevation);
|
|
|
+ HashMap<Integer, Double> designedElevationNewMap = new HashMap<>();
|
|
|
+
|
|
|
+ String heightDeviationNew = stringStringMap.get(heightDeviation);
|
|
|
+ HashMap<Integer, Double> heightDeviationNewMap = new HashMap<>();
|
|
|
+
|
|
|
+ String actualElevationNew = stringStringMap.get(actualElevation);
|
|
|
+ HashMap<Integer, Double> actualElevationNewMap = new HashMap<>();
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ String[] split = designedElevationNew.split("_");
|
|
|
+ String index = split[1];
|
|
|
+ String key = keys.get(Integer.parseInt(index));
|
|
|
+ if(designedElevationNew.equals(key)){
|
|
|
+ String value = values.get(Integer.parseInt(index));
|
|
|
+ //拆分数据
|
|
|
+ String[] split1 = value.split("☆");
|
|
|
+ for (String s : split1) {
|
|
|
+ String[] split2 = s.split("_");
|
|
|
+ designedElevationNewMap.put(Integer.parseInt(split2[0]),Double.parseDouble(split2[2]));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ }else if(planePositionTableName.equals(initTabName)){
|
|
|
+ //CL10平面位置检测记录表(监理)
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if (keys.size() > 0 && values.size() > 0 && keys.size() == values.size()) {
|
|
|
//alter SQL(扩容字段长度)
|
|
|
StringBuilder exStrBuilder = new StringBuilder();
|