diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java index ab75d98..7f4d218 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java @@ -32,6 +32,10 @@ public class SysLocaleLanguage extends BaseBean { @ApiParam(value = "语言代码",example = "使用浏览器语言代码,参考java.util.Locale中的代码。CN/zh,TW/zh,HK/zh,US/en, FR/en,GB/en,JP/en,DE/en,KR/en") private String languageCode; + @Column(name="LANGUAGE_SORT") + @ApiParam(value ="排序" , example ="1") + private Integer languageSort; + @Column(name="IS_DEFAULT") @ApiParam(value = "是否默认",example = "2") private Integer isDefault; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java new file mode 100644 index 0000000..e90d14b --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -0,0 +1,71 @@ +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; + +/** + * @Description : 单号规则 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 15:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_NUMBER_RULE") +@Api(value="单号规则",description = "单号规则") +public class SysOrderNoRule extends BaseBean { + + @Column(name = "NAME") + @ApiParam(value = "规则名称") + private String name; + + @Column(name = "ORDER_NO_RULE_CODE") + @ApiParam(value = "规则代码") + private String orderNoRuleCode; + + + @Column(name = "numberRule") + @ApiParam(value = "单号规则") + private String orderNoRule; + + @Column(name = "SERIAL_NO_SEED") + @ApiParam(value = "流水号种子",example = "-1") + private Integer serialNoSeed; + + @Column(name = "ORDER_NO_INCREMENT") + @ApiParam(value = "流水号步长",example = "-1") + private Integer serialNoIncrement; + + @Column(name = "SERIAL_NO_LENGTH") + @ApiParam(value = "流水号长度",example = "-1") + private Integer serialNoLength; + + @Column(name = "IS_CYCLE") + @ApiParam(value = "达到最大值后是否循环",example = "1") + private Integer isCycle; + + @Column(name = "LAST_MAKE_SERIAL_NO") + @ApiParam(value = "上次新增流水号",example = "-1") + private Integer lastMakeSerialNo; + + @Column(name = "LAST_MAKE_ORDER_NO") + @ApiParam(value = "上次新增单号") + private String lastMakeOrderNo; + + @Column(name = "LAST_MAKE_DATE") + @ApiParam(value = "上次新增时间") + private String lastMakeDatetime; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java new file mode 100644 index 0000000..b5569fa --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.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.SysOrderNoRule; + +/** + * @Description : 单号规则 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 17:15 + * @Modify: + **/ +public interface SysOrderNoRuleRepository 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 cfb2876..5098128 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 @@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; -import java.util.Arrays; - /** * @Description : 平台对象封装 * @Reference : @@ -174,7 +172,7 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(config.getName(),"name",result); HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result); - HqlPack.getNumEqualPack(config.getConfigType(),"configTypeId",result); + HqlPack.getNumEqualPack(config.getConfigType(),"configType",result); return result.toString(); } @@ -385,4 +383,34 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 查询规则代码是否重复 + * @param sysOrderNoRule + * @return + */ + public static String packHqlSysOrderNoRuleCode(SysOrderNoRule sysOrderNoRule){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(sysOrderNoRule.getOrderNoRuleCode(),"dictionaryCode",result); + // not + HqlPack.getNumNOEqualPack(sysOrderNoRule.getId(),"id",result); + + return result.toString(); + } + + /** + * 单号规则复杂查询,分页,排序 + * @param sysOrderNoRule + * @return + */ + public static String packHqlSysOrderNoRule(SysOrderNoRule sysOrderNoRule){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(sysOrderNoRule.getName(),"name",result); + HqlPack.getStringLikerPack(sysOrderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + + return result.toString(); + } } \ No newline at end of file