快照优化

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/snapshot/SnapshotServiceImpl.java

@@ -312,7 +312,7 @@ public class SnapshotServiceImpl implements SnapshotService {
 
             PackComboboxBo data = new PackComboboxBo();
             if (StringUtils.isNotBlank(text)) {
-                keySet.add(new ValueVo(text, null, attributeValue.getCodeTable()));
+                keySet.add(new ValueVo(text, null, attributeValue.getCodeTable(), attributeValue.getFormatter()));
                 data.setText("${" + text + "}");
             } else {
                 data.setText("");
@@ -340,7 +340,7 @@ public class SnapshotServiceImpl implements SnapshotService {
             String text = getAttributeValue(customAttributes).getFieldUrl();
             PackDateboxBo data = new PackDateboxBo();
             if (StringUtils.isNotBlank(text)) {
-                keySet.add(new ValueVo(text, textboxBo.getFormat(), null));
+                keySet.add(new ValueVo(text, textboxBo.getFormat(), null, null));
                 data.setText("${" + text + "}");
             } else {
                 data.setText("");
@@ -412,7 +412,7 @@ public class SnapshotServiceImpl implements SnapshotService {
 
             if (StringUtils.isNotBlank(fieldUrl)) {
                 data.setChecked("${" + fieldUrl + "}");
-                keySet.add(new ValueVo(fieldUrl, "X", null));
+                keySet.add(new ValueVo(fieldUrl, "X", null, null));
             } else {
                 data.setChecked("");
             }
@@ -477,7 +477,7 @@ public class SnapshotServiceImpl implements SnapshotService {
                 for (CustomAttributes customAttributes : customAttributesList) {
                     Object value = map.get(customAttributes.getColumnName());
                     // 格式转换
-                    value = formatValue(value, new ValueVo(null, customAttributes.getFormatter(), customAttributes.getCodeTable()));
+                    value = formatValue(value, new ValueVo(null, customAttributes.getFormatter(), customAttributes.getCodeTable(), customAttributes.getFormatter()));
                     PackListcellBo listCellData = new PackListcellBo();
                     listCellData.setLabel(value == null ? "" : String.valueOf(value));
                     listCellData.setStyle(customAttributes.getColumnStyle());
@@ -660,8 +660,9 @@ public class SnapshotServiceImpl implements SnapshotService {
         if (value != null) {
             String format = valueVo.getFormat();
             String codeTable = valueVo.getCodeTable();
+            String formatter = valueVo.getFormatter();
             // 从码表中转换
-            if (StringUtils.isNotBlank(codeTable)) {
+            if (StringUtils.isNotBlank(codeTable) && "{0}".equals(formatter)) {
                 value = MdaUtils.getCodetableLabel(codeTable, (String) value);
             }
             if (StringUtils.isNotBlank(format)) {

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/snapshot/bo/ValueVo.java

@@ -12,15 +12,17 @@ public class ValueVo {
     private String key;
     private String format;
     private String codeTable;
+    private String formatter;
 
     public ValueVo(String key) {
         this.key = key;
     }
 
-    public ValueVo(String key, String format, String codeTable) {
+    public ValueVo(String key, String format, String codeTable, String formatter) {
         this.key = key;
         this.format = format;
         this.codeTable = codeTable;
+        this.formatter = formatter;
     }