From ccce8c009c45f87ea4190972b6685e102bdb6355 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 3 Apr 2019 11:05:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 2 +- .../pojo/form/bean/BfDataObjectProperty.java | 14 ++++++++++++ .../i3plus/pojo/model/form/ElementFormModel.java | 26 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 0231497..ac21b0b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -176,7 +176,7 @@ public class DynamicEntity extends BaseBean implements Serializable { try { setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()}); - System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); +// System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); setMethod.invoke(this, fieldVal); } catch (ClassCastException e) { e.printStackTrace(); diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index fbedb77..9cb8bbc 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -52,6 +52,20 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="数据对象类型") private Integer objectColumnType; + // 字段长度 + @ApiParam(value = "字段长度") + @Column(name="OBJECT_COLUMN_PRECISION") + private Integer objectColumnPrecision; + + // 字段精确长度 + @ApiParam(value = "字段精确长度") + @Column(name="OBJECT_COLUMN_SCALE") + private Integer objectColumnScale; + + @Column(name="OBJECT_COLUMN_TYPE_NAME") + @ApiParam(value ="数据对象类型名称") + private String objectColumnTypeName; + @Column(name="PROPERTY_NAME") @ApiParam(value ="类属性名称") private String propertyName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java new file mode 100644 index 0000000..d39de03 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.form; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 数据操作Model + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-04-02 13:34 + * @Modify: + **/ +@Data +public class ElementFormModel { + + //外键关联数据对象主键 + @ApiParam(value = "元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @ApiParam(value = "操作参数") + private String entity; + +} From 9ca521f64a65b3e9c86a291b67ad776fcb622ed4 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Wed, 3 Apr 2019 11:53:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?hqlpack=20=3D=E3=80=8B=20ddlpack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 72 +++++++++++++--------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 23cb872..6f9eb24 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -1,10 +1,11 @@ package cn.estsh.i3plus.pojo.sweb.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.tool.SqlPack; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.sweb.bean.*; +import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; /** @@ -23,57 +24,70 @@ public class SwebHqlPack { * @param hqlStr * @return */ - private static String buildHql(BaseBean bean, StringBuffer hqlStr) { + private static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } // 封装有效状态和删除状态 Integer isValid = bean.getIsValid(); //默认查有效数据 if (isValid != null && isValid != 0) { - SqlPack.getNumEqualPack(isValid, "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(isValid, "isValid", hqlStr); } else { - SqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", hqlStr); } - SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - return hqlStr.toString(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + return hqlStr; } - public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); + public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); return buildHql(purchaseOrder, result); } - public static String getPackAgeWhereHql(SwebPackage swebPackage) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); - HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); - HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); + public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); return buildHql(swebPackage, result); } - public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); - HqlPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); + public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); + DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); + DdlPreparedPack.timeBuilder(model.getRecTimeStart(), model.getRecTimeEnd(), "recTime", result, false); + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return buildHql(model, result); + } + + public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); return buildHql(swebProcurementPlanOrder, result); } - public static String getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); + public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); return buildHql(swebProcurementPlanOrderDetails, result); } - public static String getVendorRelWhereHql(SwebVendorRel vendorRel) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); - HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); + public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); return buildHql(vendorRel, result); }