Skip to content

I
iBiz商业中心
提交 d44af7c5 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码

上级 e316d588
隐藏空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 161 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/domain/Mail_activity.java
浏览文件 @ d44af7c5
...@@ -208,13 +208,6 @@ public class Mail_activity extends EntityMP implements Serializable { ...@@ -208,13 +208,6 @@ public class Mail_activity extends EntityMP implements Serializable {
@JSONField(name = "note_id_text") @JSONField(name = "note_id_text")
@JsonProperty("note_id_text") @JsonProperty("note_id_text")
private String noteIdText; private String noteIdText;
/**
* 建立者
*/
@TableField(exist = false)
@JSONField(name = "create_user_id_text")
@JsonProperty("create_user_id_text")
private String createUserIdText;
/** /**
* 图标 * 图标
*/ */
...@@ -280,14 +273,6 @@ public class Mail_activity extends EntityMP implements Serializable { ...@@ -280,14 +273,6 @@ public class Mail_activity extends EntityMP implements Serializable {
@JSONField(name = "activity_type_id") @JSONField(name = "activity_type_id")
@JsonProperty("activity_type_id") @JsonProperty("activity_type_id")
private Long activityTypeId; private Long activityTypeId;
/**
* 建立者
*/
@DEField(name = "create_user_id")
@TableField(value = "create_user_id")
@JSONField(name = "create_user_id")
@JsonProperty("create_user_id")
private Long createUserId;
/** /**
* 创建人 * 创建人
*/ */
...@@ -385,14 +370,6 @@ public class Mail_activity extends EntityMP implements Serializable { ...@@ -385,14 +370,6 @@ public class Mail_activity extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreateUser;
/** /**
* *
*/ */
...@@ -509,14 +486,6 @@ public class Mail_activity extends EntityMP implements Serializable { ...@@ -509,14 +486,6 @@ public class Mail_activity extends EntityMP implements Serializable {
this.modify("activity_type_id",activityTypeId); this.modify("activity_type_id",activityTypeId);
} }
/**
* 设置 [建立者]
*/
public void setCreateUserId(Long createUserId){
this.createUserId = createUserId ;
this.modify("create_user_id",createUserId);
}
/** /**
* 设置 [分派给] * 设置 [分派给]
*/ */
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/filter/Mail_activitySearchContext.java
浏览文件 @ d44af7c5
...@@ -103,20 +103,6 @@ public class Mail_activitySearchContext extends QueryWrapperContext<Mail_activit ...@@ -103,20 +103,6 @@ public class Mail_activitySearchContext extends QueryWrapperContext<Mail_activit
if(!ObjectUtils.isEmpty(this.n_note_id_text_like)){ if(!ObjectUtils.isEmpty(this.n_note_id_text_like)){
this.getSearchCond().like("note_id_text", n_note_id_text_like); this.getSearchCond().like("note_id_text", n_note_id_text_like);
} }
}
private String n_create_user_id_text_eq;//[建立者]
public void setN_create_user_id_text_eq(String n_create_user_id_text_eq) {
this.n_create_user_id_text_eq = n_create_user_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_create_user_id_text_eq)){
this.getSearchCond().eq("create_user_id_text", n_create_user_id_text_eq);
}
}
private String n_create_user_id_text_like;//[建立者]
public void setN_create_user_id_text_like(String n_create_user_id_text_like) {
this.n_create_user_id_text_like = n_create_user_id_text_like;
if(!ObjectUtils.isEmpty(this.n_create_user_id_text_like)){
this.getSearchCond().like("create_user_id_text", n_create_user_id_text_like);
}
} }
private String n_create_uid_text_eq;//[创建人] private String n_create_uid_text_eq;//[创建人]
public void setN_create_uid_text_eq(String n_create_uid_text_eq) { public void setN_create_uid_text_eq(String n_create_uid_text_eq) {
...@@ -187,13 +173,6 @@ public class Mail_activitySearchContext extends QueryWrapperContext<Mail_activit ...@@ -187,13 +173,6 @@ public class Mail_activitySearchContext extends QueryWrapperContext<Mail_activit
if(!ObjectUtils.isEmpty(this.n_activity_type_id_eq)){ if(!ObjectUtils.isEmpty(this.n_activity_type_id_eq)){
this.getSearchCond().eq("activity_type_id", n_activity_type_id_eq); this.getSearchCond().eq("activity_type_id", n_activity_type_id_eq);
} }
}
private Long n_create_user_id_eq;//[建立者]
public void setN_create_user_id_eq(Long n_create_user_id_eq) {
this.n_create_user_id_eq = n_create_user_id_eq;
if(!ObjectUtils.isEmpty(this.n_create_user_id_eq)){
this.getSearchCond().eq("create_user_id", n_create_user_id_eq);
}
} }
private Long n_create_uid_eq;//[创建人] private Long n_create_uid_eq;//[创建人]
public void setN_create_uid_eq(Long n_create_uid_eq) { public void setN_create_uid_eq(Long n_create_uid_eq) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/mapper/Mail_activityMapper.java
浏览文件 @ d44af7c5
...@@ -74,8 +74,6 @@ public interface Mail_activityMapper extends BaseMapper<Mail_activity>{ ...@@ -74,8 +74,6 @@ public interface Mail_activityMapper extends BaseMapper<Mail_activity>{
List<Mail_activity> selectByCreateUid(@Param("id") Serializable id) ; List<Mail_activity> selectByCreateUid(@Param("id") Serializable id) ;
List<Mail_activity> selectByCreateUserId(@Param("id") Serializable id) ;
List<Mail_activity> selectByUserId(@Param("id") Serializable id) ; List<Mail_activity> selectByUserId(@Param("id") Serializable id) ;
List<Mail_activity> selectByWriteUid(@Param("id") Serializable id) ; List<Mail_activity> selectByWriteUid(@Param("id") Serializable id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/service/IMail_activityService.java
浏览文件 @ d44af7c5
...@@ -50,8 +50,6 @@ public interface IMail_activityService extends IService<Mail_activity>{ ...@@ -50,8 +50,6 @@ public interface IMail_activityService extends IService<Mail_activity>{
void removeByNoteId(Long id) ; void removeByNoteId(Long id) ;
List<Mail_activity> selectByCreateUid(Long id) ; List<Mail_activity> selectByCreateUid(Long id) ;
void removeByCreateUid(Long id) ; void removeByCreateUid(Long id) ;
List<Mail_activity> selectByCreateUserId(Long id) ;
void removeByCreateUserId(Long id) ;
List<Mail_activity> selectByUserId(Long id) ; List<Mail_activity> selectByUserId(Long id) ;
void removeByUserId(Long id) ; void removeByUserId(Long id) ;
List<Mail_activity> selectByWriteUid(Long id) ; List<Mail_activity> selectByWriteUid(Long id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/service/impl/Mail_activityServiceImpl.java
浏览文件 @ d44af7c5
...@@ -261,16 +261,6 @@ public class Mail_activityServiceImpl extends EBSServiceImpl<Mail_activityMapper ...@@ -261,16 +261,6 @@ public class Mail_activityServiceImpl extends EBSServiceImpl<Mail_activityMapper
this.remove(new QueryWrapper<Mail_activity>().eq("create_uid",id)); this.remove(new QueryWrapper<Mail_activity>().eq("create_uid",id));
} }
@Override
public List<Mail_activity> selectByCreateUserId(Long id) {
return baseMapper.selectByCreateUserId(id);
}
@Override
public void removeByCreateUserId(Long id) {
this.remove(new QueryWrapper<Mail_activity>().eq("create_user_id",id));
}
@Override @Override
public List<Mail_activity> selectByUserId(Long id) { public List<Mail_activity> selectByUserId(Long id) {
return baseMapper.selectByUserId(id); return baseMapper.selectByUserId(id);
...@@ -372,16 +362,6 @@ public class Mail_activityServiceImpl extends EBSServiceImpl<Mail_activityMapper ...@@ -372,16 +362,6 @@ public class Mail_activityServiceImpl extends EBSServiceImpl<Mail_activityMapper
} }
et.setCreateUidText(odooCreate.getName()); et.setCreateUidText(odooCreate.getName());
} }
//实体关系[DER1N_MAIL_ACTIVITY__RES_USERS__CREATE_USER_ID]
if(!ObjectUtils.isEmpty(et.getCreateUserId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreateUser=et.getOdooCreateUser();
if(ObjectUtils.isEmpty(odooCreateUser)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users majorEntity=resUsersService.get(et.getCreateUserId());
et.setOdooCreateUser(majorEntity);
odooCreateUser=majorEntity;
}
et.setCreateUserIdText(odooCreateUser.getName());
}
//实体关系[DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID] //实体关系[DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID]
if(!ObjectUtils.isEmpty(et.getUserId())){ if(!ObjectUtils.isEmpty(et.getUserId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooUser=et.getOdooUser(); cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooUser=et.getOdooUser();
......
businesscentral-core/src/main/resources/mapper/odoo_mail/mail_activity/Mail_activityMapper.xml
浏览文件 @ d44af7c5
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="Mail_activityResultMap" databaseId="postgresql"> <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, t131.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t91.NAME AS CREATE_UID_TEXT, t1.CREATE_USER_ID, t71.NAME AS CREATE_USER_ID_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, t121.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, t111.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_USER_ID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_USERS t81 ON t1.CREATE_UID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN RES_USERS t101 ON t1.WRITE_UID = t101.ID LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID LEFT JOIN MAIL_ACTIVITY_TYPE t121 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t121.ID LEFT JOIN CALENDAR_EVENT t131 ON t1.CALENDAR_EVENT_ID = t131.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, 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}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<result property="activityTypeIdText" column="activity_type_id_text" /> <result property="activityTypeIdText" column="activity_type_id_text" />
<result property="previousActivityTypeIdText" column="previous_activity_type_id_text" /> <result property="previousActivityTypeIdText" column="previous_activity_type_id_text" />
<result property="noteIdText" column="note_id_text" /> <result property="noteIdText" column="note_id_text" />
<result property="createUserIdText" column="create_user_id_text" />
<result property="createUidText" column="create_uid_text" /> <result property="createUidText" column="create_uid_text" />
<result property="activityDecoration" column="activity_decoration" /> <result property="activityDecoration" column="activity_decoration" />
<result property="writeUidText" column="write_uid_text" /> <result property="writeUidText" column="write_uid_text" />
...@@ -36,7 +35,6 @@ ...@@ -36,7 +35,6 @@
<result property="calendarEventIdText" column="calendar_event_id_text" /> <result property="calendarEventIdText" column="calendar_event_id_text" />
<result property="recommendedActivityTypeId" column="recommended_activity_type_id" /> <result property="recommendedActivityTypeId" column="recommended_activity_type_id" />
<result property="activityTypeId" column="activity_type_id" /> <result property="activityTypeId" column="activity_type_id" />
<result property="createUserId" column="create_user_id" />
<result property="createUid" column="create_uid" /> <result property="createUid" column="create_uid" />
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
<result property="noteId" column="note_id" /> <result property="noteId" column="note_id" />
...@@ -58,8 +56,6 @@ ...@@ -58,8 +56,6 @@
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association> <association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooCreateUser" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_user_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooUser" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="user_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association> <association property="odooUser" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="user_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association> <association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
...@@ -106,13 +102,6 @@ ...@@ -106,13 +102,6 @@
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where create_uid=#{id} where create_uid=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_MAIL_ACTIVITY__RES_USERS__CREATE_USER_ID] -->
<select id="selectByCreateUserId" resultMap="Mail_activityResultMap">
select t1.* from (
<include refid="Default" />
) t1
where create_user_id=#{id}
</select> </select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID] -->
<select id="selectByUserId" resultMap="Mail_activityResultMap"> <select id="selectByUserId" resultMap="Mail_activityResultMap">
...@@ -140,12 +129,12 @@ ...@@ -140,12 +129,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql"> <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, t121.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t81.NAME AS CREATE_UID_TEXT, t1.CREATE_USER_ID, t61.NAME AS CREATE_USER_ID_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, t111.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, t101.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_USER_ID = t51.ID LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID LEFT JOIN RES_USERS t71 ON t1.CREATE_UID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN MAIL_ACTIVITY_TYPE t111 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t111.ID LEFT JOIN CALENDAR_EVENT t121 ON t1.CALENDAR_EVENT_ID = t121.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_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> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="postgresql"> <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, t131.NAME AS CALENDAR_EVENT_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t91.NAME AS CREATE_UID_TEXT, t1.CREATE_USER_ID, t71.NAME AS CREATE_USER_ID_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, t121.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, t111.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_USER_ID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_USERS t81 ON t1.CREATE_UID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN RES_USERS t101 ON t1.WRITE_UID = t101.ID LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID LEFT JOIN MAIL_ACTIVITY_TYPE t121 ON t1.RECOMMENDED_ACTIVITY_TYPE_ID = t121.ID LEFT JOIN CALENDAR_EVENT t131 ON t1.CALENDAR_EVENT_ID = t131.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, 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
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ d44af7c5
...@@ -75035,23 +75035,6 @@ ...@@ -75035,23 +75035,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"CREATE_USER_ID_TEXT" ,
"codename":"Create_user_id_text",
"field_logic_name":"建立者",
"entity_name":"Mail_activity",
"ref_de":"RES_USERS",
"ref_field_name":"NAME",
"relation_name":"DER1N_MAIL_ACTIVITY__RES_USERS__CREATE_USER_ID",
"relation_codename":"Odoo_create_user",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"major_field":0
},
{
"fieldname":"ICON" , "fieldname":"ICON" ,
"codename":"Icon", "codename":"Icon",
"field_logic_name":"图标", "field_logic_name":"图标",
...@@ -75203,22 +75186,6 @@ ...@@ -75203,22 +75186,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"CREATE_USER_ID" ,
"codename":"Create_user_id",
"field_logic_name":"建立者",
"entity_name":"Mail_activity",
"ref_de":"RES_USERS",
"ref_field_name":"ID",
"relation_name":"DER1N_MAIL_ACTIVITY__RES_USERS__CREATE_USER_ID",
"relation_codename":"Odoo_create_user",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"major_field":0
},
{
"fieldname":"CREATE_UID" , "fieldname":"CREATE_UID" ,
"codename":"Create_uid", "codename":"Create_uid",
"field_logic_name":"创建人", "field_logic_name":"创建人",
...@@ -75356,12 +75323,6 @@ ...@@ -75356,12 +75323,6 @@
"entity_name":"MAIL_ACTIVITY", "entity_name":"MAIL_ACTIVITY",
"ref_entity_name":"RES_USERS" "ref_entity_name":"RES_USERS"
}, },
{"name":"DER1N_MAIL_ACTIVITY__RES_USERS__CREATE_USER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_create_user",
"entity_name":"MAIL_ACTIVITY",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID", {"name":"DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_user", "code_name":"Odoo_user",
...@@ -147695,12 +147656,6 @@ ...@@ -147695,12 +147656,6 @@
"entity_name":"MAIL_ACTIVITY", "entity_name":"MAIL_ACTIVITY",
"ref_entity_name":"RES_USERS" "ref_entity_name":"RES_USERS"
}, },
{"name":"DER1N_MAIL_ACTIVITY__RES_USERS__CREATE_USER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_create_user",
"entity_name":"MAIL_ACTIVITY",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID", {"name":"DER1N_MAIL_ACTIVITY__RES_USERS__USER_ID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_user", "code_name":"Odoo_user",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Mail_activityDTO.java
浏览文件 @ d44af7c5
...@@ -226,15 +226,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable { ...@@ -226,15 +226,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]") @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String noteIdText; private String noteIdText;
/**
* 属性 [CREATE_USER_ID_TEXT]
*
*/
@JSONField(name = "create_user_id_text")
@JsonProperty("create_user_id_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String createUserIdText;
/** /**
* 属性 [ICON] * 属性 [ICON]
* *
...@@ -315,15 +306,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable { ...@@ -315,15 +306,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long activityTypeId; private Long activityTypeId;
/**
* 属性 [CREATE_USER_ID]
*
*/
@JSONField(name = "create_user_id")
@JsonProperty("create_user_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long createUserId;
/** /**
* 属性 [CREATE_UID] * 属性 [CREATE_UID]
* *
...@@ -468,14 +450,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable { ...@@ -468,14 +450,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
this.modify("activity_type_id",activityTypeId); this.modify("activity_type_id",activityTypeId);
} }
/**
* 设置 [CREATE_USER_ID]
*/
public void setCreateUserId(Long createUserId){
this.createUserId = createUserId ;
this.modify("create_user_id",createUserId);
}
/** /**
* 设置 [USER_ID] * 设置 [USER_ID]
*/ */
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或