Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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();

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;

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;
+
+}

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.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 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);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
-        return hqlStr.toString();
+        return hqlStr;
     }
 
-    public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
+    public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
-        HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
+        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
         return buildHql(purchaseOrder, result);
     }
 
-    public static String getPackAgeWhereHql(SwebPackage swebPackage) {
+    public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
-        HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
+        DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
-        HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
+        DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
         return buildHql(swebPackage, result);
     }
 
-    public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
+    public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(swebProcurementPlanOrder.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) {
+    public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
         return buildHql(swebProcurementPlanOrderDetails, result);
     }
 
-    public static String getVendorRelWhereHql(SwebVendorRel vendorRel) {
+    public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
-        HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
+        DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
         return buildHql(vendorRel, result);
     }