快照中列表的渲染

gjjs-bd-business/src/test/java/com/brilliance/test/Test.java

 package com.brilliance.test;
 
-import com.brilliance.mda.runtime.mda.snapshot.SnapshotServiceImpl;
-
 import java.util.HashSet;
 
 public class Test {
@@ -16,11 +14,5 @@ public class Test {
         System.out.println(set);
     }
 
-    @org.junit.jupiter.api.Test
-    public void getTemplateContent() {
-        SnapshotServiceImpl snapshotServiceImpl = new SnapshotServiceImpl();
-        String templateContent = snapshotServiceImpl.getTemplateContent("litp.nlitp");
-        System.out.println(templateContent);
-    }
 
 }

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/driver/MdaContext.java

@@ -259,7 +259,7 @@ public class MdaContext implements IContext {
         IModule parent = panel.getParent();
         String panelPath = panel.getPath();
         // 获取模板内容
-        String templateContent = snapshotService.getTemplateContent(panelPath);
+        String templateContent = snapshotService.getTemplateContent(panelPath,parent);
         // 获取填充值的key
         Set<ValueVo> keySet = snapshotService.getKeySet();
         // 获取填充的值

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

@@ -18,9 +18,10 @@ public interface SnapshotService {
      * 获取模板内容
      *
      * @param panelPath
+     * @param parent
      * @return
      */
-    String getTemplateContent(String panelPath);
+    String getTemplateContent(String panelPath, IModule parent);
 
     /**
      * 获取快照模板中所需的值
@@ -43,9 +44,10 @@ public interface SnapshotService {
      * 组装成xml需要的实体
      *
      * @param documentBo
+     * @param parent
      * @return
      */
-    PackDocumentBo packTemplate(DocumentBo documentBo);
+    PackDocumentBo packTemplate(DocumentBo documentBo, IModule parent);
 
     /**
      * 获取需要填充值的实体

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

@@ -3,6 +3,7 @@ package com.brilliance.mda.runtime.mda.snapshot.bo.pack;
 import lombok.Data;
 
 import javax.xml.bind.annotation.*;
+import java.util.List;
 
 /**
  * @Description
@@ -23,5 +24,5 @@ public class PackListboxBo {
     private PackListheadBo packListheadBo;
 
     @XmlElement(name = "listitem")
-    private PackListitemBo packListitemBo;
+    private List<PackListitemBo> packListitemBo;
 }

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/util/DateUtil.java → gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/util/DateUtils.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * @Author s_guodong
  * @Date 2023/8/21
  */
-public class DateUtil {
+public class DateUtils {
 
     public static String format(Date date, String pattern) {
         DateFormat dateFormat = new SimpleDateFormat(pattern);