From edf0b661156555e975e6d807c1562fe732fd60b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 18 Apr 2020 17:00:24 +0800 Subject: [PATCH] =?UTF-8?q?Sonar=E4=BB=A3=E7=A0=81=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8B=A6=E6=88=AA=E5=99=A8=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0=20=E8=A1=A8=E5=8D=95-?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9B=AE=E5=BD=95=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 18 +++-- .../cn/estsh/i3plus/pojo/form/bean/BfButton.java | 4 + .../cn/estsh/i3plus/pojo/form/bean/BfMenu.java | 9 +-- .../i3plus/pojo/form/bean/BfRefButtonMethod.java | 7 ++ .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 91 ++++++++++------------ .../pojo/model/form/FormOperateDataModel.java | 2 +- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 +- .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 3 + .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 32 +------- 9 files changed, 76 insertions(+), 96 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 7a4d706..00e30d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1158,7 +1158,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleAdd(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1175,7 +1175,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleLess(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1192,7 +1192,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleMake(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1209,7 +1209,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleDivision(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1235,7 +1235,8 @@ public class BlockFormEnumUtil { SQL(10, "SQL", "SQL脚本"), CLASS_METHOD(20, "ClassMethod", "类方法"), SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"), - SCRIPT(40, "Script", "脚本"); + SCRIPT(40, "Script", "脚本"), + URL(50, "URL", "网址"); private int value; private String code; @@ -1668,7 +1669,8 @@ public class BlockFormEnumUtil { DIALOG(10, "DIALOG", "弹出窗口"), NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"), SQL(30, "SQL", "执行SQL"), - CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"); + CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"), + URL(50, "URL", "网址"); private int value; private String name; @@ -1928,8 +1930,8 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ELEMENT_TREE_DIRECTION { - horizontal(1, "horizontal", "横向"), - vertical(2, "vertical", "竖向"); + HORIZONTAL(1, "horizontal", "横向"), + VERTICAL(2, "vertical", "竖向"); private int value; private String code; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 8dc3a8f..04ac36a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -46,6 +46,10 @@ public class BfButton extends BaseBean { } } + @Column(name = "IS_REQUIRED_DATA") + @ApiParam(value = "是必填数据") + private Integer isRequiredData; + // 关联表单功能表id @Column(name = "METHOD_ID") @ApiParam(value = "表单功能id") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 115b32d..2275dd3 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -10,7 +10,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; @@ -89,6 +88,10 @@ public class BfMenu extends BaseBean { @ApiParam(value ="功能名称") private String methodNameRdd; + @Column(name="SOFT_TYPE") + @ApiParam(value ="所属模块") + private Integer softType; + @Column(name = "MENU_STATUS") @ApiParam(value = "菜单状态") private Integer menuStatus; @@ -96,8 +99,4 @@ public class BfMenu extends BaseBean { @Transient @ApiParam(value = "菜单子集") private List bfMenuList; - - @Transient - @ApiParam(value = "菜单父级") - private List parentBfMenuList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index 14eefa8..0ca9523 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :按钮功能关系 @@ -61,4 +62,10 @@ public class BfRefButtonMethod extends BaseBean { @ApiParam(value ="按钮位置关联名称") private String buttonPositionRefNameRdd; + /** + * 关联按钮 + */ + @Transient + private BfButton bfbutton; + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 2ec710e..7ade95c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -39,12 +39,12 @@ public final class FormHqlPack { * @param params 参数 * @return hql */ - public static String packHqlIds(String columnName, Long[] params) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlIds(String columnName, Long[] params) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(StringUtils.join(params, ","), columnName, result); - return result.toString(); + DdlPreparedPack.getInPack(StringUtils.join(params, ","), columnName, result); + return result; } /** @@ -69,11 +69,11 @@ public final class FormHqlPack { * @param isDeleted 数据状态 * @return hql */ - public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) { - StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + public static DdlPackBean packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) { + DdlPackBean result = FormHqlPack.packHqlIds(columnName, params); - HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); - return result.toString(); + DdlPreparedPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result; } /** @@ -81,13 +81,13 @@ public final class FormHqlPack { * @param bfLayout 表单布局 * @return hql */ - public static String packHqlBfLayout(BfLayout bfLayout) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfLayout(BfLayout bfLayout) { + DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayout); - HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result); - HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result); + DdlPreparedPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result); + DdlPreparedPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result); - return result.toString(); + return result; } /** @@ -95,14 +95,13 @@ public final class FormHqlPack { * @param bfLayoutRow 表单布局 * @return hql */ - public static String packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) { + DdlPackBean result =DdlPackBean.getDdlPackBean(bfLayoutRow); - HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result); - HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result); + DdlPreparedPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result); - result.append(bfLayoutRow.orderBy()); - return result.toString(); + return result; } /** @@ -110,14 +109,13 @@ public final class FormHqlPack { * @param bfLayoutColumn 表单布局行 * @return hql */ - public static String packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) { + DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayoutColumn); - HqlPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result); - HqlPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result); + DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result); - result.append(bfLayoutColumn.orderBy()); - return result.toString(); + return result; } /** @@ -126,13 +124,13 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(bfMenu); DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result); DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result); DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result); DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result); - result.setOrderByStr(bfMenu.orderBy()); + DdlPreparedPack.getNumEqualPack(bfMenu.getSoftType(), "softType", result); return result; } @@ -143,12 +141,11 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(bfMethod); DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result); DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result); DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result); - result.setOrderByStr(bfMethod.orderBy()); return result; } @@ -159,12 +156,11 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetail); DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean); - ddlPackBean.setOrderByStr(bfMethodDetail.orderBy()); return ddlPackBean; } @@ -175,14 +171,13 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfIntercept); DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); - ddlPackBean.setOrderByStr(bfIntercept.orderBy()); return ddlPackBean; } @@ -193,7 +188,7 @@ public final class FormHqlPack { * @return 查询条件 */ public static DdlPackBean packHqlBfButton(BfButton bfButton){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfButton); DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean); @@ -209,7 +204,7 @@ public final class FormHqlPack { * @return 查询条件 */ public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); @@ -223,14 +218,13 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefButtonMethod); DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean); - ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy()); return ddlPackBean; } @@ -241,11 +235,10 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefMethodRole); DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean); - ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy()); return ddlPackBean; } @@ -256,7 +249,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean); @@ -275,7 +268,7 @@ public final class FormHqlPack { * @return */ public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); @@ -290,7 +283,7 @@ public final class FormHqlPack { * @return */ public static DdlPackBean findBfMenuByMethodIdsAndStatus(Long[] methodIds, int status) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackArray(methodIds, "methodId", ddlPackBean); DdlPreparedPack.getNumEqualPack(status, "menuStatus", ddlPackBean); @@ -305,7 +298,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfElement(BfElement bfElement){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean); @@ -322,7 +315,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfDataSource(BfDataSource source){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(source); DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean); DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean); @@ -341,7 +334,7 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMenuTree(BfMenu bfMenu) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(bfMenu); DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result); DdlPreparedPack.getNumEqualPack( @@ -363,7 +356,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint); DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean); @@ -378,7 +371,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint); DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean); @@ -393,7 +386,7 @@ public final class FormHqlPack { * @return */ public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfDataObject); DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean); @@ -408,7 +401,7 @@ public final class FormHqlPack { * @return */ public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade); DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java index 0c80d9f..3eb5e7a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java @@ -36,6 +36,6 @@ public class FormOperateDataModel { private String sourceName; @ApiModelProperty("操作数据集合") - private List> operateDataList; + private List> operateDataList; } 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 cc0e5e9..9ac4829 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 @@ -339,6 +339,7 @@ public class CoreHqlPack { } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result); + DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryValue(), "dictionaryValue", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 添加默认排序 @@ -754,7 +755,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); if (orderNoRule.getSerialNo() != null) { - DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); + DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); } // 添加默认排序 @@ -995,10 +996,11 @@ public class CoreHqlPack { DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); - DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean); DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(),"dictionaryValue",packBean); return packBean; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 81d0ea8..bc9e7b0 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -49,6 +51,7 @@ public class BsSuitRecord extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; @Column(name = "SUIT_CASE_DETAIL_ID") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index d5ce994..cf43265 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -345,6 +345,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true); @@ -389,17 +390,6 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCode",ddlPackBean); - DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); - - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); - - return ddlPackBean; - } - public static DdlPackBean packHqlSuitDataDetailBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); @@ -411,26 +401,6 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getInPackArray(suitRecordIds,"id",ddlPackBean); - DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); - - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); - - return ddlPackBean; - } - public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getInPackArray(suitRecordIds,"suitRecordId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); - - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); - - return ddlPackBean; - } public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();