From 4de301bf79db302a342e2022b7e2698fc51334b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Mon, 15 Jun 2020 17:06:49 +0800
Subject: [PATCH] =?UTF-8?q?MDM=20=E7=B3=BB=E7=BB=9F=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java     |  2 +-
 .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java |  4 ++++
 .../cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java     | 12 +++++++++---
 .../i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java      | 12 ++++++------
 .../i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java     | 10 +++++-----
 .../cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java     | 12 ++++++++++++
 .../i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java |  4 ++--
 .../cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java     | 13 ++++++++++++-
 .../i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java    |  2 +-
 .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java  |  1 +
 10 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
index e8c5618..84e7427 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
@@ -123,7 +123,7 @@ public class MdmEnumUtil {
     public enum MDM_SYNC_TYPE{
         INSERT(1,  "新增"),
         UPDATE(2,  "修改"),
-        DELETE(2,  "删除");
+        DELETE(3,  "删除");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
index 29d0044..7417439 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
@@ -76,6 +76,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否编辑")
     private Integer isObjectEdit;
 
+    @Column(name = "IS_READ_ONLY_SHOW")
+    @ApiParam(value = "是否只读显示")
+    private Integer isReadOnlyShow;
+
     @Column(name = "IS_OBJECT_DEL")
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
index 859a6b3..3fef7c4 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
@@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean {
 
     @Transient
     @ApiModelProperty("是否主数据")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
 
     @Column(name = "MDM_VERSION")
     @ApiModelProperty("mdm数据版本")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long mdmVersion;
 
     public long getMdmVersionVal() {
@@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean {
 
     @Column(name = "IS_MDM_PUBLISHED")
     @ApiModelProperty("是否发布")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     private Integer isMdmPublished;
 
     @Column(name = "MDM_OPERATE_TYPE")
     @ApiModelProperty("操作类型")
-    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
+    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
     private Integer mdmOperateType;
 
     public Integer getMdmOperateTypeVal() {
         return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
     }
 
+    public String getMdmOperateTypeTxt(){
+        return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal());
+    }
+
     @Column(name = "MDM_REF_ID")
     @ApiModelProperty("关联id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long mdmRefId;
 
     //排序方式
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
index 96d8c16..ef84a68 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
@@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
 
     @Transient
     @ApiModelProperty("是否主数据")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster  = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
     @Transient
     @ApiModelProperty("主数据Class")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
-    public static Class<BaseMdmBean> mdmMasterClass  = BaseMdmBean.class;
+    @AnnoOutputColumn(hidden = true)
+    protected static Class<BaseMdmBean> mdmMasterClass  = BaseMdmBean.class;
 
     @Transient
     @ApiModelProperty("软件模块")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
-    public static Integer mdmSoftType;
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
+    protected static Integer mdmSoftType;
 
     @Column(name = "MDM_MASTER_ID")
     @ApiModelProperty("主数据id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long mdmMasterId;
+    public Long mdmMasterId;
 
 }
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
index 3aafc4b..1fe17c1 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
@@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
  **/
 public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
 
+    public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
+        this.mdmMasterBean = mdmMasterBean;
+        this.mdmBusiBean = mdmBusiBean;
+    }
+
     @ApiModelProperty("主数据")
     private M mdmMasterBean;
 
@@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends Base
     public BaseMdmBusiModelBean() {
     }
 
-    public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
-        this.mdmMasterBean = mdmMasterBean;
-        this.mdmBusiBean = mdmBusiBean;
-    }
-
     /**
      * 获取主数据m
      *
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
index 95fd969..43c2037 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
@@ -31,10 +31,18 @@ public class MdmSyncData implements Serializable {
         return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
     }
 
+    public String getSyncTypeTxt(){
+        return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
+    }
+
     @ApiModelProperty("同步模块")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
     private Integer syncSoftType;
 
+    public String getSyncSoftTypeTxt(){
+        return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType);
+    }
+
     @ApiModelProperty("是否是主数据")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isMasterData;
@@ -43,6 +51,10 @@ public class MdmSyncData implements Serializable {
         return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
     }
 
+    public String getIsMasterDataTxt(){
+        return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
+    }
+
     @ApiModelProperty("同步数据class")
     private String syncDataClass;
 
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java
index 4e3f336..7c498ef 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java
@@ -36,12 +36,12 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
 
     @Transient
     @ApiModelProperty("主数据Class")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(hidden = true)
     public static Class mdmMasterClass  = MdmGear.class;
 
     @Transient
     @ApiModelProperty("软件模块")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
     public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
 
     @Column(name = "CORE_NUM")
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
index 57d3e64..6e7cc79 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
 import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
 
 import java.util.List;
@@ -43,7 +44,17 @@ public class MdmHqlPack {
 
         DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
-        DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
+        DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlMdmGearCoreExtd(MdmGearCoreBusiExtd mdmGear) {
+        DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
+
+        DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(mdmGear.getMdmMasterId(),"mdmMasterId",ddlPackBean);
+        DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
 
         return ddlPackBean;
     }
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java
index b372b7b..a5db9fa 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java
@@ -527,7 +527,7 @@ public class DdlMdmModelPreparedPack {
     public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
         if (data != null) {
             packBean.addColumnQuery(entityType, "in_"+columnName,
-                    " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
+                    " and " + entityType.getAlias() + "." + columnName + " in ( :" + entityType.getAlias() + "_in_" + columnName + " ) ", data);
         }
     }
 
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 499d89b..43a6f9d 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
@@ -1051,6 +1051,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean);
         DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean);
+        DdlPreparedPack.timeBuilder(bean.getModifyDatetime(),"modifyDatetime",packBean,false,true);
 
         return packBean;
     }