1.打印配置增加打印顺序比录校验

2.增加查询单据范围
3.修改交票、收票状态校验逻辑

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/common/entity/MergePrintEntity.java

@@ -0,0 +1,71 @@
+package nckd.jimin.jyyy.fi.common.entity;
+
+import java.util.List;
+
+public class MergePrintEntity {
+
+    /**
+     * 单据类型
+     */
+    private String formId;
+
+    /**
+     * 打印模板ID
+     */
+    private String templateId;
+
+    /**
+     * 打印单据ID
+     */
+    private List<Object> pkIds;
+
+    /**
+     * 打印顺序
+     */
+    private int index;
+
+    public MergePrintEntity(String formId, String templateId, List<Object> pkIds) {
+        this.formId = formId;
+        this.templateId = templateId;
+        this.pkIds = pkIds;
+    }
+
+    public MergePrintEntity(String formId, String templateId, List<Object> pkIds, int index) {
+        this.formId = formId;
+        this.templateId = templateId;
+        this.pkIds = pkIds;
+        this.index = index;
+    }
+
+    public String getFormId() {
+        return formId;
+    }
+
+    public void setFormId(String formId) {
+        this.formId = formId;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public List<Object> getPkIds() {
+        return pkIds;
+    }
+
+    public void setPkIds(List<Object> pkIds) {
+        this.pkIds = pkIds;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+}