I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sonar代码缺陷修复

Browse Source 
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
yun-zuoyi
汪云昊 5 years ago
parent baaf16ad56
commit edf0b66115
9 changed files with 76 additions and 96 deletions
Show Stats Download Patch File Download Diff File

18
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
Unescape Escape View File

@ -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;

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
Unescape Escape View File

@ -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")

9
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
Unescape Escape View File

@ -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<BfMenu> bfMenuList;
@Transient
@ApiParam(value = "菜单父级")
private List<BfMenu> parentBfMenuList;
}

7
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
Unescape Escape View File

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

91
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

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

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java
Unescape Escape View File

@ -36,6 +36,6 @@ public class FormOperateDataModel {
private String sourceName;
@ApiModelProperty("操作数据集合")
private List<Map<String,String>> operateDataList;
private List<Map<String,Object>> operateDataList;
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

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

3
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
Unescape Escape View File

@ -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")

32
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save