From 61cfb47e5d332f07fc660c3e21e374ef5038803c Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 09:18:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 8 ++++---- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 6e62522..f65e744 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -67,13 +67,13 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") - public String zDate; + public String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") - public String zTime; + public String planTime; @Column(name = "ERP_WH_NO") @ApiParam("默认收货库存地") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ef9999f..6b0c494 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -58,8 +58,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); From a495ea2fceba5e32e18d0d0d837de9e11b89b68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 18 Mar 2019 09:34:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 80aec01..1d4c7f5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1353,7 +1353,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_STATUS { CREATE(10, "新建"), - FINISH(20, "待处理"), + FINISH(20, "处理中"), FAIL(30, "已完成"), CLOSE(40, "已关闭"), CANCEL(50, "已取消"); From 11bbe2a57d084c1fc361f10f6169eec45b8022d1 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 13:13:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index ce8cd86..1730e20 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -69,6 +69,12 @@ public class WmsActionResponseBean { public Boolean isBtnDisabled = true; /** + * 默认为true，如果这个值为true就禁用按钮否则可用， + */ + @ApiParam(value = "按钮是否禁用") + public Boolean isDetailsBtnDisabled = true; + + /** * 与 toSelected 属性配合使用， * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 */ From 630c6e8f66cba493dade236bdafad6ab2870c8c5 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Mon, 18 Mar 2019 15:52:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E3=80=81?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsTaskCreateLog.java | 86 ++++++++++++++++++++++ .../wms/repository/WmsTaskCreateLogRepository.java | 14 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 33 +++++++++ 3 files changed, 133 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java new file mode 100644 index 0000000..695e9ad --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.wms.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 org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description : 作业任务生成日志 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-03-18 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TASK_CREATE_LOG") +@Api("作业任务生成日志表") +public class WmsTaskCreateLog extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务单号") + public String taskNo; + + @Column(name = "DATA_SRC") + @ApiParam("数据来源") + public String dataSrc; + + @Column(name = "OP_TYPE_CODE") + @ApiParam("作业类型") + public String opTypeCode; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("错误信息") + public String errorMessage; + + @Column(name = "TRANS_STATUS") + @ApiParam("处理状态") + public Integer transStatus; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单号") + private String refSrc; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + public String callClass; + + @Column(name = "CALL_FUN") + @ApiParam("实现类") + public String callFun; + + @Column(name = "START_TIME") + @ApiParam("开始执行时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + public Date startTime; + + @Column(name = "END_TIME") + @ApiParam("结束执行时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + public Date endTime; + + @Column(name = "IN_PARAMS") + @ApiParam(value = "输入参数") + private String inParams; + + @Column(name = "OUT_PARAMS") + @ApiParam(value = "输出参数") + private String outParams; + + @Column(name = "OUT_RESULT") + @ApiParam(value = "执行结果") + private String outResult; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java new file mode 100644 index 0000000..aff25b2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskCreateLog; + +/** + * @Description : 作业任务生成日志 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-03-18 15:58 + * @Modify: + **/ +public interface WmsTaskCreateLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 72983b8..c725160 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1434,4 +1434,37 @@ public class WmsHqlPack { getStringBuilderPack(taskDetails, result); return result.toString(); } + + /** + * 根据条件查询任务生成日志 + * @param wmsTaskCreateLog + * @return + */ + public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result); + HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result); + getStringBuilderPack(wmsTaskCreateLog, result); + return result.toString(); + } + + /** + * 根据条件查询作业处理组件 + * @param wmsTransModule + * @return + */ + public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { + StringBuffer result = new StringBuffer(); + if(!Strings.isNullOrEmpty(wmsTransModule.getTmName())){ + HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + } + if(!Strings.isNullOrEmpty(wmsTransModule.getCallClass())){ + HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + } + if(!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())){ + HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + } + getStringBuilderPack(wmsTransModule, result); + return result.toString(); + } } From 05efe333ccd878d7b053b2d101bcf93151183a53 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 16:23:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/LabelTemplateModel.java | 22 +++++++++ .../pojo/platform/bean/SysLabelTemplate.java | 48 +++++++++++++++++++ .../pojo/platform/bean/SysLabelTemplateParam.java | 55 ++++++++++++++++++++++ .../SysLabelTemplateParamRepository.java | 14 ++++++ .../repository/SysLabelTemplateRepository.java | 14 ++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 36 ++++++++++++++ 6 files changed, 189 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java 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