xignzi006 发布系统代码

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

@@ -208,13 +208,6 @@ public class Mail_activity extends EntityMP implements Serializable {
     @JSONField(name = "note_id_text")
     @JsonProperty("note_id_text")
     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 {
     @JSONField(name = "activity_type_id")
     @JsonProperty("activity_type_id")
     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 {
     @TableField(exist = false)
     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 {
         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

@@ -103,20 +103,6 @@ public class Mail_activitySearchContext extends QueryWrapperContext<Mail_activit
         if(!ObjectUtils.isEmpty(this.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;//[创建人]
 	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
         if(!ObjectUtils.isEmpty(this.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;//[创建人]
 	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

@@ -74,8 +74,6 @@ public interface Mail_activityMapper extends BaseMapper<Mail_activity>{
 
     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> selectByWriteUid(@Param("id") Serializable id) ;

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

@@ -50,8 +50,6 @@ public interface IMail_activityService extends IService<Mail_activity>{
     void removeByNoteId(Long id) ;
     List<Mail_activity> selectByCreateUid(Long id) ;
     void removeByCreateUid(Long id) ;
-    List<Mail_activity> selectByCreateUserId(Long id) ;
-    void removeByCreateUserId(Long id) ;
     List<Mail_activity> selectByUserId(Long id) ;
     void removeByUserId(Long id) ;
     List<Mail_activity> selectByWriteUid(Long id) ;

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

@@ -261,16 +261,6 @@ public class Mail_activityServiceImpl extends EBSServiceImpl<Mail_activityMapper
         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
     public List<Mail_activity> selectByUserId(Long id) {
         return baseMapper.selectByUserId(id);
@@ -372,16 +362,6 @@ public class Mail_activityServiceImpl extends EBSServiceImpl<Mail_activityMapper
             }
             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]
         if(!ObjectUtils.isEmpty(et.getUserId())){
             cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooUser=et.getOdooUser();

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

@@ -75035,23 +75035,6 @@
     "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" ,
     "codename":"Icon",
     "field_logic_name":"图标",
@@ -75203,22 +75186,6 @@
     "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" ,
     "codename":"Create_uid",
     "field_logic_name":"创建人",
@@ -75356,12 +75323,6 @@
      "entity_name":"MAIL_ACTIVITY",
      "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",
      "relation_type":"DER1N",
      "code_name":"Odoo_user",
@@ -147695,12 +147656,6 @@
      "entity_name":"MAIL_ACTIVITY",
      "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",
      "relation_type":"DER1N",
      "code_name":"Odoo_user",

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

@@ -226,15 +226,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
     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]
      *
@@ -315,15 +306,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long activityTypeId;
 
-    /**
-     * 属性 [CREATE_USER_ID]
-     *
-     */
-    @JSONField(name = "create_user_id")
-    @JsonProperty("create_user_id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long createUserId;
-
     /**
      * 属性 [CREATE_UID]
      *
@@ -468,14 +450,6 @@ public class Mail_activityDTO extends DTOBase implements Serializable {
         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]
      */