微服务接口 - 打印模板分页查询

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java

@@ -30,4 +30,6 @@ public class BaseConstWords {
     public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE";
     // 系统参数配置 PROPERTIES
     public static final String DICTIONARY_PROPERTIES ="PROPERTIES";
+    // 打印模板分组
+    public static final String DICTIONARY_LABEL_TEMPLATE_GROUP ="LABEL_TEMPLATE_GROUP";
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1161,7 +1161,7 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DICTIONARY_GROUP {
         SYSTEM(1, "系统字典"),
-        EXTERNAL(2, "外部人员");
+        EXTERNAL(2, "业务字典");
         private int value;
         private String description;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description : 打印模板封装model
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-10-09 14:15
+ * @Modify:
+ **/
+@Data
+public class LabelTemplatePagerModel implements Serializable {
+
+    private static final long serialVersionUID = 8331125246534692455L;
+
+    private SysLabelTemplate labelTemplate;
+
+    private Pager pager;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -7,9 +7,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
+import javax.persistence.Column;
-
+import javax.persistence.Entity;
-import javax.persistence.*;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -37,6 +39,16 @@ public class SysLabelTemplate extends BaseBean {
     @ApiParam(value ="模板名称")
     private String templateName;
 
+    //枚举 CommonEnumUtil.SOFT_TYPE
+    @Column(name="TEMPLATE_SOFT_TYPE")
+    @ApiParam(value ="模板所属模块")
+    private Integer templateSoftType;
+
+    //枚举 CommonEnumUtil.SOFT_TYPE
+    @Column(name="TEMPLATE_GROUP_ID")
+    @ApiParam(value ="模板分组")
+    private Integer templateGroupId;
+
     @Lob
     @Column(name="TEMPLATE_CONTENT")
     @ApiParam(value ="模板内容")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -4,11 +4,32 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule;
+import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
+import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
+import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
+import cn.estsh.i3plus.pojo.platform.bean.SysFile;
+import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
+import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
+import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
+import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
+import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
+import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
+import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysTask;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
+import cn.estsh.i3plus.pojo.platform.bean.SysTool;
+import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
+import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
 import org.apache.commons.lang3.StringUtils;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -849,17 +870,19 @@ public class CoreHqlPack {
      * @param sysLabelTemplate
      * @return
      */
-    public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
+    public static DdlPackBean packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean ddlPackBean = new DdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result);
+        DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean);
-        HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result);
+        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(sysLabelTemplate);
+        ddlPackBean.setOrderByStr(sysLabelTemplate.orderBy());
 
-        return result.toString();
+        return ddlPackBean;
     }
 
     public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {