1.全过程代码调整

2.主网测点在线率错误解决

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java

@@ -46,6 +46,12 @@ public class PmsTemProcessApproval {
     @TableField(exist = false)
     private String maintOrgName;
 
+    /**
+     * 所属地市名称
+     */
+    @TableField(exist = false)
+    private String cityOrgName;
+
     /**
      * 验收参与人
      */
@@ -121,4 +127,10 @@ public class PmsTemProcessApproval {
     @JSONField(serializeUsing = TimestampAsLongSerializer.class)
     private Timestamp updateTime;
 
+
+
+
+
+
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTestRun.java

@@ -48,6 +48,13 @@ public class PmsTemProcessTestRun {
     @TableField(exist = false)
     private String maintOrgName;
 
+    /**
+     * 所属地市名称
+     */
+    @TableField(exist = false)
+    private String cityOrgName;
+
+
     /**
      * 测试结论
      */

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java

@@ -265,4 +265,19 @@ public class PmsTemProcessTrackPO{
     private Timestamp updateTime;
 
 
+
+
+    /**
+     * 所属地市名称
+     */
+    @TableField(exist = false)
+    private String cityOrgName;
+
+
+    /**
+     * 运维单位名称
+     */
+    @TableField(exist = false)
+    private String maintOrgName;
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/DataChangeUtil.java

@@ -0,0 +1,46 @@
+package com.njcn.harmonic.utils;
+
+public class DataChangeUtil {
+
+    /**
+     * 用来将二次值转成一次值
+     */
+    public static double secondaryToPrimary(String formula, Double data,Double pt, Double ct) {
+        switch (formula) {
+
+            case "*PT":
+                data = data * pt;
+                break;
+            case "*CT":
+                data = data * ct;
+                break;
+            case "*PT*CT":
+                data = data * pt * ct;
+                break;
+            default:
+                break;
+        }
+        return data;
+    }
+
+    /**
+     * 用来将一次值转成二次值
+     */
+    public static double primaryToSecondary(String formula, Double data,Double pt, Double ct) {
+        switch (formula) {
+            case "*PT":
+                data = data / pt;
+                break;
+            case "*CT":
+                data = data / ct;
+                break;
+            case "*PT*CT":
+                data = data / pt / ct;
+                break;
+            default:
+                break;
+        }
+        return data;
+    }
+
+}