diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java new file mode 100644 index 0000000..0759bd3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 打印模板封装model + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 13:52 + * @Modify: + **/ +@Data +public class LabelTemplateModel { + + private SysLabelTemplate labelTemplate; + + private List templateParamList; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java new file mode 100644 index 0000000..8a8428d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LABELTEMPLATE") +@Api(value="打印模板",description = "打印模板") +public class SysLabelTemplate extends BaseBean { + + @Column(name="TEMPLATECODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATENAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Column(name="TEMPLATECONTENT", columnDefinition = "TEXT") + @ApiParam(value ="模板内容") + private String templateContent; + + // 参数拼接,多参数都好分隔,后台在做处理 + @ApiParam(value ="模板参数拼接") + @Transient + private String paramsPack; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java new file mode 100644 index 0000000..505b65d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LABELTEMPLATEPARAM") +@Api(value="打印模板参数",description = "打印模板参数") +public class SysLabelTemplateParam extends BaseBean { + + @Column(name="TEMPLATEID") + @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="TEMPLATECODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATEPARAM") + @ApiParam(value ="模板参数") + private String templateParam; + + @Column(name="TEMPLATEPARAMTEXT", columnDefinition = "TEXT") + @ApiParam(value ="模板参数描述") + private String templateParamText; + + // 参数拼接,多参数都好分隔,后台在做处理 + @ApiParam(value ="模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java new file mode 100644 index 0000000..901ea87 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @Date : 2019-03-18 12:03:01.024 + * @Modify : + **/ +public interface SysLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java new file mode 100644 index 0000000..77fc673 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @Date : 2019-03-18 12:03:01.024 + * @Modify : + **/ +public interface SysLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index dd792df..1cb1348 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -665,4 +665,40 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 打印模板复杂查询 + * @param sysLabelTemplate + * @return + */ + public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result); + HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result); + + // 添加默认排序 + HqlPack.getOrderDefault(sysLabelTemplate); + + return result.toString(); + } + + /** + * 打印模板参数复杂查询 + * @param sysLabelTemplateParam + * @return + */ + public static String packHqlSysLabelTemplateParams(SysLabelTemplateParam sysLabelTemplateParam) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getNumEqualPack(sysLabelTemplateParam.getTemplateId(), "templateId", result); + HqlPack.getStringEqualPack(sysLabelTemplateParam.getTemplateCode(), "templateCode", result); + + // 添加默认排序 + HqlPack.getOrderDefault(sysLabelTemplateParam); + + return result.toString(); + } } \ No newline at end of file