xignzi006 发布系统代码

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/domain/Mail_mail.java

@@ -313,13 +313,6 @@ public class Mail_mail extends EntityMP implements Serializable {
     @JSONField(name = "add_sign")
     @JsonProperty("add_sign")
     private Boolean addSign;
-    /**
-     * 布局
-     */
-    @TableField(exist = false)
-    @JSONField(name = "layout")
-    @JsonProperty("layout")
-    private String layout;
     /**
      * 上级消息
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/domain/Mail_message.java

@@ -49,13 +49,6 @@ public class Mail_message extends EntityMP implements Serializable {
     @JSONField(name = "needaction")
     @JsonProperty("needaction")
     private Boolean needaction;
-    /**
-     * 布局
-     */
-    @TableField(value = "layout")
-    @JSONField(name = "layout")
-    @JsonProperty("layout")
-    private String layout;
     /**
      * 相关的文档模型
      */
@@ -476,14 +469,6 @@ public class Mail_message extends EntityMP implements Serializable {
 
 
 
-    /**
-     * 设置 [布局]
-     */
-    public void setLayout(String layout){
-        this.layout = layout ;
-        this.modify("layout",layout);
-    }
-
     /**
      * 设置 [相关的文档模型]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/service/impl/Mail_mailServiceImpl.java

@@ -204,7 +204,6 @@ public class Mail_mailServiceImpl extends EBSServiceImpl<Mail_mailMapper, Mail_m
             et.setRecordName(odooMailMessage.getRecordName());
             et.setStarred(odooMailMessage.getStarred());
             et.setAddSign(odooMailMessage.getAddSign());
-            et.setLayout(odooMailMessage.getLayout());
             et.setParentId(odooMailMessage.getParentId());
             et.setRatingValue(odooMailMessage.getRatingValue());
             et.setWebsitePublished(odooMailMessage.getWebsitePublished());

businesscentral-core/src/main/resources/mapper/odoo_mail/mail_message/Mail_messageMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Mail_messageResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT t1.ADD_SIGN, t1.AUTHOR_ID, t11.NAME AS AUTHOR_ID_TEXT, t1.BODY, t1.CREATE_DATE, t1.CREATE_UID, t31.NAME AS CREATE_UID_TEXT, t1.DATE, t1.EMAIL_FROM, t1.ID, t1.LAYOUT, t1.MAIL_ACTIVITY_TYPE_ID, t41.NAME AS MAIL_ACTIVITY_TYPE_ID_TEXT, t1.MAIL_SERVER_ID, t1.MESSAGE_ID, t1.MESSAGE_TYPE, t1.MODEL, t1.MODERATION_STATUS, t1.MODERATOR_ID, t61.NAME AS MODERATOR_ID_TEXT, t1.NO_AUTO_THREAD, t1.PARENT_ID, t1.RECORD_NAME, t1.REPLY_TO, t1.RES_ID, t1.SUBJECT, t1.SUBTYPE_ID, t91.NAME AS SUBTYPE_ID_TEXT, t1.WEBSITE_PUBLISHED, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_MESSAGE t1  LEFT JOIN RES_PARTNER t11 ON t1.AUTHOR_ID = t11.ID  LEFT JOIN RES_USERS t21 ON t1.CREATE_UID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.MAIL_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.MODERATOR_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.WRITE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  LEFT JOIN MAIL_MESSAGE_SUBTYPE t91 ON t1.SUBTYPE_ID = t91.ID  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.ADD_SIGN, t1.AUTHOR_ID, t11.NAME AS AUTHOR_ID_TEXT, t1.BODY, t1.CREATE_DATE, t1.CREATE_UID, t31.NAME AS CREATE_UID_TEXT, t1.DATE, t1.EMAIL_FROM, t1.ID, t1.MAIL_ACTIVITY_TYPE_ID, t41.NAME AS MAIL_ACTIVITY_TYPE_ID_TEXT, t1.MAIL_SERVER_ID, t1.MESSAGE_ID, t1.MESSAGE_TYPE, t1.MODEL, t1.MODERATION_STATUS, t1.MODERATOR_ID, t61.NAME AS MODERATOR_ID_TEXT, t1.NO_AUTO_THREAD, t1.PARENT_ID, t1.RECORD_NAME, t1.REPLY_TO, t1.RES_ID, t1.SUBJECT, t1.SUBTYPE_ID, t91.NAME AS SUBTYPE_ID_TEXT, t1.WEBSITE_PUBLISHED, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_MESSAGE t1  LEFT JOIN RES_PARTNER t11 ON t1.AUTHOR_ID = t11.ID  LEFT JOIN RES_USERS t21 ON t1.CREATE_UID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.MAIL_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.MODERATOR_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.WRITE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  LEFT JOIN MAIL_MESSAGE_SUBTYPE t91 ON t1.SUBTYPE_ID = t91.ID  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -131,12 +131,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ADD_SIGN, t1.AUTHOR_ID, t11.NAME AS AUTHOR_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t31.NAME AS CREATE_UID_TEXT, t1.DATE, t1.EMAIL_FROM, t1.ID, t1.LAYOUT, t1.MAIL_ACTIVITY_TYPE_ID, t41.NAME AS MAIL_ACTIVITY_TYPE_ID_TEXT, t1.MAIL_SERVER_ID, t1.MESSAGE_ID, t1.MESSAGE_TYPE, t1.MODEL, t1.MODERATION_STATUS, t1.MODERATOR_ID, t61.NAME AS MODERATOR_ID_TEXT, t1.NO_AUTO_THREAD, t1.PARENT_ID, t1.RECORD_NAME, t1.REPLY_TO, t1.RES_ID, t1.SUBJECT, t1.SUBTYPE_ID, t91.NAME AS SUBTYPE_ID_TEXT, t1.WEBSITE_PUBLISHED, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_MESSAGE t1  LEFT JOIN RES_PARTNER t11 ON t1.AUTHOR_ID = t11.ID  LEFT JOIN RES_USERS t21 ON t1.CREATE_UID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.MAIL_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.MODERATOR_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.WRITE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  LEFT JOIN MAIL_MESSAGE_SUBTYPE t91 ON t1.SUBTYPE_ID = t91.ID  
+		<![CDATA[ SELECT t1.ADD_SIGN, t1.AUTHOR_ID, t11.NAME AS AUTHOR_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t31.NAME AS CREATE_UID_TEXT, t1.DATE, t1.EMAIL_FROM, t1.ID, t1.MAIL_ACTIVITY_TYPE_ID, t41.NAME AS MAIL_ACTIVITY_TYPE_ID_TEXT, t1.MAIL_SERVER_ID, t1.MESSAGE_ID, t1.MESSAGE_TYPE, t1.MODEL, t1.MODERATION_STATUS, t1.MODERATOR_ID, t61.NAME AS MODERATOR_ID_TEXT, t1.NO_AUTO_THREAD, t1.PARENT_ID, t1.RECORD_NAME, t1.REPLY_TO, t1.RES_ID, t1.SUBJECT, t1.SUBTYPE_ID, t91.NAME AS SUBTYPE_ID_TEXT, t1.WEBSITE_PUBLISHED, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_MESSAGE t1  LEFT JOIN RES_PARTNER t11 ON t1.AUTHOR_ID = t11.ID  LEFT JOIN RES_USERS t21 ON t1.CREATE_UID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.MAIL_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.MODERATOR_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.WRITE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  LEFT JOIN MAIL_MESSAGE_SUBTYPE t91 ON t1.SUBTYPE_ID = t91.ID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ADD_SIGN, t1.AUTHOR_ID, t11.NAME AS AUTHOR_ID_TEXT, t1.BODY, t1.CREATE_DATE, t1.CREATE_UID, t31.NAME AS CREATE_UID_TEXT, t1.DATE, t1.EMAIL_FROM, t1.ID, t1.LAYOUT, t1.MAIL_ACTIVITY_TYPE_ID, t41.NAME AS MAIL_ACTIVITY_TYPE_ID_TEXT, t1.MAIL_SERVER_ID, t1.MESSAGE_ID, t1.MESSAGE_TYPE, t1.MODEL, t1.MODERATION_STATUS, t1.MODERATOR_ID, t61.NAME AS MODERATOR_ID_TEXT, t1.NO_AUTO_THREAD, t1.PARENT_ID, t1.RECORD_NAME, t1.REPLY_TO, t1.RES_ID, t1.SUBJECT, t1.SUBTYPE_ID, t91.NAME AS SUBTYPE_ID_TEXT, t1.WEBSITE_PUBLISHED, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_MESSAGE t1  LEFT JOIN RES_PARTNER t11 ON t1.AUTHOR_ID = t11.ID  LEFT JOIN RES_USERS t21 ON t1.CREATE_UID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.MAIL_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.MODERATOR_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.WRITE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  LEFT JOIN MAIL_MESSAGE_SUBTYPE t91 ON t1.SUBTYPE_ID = t91.ID  
+		<![CDATA[ SELECT t1.ADD_SIGN, t1.AUTHOR_ID, t11.NAME AS AUTHOR_ID_TEXT, t1.BODY, t1.CREATE_DATE, t1.CREATE_UID, t31.NAME AS CREATE_UID_TEXT, t1.DATE, t1.EMAIL_FROM, t1.ID, t1.MAIL_ACTIVITY_TYPE_ID, t41.NAME AS MAIL_ACTIVITY_TYPE_ID_TEXT, t1.MAIL_SERVER_ID, t1.MESSAGE_ID, t1.MESSAGE_TYPE, t1.MODEL, t1.MODERATION_STATUS, t1.MODERATOR_ID, t61.NAME AS MODERATOR_ID_TEXT, t1.NO_AUTO_THREAD, t1.PARENT_ID, t1.RECORD_NAME, t1.REPLY_TO, t1.RES_ID, t1.SUBJECT, t1.SUBTYPE_ID, t91.NAME AS SUBTYPE_ID_TEXT, t1.WEBSITE_PUBLISHED, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_MESSAGE t1  LEFT JOIN RES_PARTNER t11 ON t1.AUTHOR_ID = t11.ID  LEFT JOIN RES_USERS t21 ON t1.CREATE_UID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.MAIL_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.MODERATOR_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.WRITE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  LEFT JOIN MAIL_MESSAGE_SUBTYPE t91 ON t1.SUBTYPE_ID = t91.ID  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json

@@ -80175,23 +80175,6 @@
     "major_field":0
     },
     {
-    "fieldname":"LAYOUT" ,
-    "codename":"Layout",
-    "field_logic_name":"布局",
-    "entity_name":"Mail_mail",
-    "ref_de":"MAIL_MESSAGE",
-    "ref_field_name":"LAYOUT",
-    "relation_name":"DER1N_MAIL_MAIL__MAIL_MESSAGE__MAIL_MESSAGE_ID",
-    "relation_codename":"Odoo_mail_message",
-    "field_type":"PICKUPDATA",
-    "nullable":1,
-    "physical_field":0,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":0,
-    "major_field":0
-    },
-    {
     "fieldname":"PARENT_ID" ,
     "codename":"Parent_id",
     "field_logic_name":"上级消息",
@@ -84320,19 +84303,6 @@
     "major_field":0
     },
     {
-    "fieldname":"LAYOUT" ,
-    "codename":"Layout",
-    "field_logic_name":"布局",
-    "entity_name":"Mail_message",
-    "field_type":"TEXT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":0,
-    "major_field":0
-    },
-    {
     "fieldname":"MODEL" ,
     "codename":"Model",
     "field_logic_name":"相关的文档模型",

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Mail_mailDTO.java

@@ -356,15 +356,6 @@ public class Mail_mailDTO extends DTOBase implements Serializable {
     @JsonProperty("add_sign")
     private Boolean addSign;
 
-    /**
-     * 属性 [LAYOUT]
-     *
-     */
-    @JSONField(name = "layout")
-    @JsonProperty("layout")
-    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
-    private String layout;
-
     /**
      * 属性 [PARENT_ID]
      *

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Mail_messageDTO.java

@@ -37,15 +37,6 @@ public class Mail_messageDTO extends DTOBase implements Serializable {
     @JsonProperty("needaction")
     private Boolean needaction;
 
-    /**
-     * 属性 [LAYOUT]
-     *
-     */
-    @JSONField(name = "layout")
-    @JsonProperty("layout")
-    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
-    private String layout;
-
     /**
      * 属性 [MODEL]
      *
@@ -470,14 +461,6 @@ public class Mail_messageDTO extends DTOBase implements Serializable {
     private Long subtypeId;
 
 
-    /**
-     * 设置 [LAYOUT]
-     */
-    public void setLayout(String  layout){
-        this.layout = layout ;
-        this.modify("layout",layout);
-    }
-
     /**
      * 设置 [MODEL]
      */