表单相关：G10偏差设定

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/FormulaMileage.java

@@ -44,6 +44,7 @@ public class FormulaMileage implements FormulaStrategy {
     public static final String DX = "dx";
     public static final String DY = "dy";
     public static final String DS = "ds";
+    public static final String F_DEV="WP['G10pcfw']";
     public static final List<String> KEYS = new ArrayList<>(Arrays.asList(ZH, PW, SJX, SJY, SCX, SCY, DX, DY, DS));
     private List<String> relyList;
 
@@ -97,17 +98,18 @@ public class FormulaMileage implements FormulaStrategy {
             Map<String, String[]> coordinateMap = mileageClient.mileage2Coordinate(zhpw, Func.toLong(tec.getContractId()));
             /*G10缓存对象*/
             if (coordinateMap.size() > 0) {
+                String dev= Optional.ofNullable(Expression.parse(F_DEV).calculate(tec.getConstantMap())).map(Object::toString).orElse(cur.getFormula().getDev());
+                if (StringUtils.isEmpty(dev)) {
+                    dev = Mileage.DEV;
+                }
+                String finalDev = dev;
                 mileageList.forEach(m -> {
                     String[] coordinate = coordinateMap.get(m.getZhPw());
                     if (coordinate != null) {
                         m.setSjx(coordinate[0]);
                         m.setSjy(coordinate[1]);
                         if (m.isEmptyDev()) {
-                            String dev = cur.getFormula().getDev();
-                            if (StringUtils.isEmpty(dev)) {
-                                dev = Mileage.DEV;
-                            }
-                            Map<String, Object> xyz = FormulaUtils.triangleSquare(dev);
+                            Map<String, Object> xyz = FormulaUtils.triangleSquare(finalDev);
                             m.setDx(xyz.get("X").toString());
                             m.setDy(xyz.get("Y").toString());
                             m.setDs(xyz.get("Z").toString());

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -152,14 +152,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         CurrentNode one=this.tec.getCurrentNode();
         tec.formDataList=list;
         keyWord(tec.constantMap);
-     /*   ContractInfo info =this.contractInfoService.getById(tec.getContractId());
-        ProjectInfo pji=this.projectInfoService.getById(tec.getProjectId());*/
+
         /*wbs节点链*/
         if(ExecuteType.INSPECTION.equals(tec.getExecuteType())) {
-          /*  List<WbsTreeContract> nodes = wpService.chain(tec.getContractId(), one.getId(), one.getPkId(), null);
-            if (Func.isEmpty(nodes)) {
-                nodes = wpService.chain(tec.getContractId(), one.getRelateId(), one.getPkId(), null);
-            }*/
+
             List<WbsTreeContract> nodes = wpService.tracing(one.getPkId());
             if (Func.isEmpty(nodes)) {
                 this.tec.getLog().append("【WBS信息缺失】");
@@ -171,7 +167,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             List<AppWbsTreeContractVO> tableList =wbsTreeContractService.searchNodeAllTable(one.getPkId().toString(), "1", tec.getContractId().toString(),tec.getProjectId().toString());
             tec.constantMap.put(TABLE_LIST,tableList);
             /*监表质量附件，过滤掉隐藏表格*/
-            tec.constantMap.put("tableNames",tableList.stream().filter(e->StringUtils.isEquals(e.getIsBussShow(),1)).map(WbsTreeContract::getNodeName).collect(Collectors.toList()));
+            tec.constantMap.put("tableNames",tableList.stream().filter(e->StringUtils.isEquals(e.getIsBussShow(),1)&&StringUtils.isNotEquals(e.getTableType(),4)).map(WbsTreeContract::getNodeName).collect(Collectors.toList()));
 /*
             tec.constantMap.put("tableNames",tableList.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList()));
 */