xignzi006 发布系统代码

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

@@ -150,13 +150,6 @@ public class Mail_activity extends EntityMP implements Serializable {
     @JSONField(name = "note")
     @JsonProperty("note")
     private String note;
-    /**
-     * 反馈
-     */
-    @TableField(value = "feedback")
-    @JSONField(name = "feedback")
-    @JsonProperty("feedback")
-    private String feedback;
     /**
      * 文档模型
      */
@@ -446,14 +439,6 @@ public class Mail_activity extends EntityMP implements Serializable {
         this.modify("note",note);
     }
 
-    /**
-     * 设置 [反馈]
-     */
-    public void setFeedback(String feedback){
-        this.feedback = feedback ;
-        this.modify("feedback",feedback);
-    }
-
     /**
      * 设置 [文档模型]
      */

businesscentral-core/src/main/resources/mapper/odoo_mail/mail_activity/Mail_activityMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Mail_activityResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT t31.CATEGORY AS ACTIVITY_CATEGORY, t31.DECORATION_TYPE AS ACTIVITY_DECORATION, t1.ACTIVITY_TYPE_ID, t31.NAME AS ACTIVITY_TYPE_ID_TEXT, t1.AUTOMATED, t1.CALENDAR_EVENT_ID, t111.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t1.DATE_DEADLINE, t1.FEEDBACK, t31.FORCE_NEXT, t31.ICON, t1.ID, t1.NOTE, t1.NOTE_ID, t51.NAME AS NOTE_ID_TEXT, t1.PREVIOUS_ACTIVITY_TYPE_ID, t41.NAME AS PREVIOUS_ACTIVITY_TYPE_ID_TEXT, t1.RECOMMENDED_ACTIVITY_TYPE_ID, t101.NAME AS RECOMMENDED_ACTIVITY_TYPE_ID_TEXT, t1.RES_ID, t1.RES_MODEL, t1.RES_MODEL_ID, t1.RES_NAME, t1.SUMMARY, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t91.NAME AS WRITE_UID_TEXT FROM MAIL_ACTIVITY t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t31 ON t1.ACTIVITY_TYPE_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.PREVIOUS_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN NOTE_NOTE t51 ON t1.NOTE_ID = t51.ID  LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID  LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID  LEFT JOIN RES_USERS t81 ON t1.WRITE_UID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t101 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t101.ID  LEFT JOIN CALENDAR_EVENT t111 ON t1.CALENDAR_EVENT_ID = t111.ID  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t31.CATEGORY AS ACTIVITY_CATEGORY, t31.DECORATION_TYPE AS ACTIVITY_DECORATION, t1.ACTIVITY_TYPE_ID, t31.NAME AS ACTIVITY_TYPE_ID_TEXT, t1.AUTOMATED, t1.CALENDAR_EVENT_ID, t111.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t1.DATE_DEADLINE, t31.FORCE_NEXT, t31.ICON, t1.ID, t1.NOTE, t1.NOTE_ID, t51.NAME AS NOTE_ID_TEXT, t1.PREVIOUS_ACTIVITY_TYPE_ID, t41.NAME AS PREVIOUS_ACTIVITY_TYPE_ID_TEXT, t1.RECOMMENDED_ACTIVITY_TYPE_ID, t101.NAME AS RECOMMENDED_ACTIVITY_TYPE_ID_TEXT, t1.RES_ID, t1.RES_MODEL, t1.RES_MODEL_ID, t1.RES_NAME, t1.SUMMARY, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t91.NAME AS WRITE_UID_TEXT FROM MAIL_ACTIVITY t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t31 ON t1.ACTIVITY_TYPE_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.PREVIOUS_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN NOTE_NOTE t51 ON t1.NOTE_ID = t51.ID  LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID  LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID  LEFT JOIN RES_USERS t81 ON t1.WRITE_UID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t101 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t101.ID  LEFT JOIN CALENDAR_EVENT t111 ON t1.CALENDAR_EVENT_ID = t111.ID  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -129,12 +129,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t31.CATEGORY AS ACTIVITY_CATEGORY, t31.DECORATION_TYPE AS ACTIVITY_DECORATION, t1.ACTIVITY_TYPE_ID, t31.NAME AS ACTIVITY_TYPE_ID_TEXT, t1.AUTOMATED, t1.CALENDAR_EVENT_ID, t101.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t61.NAME AS CREATE_UID_TEXT, t1.DATE_DEADLINE, t31.FORCE_NEXT, t31.ICON, t1.ID, t1.NOTE_ID, t1.PREVIOUS_ACTIVITY_TYPE_ID, t41.NAME AS PREVIOUS_ACTIVITY_TYPE_ID_TEXT, t1.RECOMMENDED_ACTIVITY_TYPE_ID, t91.NAME AS RECOMMENDED_ACTIVITY_TYPE_ID_TEXT, t1.RES_ID, t1.RES_MODEL, t1.RES_MODEL_ID, t1.RES_NAME, t1.SUMMARY, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_ACTIVITY t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t31 ON t1.ACTIVITY_TYPE_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.PREVIOUS_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.CREATE_UID = 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_ACTIVITY_TYPE t91 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t91.ID  LEFT JOIN CALENDAR_EVENT t101 ON t1.CALENDAR_EVENT_ID = t101.ID  
+		<![CDATA[ SELECT t31.CATEGORY AS ACTIVITY_CATEGORY, t31.DECORATION_TYPE AS ACTIVITY_DECORATION, t1.ACTIVITY_TYPE_ID, t31.NAME AS ACTIVITY_TYPE_ID_TEXT, t1.AUTOMATED, t1.CALENDAR_EVENT_ID, t101.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t61.NAME AS CREATE_UID_TEXT, t1.DATE_DEADLINE, t31.FORCE_NEXT, t31.ICON, t1.ID, t1.NOTE, t1.NOTE_ID, t1.PREVIOUS_ACTIVITY_TYPE_ID, t41.NAME AS PREVIOUS_ACTIVITY_TYPE_ID_TEXT, t1.RECOMMENDED_ACTIVITY_TYPE_ID, t91.NAME AS RECOMMENDED_ACTIVITY_TYPE_ID_TEXT, t1.RES_ID, t1.RES_MODEL, t1.RES_MODEL_ID, t1.RES_NAME, t1.SUMMARY, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t81.NAME AS WRITE_UID_TEXT FROM MAIL_ACTIVITY t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t31 ON t1.ACTIVITY_TYPE_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.PREVIOUS_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.CREATE_UID = 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_ACTIVITY_TYPE t91 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t91.ID  LEFT JOIN CALENDAR_EVENT t101 ON t1.CALENDAR_EVENT_ID = t101.ID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT t31.CATEGORY AS ACTIVITY_CATEGORY, t31.DECORATION_TYPE AS ACTIVITY_DECORATION, t1.ACTIVITY_TYPE_ID, t31.NAME AS ACTIVITY_TYPE_ID_TEXT, t1.AUTOMATED, t1.CALENDAR_EVENT_ID, t111.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t1.DATE_DEADLINE, t1.FEEDBACK, t31.FORCE_NEXT, t31.ICON, t1.ID, t1.NOTE, t1.NOTE_ID, t51.NAME AS NOTE_ID_TEXT, t1.PREVIOUS_ACTIVITY_TYPE_ID, t41.NAME AS PREVIOUS_ACTIVITY_TYPE_ID_TEXT, t1.RECOMMENDED_ACTIVITY_TYPE_ID, t101.NAME AS RECOMMENDED_ACTIVITY_TYPE_ID_TEXT, t1.RES_ID, t1.RES_MODEL, t1.RES_MODEL_ID, t1.RES_NAME, t1.SUMMARY, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t91.NAME AS WRITE_UID_TEXT FROM MAIL_ACTIVITY t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t31 ON t1.ACTIVITY_TYPE_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.PREVIOUS_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN NOTE_NOTE t51 ON t1.NOTE_ID = t51.ID  LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID  LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID  LEFT JOIN RES_USERS t81 ON t1.WRITE_UID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t101 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t101.ID  LEFT JOIN CALENDAR_EVENT t111 ON t1.CALENDAR_EVENT_ID = t111.ID  
+		<![CDATA[ SELECT t31.CATEGORY AS ACTIVITY_CATEGORY, t31.DECORATION_TYPE AS ACTIVITY_DECORATION, t1.ACTIVITY_TYPE_ID, t31.NAME AS ACTIVITY_TYPE_ID_TEXT, t1.AUTOMATED, t1.CALENDAR_EVENT_ID, t111.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t1.DATE_DEADLINE, t31.FORCE_NEXT, t31.ICON, t1.ID, t1.NOTE, t1.NOTE_ID, t51.NAME AS NOTE_ID_TEXT, t1.PREVIOUS_ACTIVITY_TYPE_ID, t41.NAME AS PREVIOUS_ACTIVITY_TYPE_ID_TEXT, t1.RECOMMENDED_ACTIVITY_TYPE_ID, t101.NAME AS RECOMMENDED_ACTIVITY_TYPE_ID_TEXT, t1.RES_ID, t1.RES_MODEL, t1.RES_MODEL_ID, t1.RES_NAME, t1.SUMMARY, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t91.NAME AS WRITE_UID_TEXT FROM MAIL_ACTIVITY t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t31 ON t1.ACTIVITY_TYPE_ID = t31.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t41 ON t1.PREVIOUS_ACTIVITY_TYPE_ID = t41.ID  LEFT JOIN NOTE_NOTE t51 ON t1.NOTE_ID = t51.ID  LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID  LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID  LEFT JOIN RES_USERS t81 ON t1.WRITE_UID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  LEFT JOIN MAIL_ACTIVITY_TYPE t101 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t101.ID  LEFT JOIN CALENDAR_EVENT t111 ON t1.CALENDAR_EVENT_ID = t111.ID  
 			]]>
     </sql>
 </mapper>

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

@@ -74911,19 +74911,6 @@
     "major_field":0
     },
     {
-    "fieldname":"FEEDBACK" ,
-    "codename":"Feedback",
-    "field_logic_name":"反馈",
-    "entity_name":"Mail_activity",
-    "field_type":"HTMLTEXT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"TEXT",
-    "data_length":1048576,
-    "key_field":0,
-    "major_field":0
-    },
-    {
     "fieldname":"RES_MODEL_ID" ,
     "codename":"Res_model_id",
     "field_logic_name":"文档模型",

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

@@ -154,15 +154,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
     @Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
     private String note;
 
-    /**
-     * 属性 [FEEDBACK]
-     *
-     */
-    @JSONField(name = "feedback")
-    @JsonProperty("feedback")
-    @Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
-    private String feedback;
-
     /**
      * 属性 [RES_MODEL_ID]
      *
@@ -410,14 +401,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
         this.modify("note",note);
     }
 
-    /**
-     * 设置 [FEEDBACK]
-     */
-    public void setFeedback(String  feedback){
-        this.feedback = feedback ;
-        this.modify("feedback",feedback);
-    }
-
     /**
      * 设置 [RES_MODEL_ID]
      */