Merge branch 'dev_add_customer_id' into dev_temp

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -152,7 +152,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
         //2、记录staff_wechat
-        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid());
+        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid(), staffLatestAgencyResultDTO.getCustomerId());
         //3、记录登录日志
         this.saveStaffLoginRecord(staffLatestAgencyResultDTO);
         //4、获取用户token
@@ -276,7 +276,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(LoginConstant.APP_GOV, formDTO.getWxCode(), formDTO.getAppId());
 
         //3、记录staff_wechat,并记录用户激活状态，激活时间
-        this.savestaffwechat(customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid());
+        this.savestaffwechat(customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid(), formDTO.getCustomerId());
         //4、记录登录日志
         this.saveStaffLoginRecord(formDTO, customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid());
         //5.1、获取用户token
@@ -401,10 +401,11 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @Description 保存微信和当前登录用户关系
      * @Date 2020/4/18 22:54
      **/
-    private Result savestaffwechat(String userId, String openid) {
+    private Result savestaffwechat(String userId, String openid, String customerId) {
         StaffWechatFormDTO staffWechatFormDTO = new StaffWechatFormDTO();
         staffWechatFormDTO.setUserId(userId);
         staffWechatFormDTO.setWxOpenId(openid);
+        staffWechatFormDTO.setCustomerId(customerId);
         return epmetUserFeignClient.saveStaffWechat(staffWechatFormDTO);
     }
 

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -153,7 +153,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
 
         //3.记录staff_wechat
-        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), userWechatDTO.getWxOpenId());
+        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), userWechatDTO.getWxOpenId(), staffLatestAgencyResultDTO.getCustomerId());
 
         //4.记录登录日志
         this.saveStaffLoginRecord(staffLatestAgencyResultDTO);
@@ -175,10 +175,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
      * @Author sun
      * @Description 保存微信和当前登录用户关系
      **/
-    private Result savestaffwechat(String userId, String openid) {
+    private Result savestaffwechat(String userId, String openid, String customerId) {
         StaffWechatFormDTO staffWechatFormDTO = new StaffWechatFormDTO();
         staffWechatFormDTO.setUserId(userId);
         staffWechatFormDTO.setWxOpenId(openid);
+        staffWechatFormDTO.setCustomerId(customerId);
         return epmetUserOpenFeignClient.saveStaffWechat(staffWechatFormDTO);
     }
 
@@ -366,7 +367,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         wxMaJscode2SessionResult.setUnionid("");
         // end
         //3、记录staff_wechat,并记录用户激活状态，激活时间
-        this.savestaffwechat(customerStaff.getUserId(), userWechatDTO.getWxOpenId());
+        this.savestaffwechat(customerStaff.getUserId(), userWechatDTO.getWxOpenId(), formDTO.getCustomerId());
         //4、记录登录日志
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = new StaffLatestAgencyResultDTO();
         staffLatestAgencyResultDTO.setCustomerId(formDTO.getCustomerId());

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java

@@ -51,6 +51,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
         Date date = new Date();
         if (metaObject.getOriginalObject() instanceof BaseEpmetEntity) {
             // epmet项目新增的
+            setFieldValByName(FieldConstant.CUSTOMER_ID_HUMP, getCustomerIdByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.CREATED_TIME_HUMP, getCreatedTimeByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.CREATED_BY_HUMP, getCreatedByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, getUpdatedTimeByFieldValue(metaObject), metaObject);
@@ -95,6 +96,13 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
         return value;
     }
 
+    public Object getCustomerIdByFieldValue(MetaObject metaObject) {
+        if (metaObject.hasSetter(FieldConstant.CUSTOMER_ID_HUMP)) {
+            return loginUserUtil.getLoginUserCustomerId();
+        }
+        return null;
+    }
+
     public Object getCreatedTimeByFieldValue(MetaObject metaObject) {
         Object createdTime = null;
         if (metaObject.hasGetter(FieldConstant.CREATED_TIME_HUMP)) {

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java

@@ -24,6 +24,11 @@ public class BaseTokenDto {
      */
     private String token;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
     public BaseTokenDto() {
     }
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java

@@ -31,11 +31,6 @@ public class GovTokenDto extends BaseTokenDto implements Serializable {
      */
     private String unionId;
 
-    /**
-     * 当前工作人员进入的客户id
-     */
-    private String customerId;
-
     /**
      * 过期时间戳
      */

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java

@@ -40,11 +40,6 @@ public class TokenDto extends BaseTokenDto implements Serializable {
 	 */
 	private long updateTime;
 
-	/**
-	 * 当前工作人员进入的客户id
-	 */
-	private String customerId;
-
 	@Override
 	public String toString() {
 		return JSON.toJSONString(this);

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java

@@ -68,6 +68,23 @@ public class LoginUserUtil {
         return client;
     }
 
+    /**
+     * 获取用户customerId
+     * @return
+     */
+    public String getLoginUserCustomerId() {
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+        if (request == null) {
+            return null;
+        }
+
+        String client = request.getHeader(AppClientConstant.CUSTOMER_ID);
+        if (StringUtils.isBlank(client)) {
+            return null;
+        }
+        return client;
+    }
+
     /**
      * 获取用户的部门ID列表
      * @return

epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java

@@ -109,7 +109,8 @@ public class InternalAuthProcessor extends AuthProcessor {
                     .header(Constant.APP_USER_KEY, redisKey)
                     .header(AppClientConstant.APP,baseTokenDto.getApp())
                     .header(AppClientConstant.CLIENT,baseTokenDto.getClient())
-                    .header(AppClientConstant.USER_ID,baseTokenDto.getUserId());
+                    .header(AppClientConstant.USER_ID,baseTokenDto.getUserId())
+                    .header(AppClientConstant.CUSTOMER_ID,baseTokenDto.getCustomerId());
 
             if (StringUtils.equalsAny(baseTokenDto.getApp(), AppClientConstant.APP_GOV, AppClientConstant.APP_RESI)) {//工作端/居民端
                 if(StringUtils.isNotBlank(customerId)){

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java

@@ -83,4 +83,9 @@ public class StaffRoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java

@@ -123,4 +123,9 @@ public class StaffWechatDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceImgDTO.java

@@ -83,4 +83,9 @@ public class UserAdviceImgDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBaseInfoDTO.java

@@ -128,4 +128,9 @@ public class UserBaseInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java

@@ -78,4 +78,9 @@ public class UserDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiInfoDTO.java

@@ -108,4 +108,9 @@ public class UserResiInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java

@@ -123,4 +123,9 @@ public class UserWechatDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProcessDTO.java

@@ -99,4 +99,9 @@ public class IssueProcessDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectRelationDTO.java

@@ -79,4 +79,9 @@ public class IssueProjectRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueSatisfactionDetailDTO.java

@@ -84,4 +84,9 @@ public class IssueSatisfactionDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueSatisfactionStatisticalDTO.java

@@ -89,4 +89,9 @@ public class IssueSatisfactionStatisticalDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueVoteDetailDTO.java

@@ -79,4 +79,9 @@ public class IssueVoteDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueVoteStatisticalDTO.java

@@ -89,4 +89,8 @@ public class IssueVoteStatisticalDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueVoteStatisticalDailyDTO.java

@@ -114,4 +114,9 @@ public class IssueVoteStatisticalDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectOrgRelationDTO.java

@@ -39,6 +39,11 @@ public class ProjectOrgRelationDTO implements Serializable {
      */
 	private String id;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
     /**
      * 关联PROJECT_STAFF，由此ID可以关联出PROJECT_ID、CUSTOMER_ID、PROCESS_ID
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java

@@ -38,6 +38,11 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private String id;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
     /**
      * 项目ID
      */
@@ -98,4 +103,5 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private Date updatedTime;
 
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionDetailDTO.java

@@ -83,4 +83,9 @@ public class ProjectSatisfactionDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionStatisticsDTO.java

@@ -88,4 +88,9 @@ public class ProjectSatisfactionStatisticsDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupInvitationDTO.java

@@ -103,4 +103,9 @@ public class GroupInvitationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupMemeberOperationDTO.java

@@ -111,4 +111,9 @@ Ps: 1) 入群被拒绝之后，如果再申请是插入一条新的审核中的
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/InvitationAccessRecordDTO.java

@@ -83,4 +83,9 @@ public class InvitationAccessRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupMemberDTO.java

@@ -98,4 +98,9 @@ public class ResiGroupMemberDTO implements Serializable {
      */
 	private String updatedBy;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupOperationDTO.java

@@ -98,4 +98,9 @@ public class ResiGroupOperationDTO implements Serializable {
      */
 	private String messageText;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupStatisticalDTO.java

@@ -103,4 +103,9 @@ public class ResiGroupStatisticalDTO implements Serializable {
      */
 	private String updatedBy;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicAttachmentDTO.java

@@ -103,4 +103,9 @@ public class ResiTopicAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicCommentDTO.java

@@ -83,4 +83,9 @@ public class ResiTopicCommentDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicDTO.java

@@ -128,4 +128,9 @@ public class ResiTopicDTO implements Serializable {
      */
 	private String issueId;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicOperationDTO.java

@@ -83,4 +83,9 @@ public class ResiTopicOperationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java

@@ -53,4 +53,9 @@ public class StaffRoleEntity extends BaseEpmetEntity {
      */
 	private String orgId;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java

@@ -93,4 +93,9 @@ public class StaffWechatEntity extends BaseEpmetEntity {
      */
 	private String language;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java

@@ -48,4 +48,9 @@ public class UserEntity extends BaseEpmetEntity {
      */
 	private String fromClient;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java

@@ -93,4 +93,9 @@ public class UserWechatEntity extends BaseEpmetEntity {
      */
 	private String language;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueProcessEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govissue;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -65,4 +67,10 @@ public class IssueProcessEntity extends BaseEpmetEntity {
 	 * */
 	private String orgName;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueProjectRelationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govissue;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -45,4 +47,10 @@ public class IssueProjectRelationEntity extends BaseEpmetEntity {
      */
 	private String projectId;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueSatisfactionDetailEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govissue;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -50,4 +52,10 @@ public class IssueSatisfactionDetailEntity extends BaseEpmetEntity {
      */
 	private String satisfaction;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueSatisfactionStatisticalEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govissue;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -55,4 +57,10 @@ public class IssueSatisfactionStatisticalEntity extends BaseEpmetEntity {
      */
 	private Integer badCount;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueVoteDetailEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govissue;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -45,4 +47,10 @@ public class IssueVoteDetailEntity extends BaseEpmetEntity {
      */
 	private String attitude;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueVoteStatisticalDailyEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govissue;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -82,4 +84,10 @@ public class IssueVoteStatisticalDailyEntity extends BaseEpmetEntity {
      */
 	private Integer votableCount;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueVoteStatisticalEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govissue;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -55,4 +57,10 @@ public class IssueVoteStatisticalEntity extends BaseEpmetEntity {
      */
 	private Integer votableCount;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java

@@ -80,4 +80,9 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity {
      */
 	private String operation;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java

@@ -68,4 +68,9 @@ public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionDetailEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govproject;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -53,4 +55,10 @@ public class ProjectSatisfactionDetailEntity extends BaseEpmetEntity {
      */
 	private String satisfaction;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionStatisticsEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.govproject;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -58,4 +60,10 @@ public class ProjectSatisfactionStatisticsEntity extends BaseEpmetEntity {
      */
 	private Integer badCount;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupInvitationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -73,4 +75,10 @@ public class GroupInvitationEntity extends BaseEpmetEntity {
      */
 	private Date validEndTime;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupMemeberOperationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -81,4 +83,10 @@ Ps: 1) 入群被拒绝之后，如果再申请是插入一条新的审核中的
      */
 	private String operateUserId;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/InvitationAccessRecordEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -53,4 +55,10 @@ public class InvitationAccessRecordEntity extends BaseEpmetEntity {
      */
 	private String state;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupMemberEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -68,4 +70,10 @@ public class ResiGroupMemberEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupOperationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -68,4 +70,10 @@ public class ResiGroupOperationEntity extends BaseEpmetEntity {
      */
 	private String messageText;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupStatisticalEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -73,4 +75,9 @@ public class ResiGroupStatisticalEntity extends BaseEpmetEntity {
      */
 	private Integer totalNormalMemebers;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicAttachmentEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -73,4 +75,10 @@ public class ResiTopicAttachmentEntity extends BaseEpmetEntity {
      */
 	private Integer duration;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicCommentEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -53,4 +55,10 @@ public class ResiTopicCommentEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -98,4 +100,9 @@ public class ResiTopicEntity extends BaseEpmetEntity {
      */
 	private String issueId;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicOperationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.entity.resigroup;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -53,4 +55,10 @@ public class ResiTopicOperationEntity extends BaseEpmetEntity {
      */
 	private String operationReason;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectOrgRelationDTO.java

@@ -39,6 +39,11 @@ public class ProjectOrgRelationDTO implements Serializable {
      */
 	private String id;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
     /**
      * 关联PROJECT_STAFF，由此ID可以关联出PROJECT_ID、CUSTOMER_ID、PROCESS_ID
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity.evaluationindex.screen;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -82,4 +84,10 @@ public class IndexGroupDetailTemplateEntity extends BaseEpmetEntity {
 	 */
 	private String correlation;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity.evaluationindex.screen;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -60,4 +62,10 @@ public class IndexGroupTemplateEntity extends BaseEpmetEntity {
 	 */
 	private String allIndexCodePath;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenDifficultyImgDataEntity.java

@@ -1,5 +1,7 @@
 package com.epmet.entity.evaluationindex.screen;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.AllArgsConstructor;
@@ -26,4 +28,10 @@ public class ScreenDifficultyImgDataEntity extends BaseEpmetEntity {
     private String eventImgUrl;
 
     private Integer sort;
+
+    /**
+     * 客户ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String customerId;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenEventImgDataEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity.evaluationindex.screen;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -50,4 +52,10 @@ public class ScreenEventImgDataEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActContentDTO.java

@@ -89,4 +89,9 @@ public class ActContentDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLivePicDTO.java

@@ -83,4 +83,9 @@ public class ActLivePicDTO implements Serializable {
      */
 	private String delFlag;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLiveRecDTO.java

@@ -99,4 +99,9 @@ public class ActLiveRecDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActOperationRecDTO.java

@@ -92,4 +92,9 @@ public class ActOperationRecDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActPointLogDTO.java

@@ -94,4 +94,10 @@ public class ActPointLogDTO implements Serializable {
      * 更新时间
      */
 	private Date updatedTime;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInPicDTO.java

@@ -83,4 +83,9 @@ public class ActSignInPicDTO implements Serializable {
      */
 	private String delFlag;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInRecDTO.java

@@ -109,4 +109,9 @@ public class ActSignInRecDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActStatisticalDTO.java

@@ -114,4 +114,9 @@ public class ActStatisticalDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java

@@ -88,4 +88,9 @@ public class ActSummaryDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActUserLogDTO.java

@@ -96,4 +96,9 @@ public class ActUserLogDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActUserRelationDTO.java

@@ -133,4 +133,9 @@ public class ActUserRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java

@@ -88,4 +88,9 @@ public class LatestActContentDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -58,4 +60,10 @@ public class ActContentEntity extends BaseEpmetEntity {
      */
 	private Integer orderNum;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLivePicEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -53,4 +55,10 @@ public class ActLivePicEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLiveRecEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -69,4 +71,10 @@ public class ActLiveRecEntity extends BaseEpmetEntity {
      */
 	private String desc;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActOperationRecEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -57,4 +59,10 @@ public class ActOperationRecEntity extends BaseEpmetEntity {
 	 * 备注，取消活动时此列有值
 	 */
 	private String remark;
+
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActPointLogEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -61,4 +63,10 @@ public class ActPointLogEntity extends BaseEpmetEntity {
      */
 	private String remark;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInPicEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -53,4 +55,11 @@ public class ActSignInPicEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInRecEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -79,4 +81,10 @@ public class ActSignInRecEntity extends BaseEpmetEntity {
      */
 	private String liveId;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActStatisticalEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -80,4 +82,10 @@ public class ActStatisticalEntity extends BaseEpmetEntity {
      */
 	private Integer denyRewardUserNum;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -58,4 +60,10 @@ public class ActSummaryEntity extends BaseEpmetEntity {
      */
 	private Integer orderNum;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserLogEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -62,4 +64,10 @@ public class ActUserLogEntity extends BaseEpmetEntity {
      */
 	private String reason;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserRelationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -102,4 +104,10 @@ public class ActUserRelationEntity extends BaseEpmetEntity {
      */
 	private String denyRewardReason;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -58,4 +60,10 @@ public class LatestActContentEntity extends BaseEpmetEntity {
      */
 	private Integer orderNum;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/UserKindnessTimeLogEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -53,4 +55,10 @@ public class UserKindnessTimeLogEntity extends BaseEpmetEntity {
      */
 	private Integer kindnessTime;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java

@@ -58,4 +58,8 @@ public class SysSmsDTO implements Serializable {
      * 短信模板编码 来源于SmsTemplateConstant
      */
     private String aliyunTemplateCode;
+    /**
+     * 客户id
+     */
+    private String customerId;
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SysSmsEntity.java

@@ -8,6 +8,7 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -57,5 +58,10 @@ public class SysSmsEntity extends BaseEpmetEntity {
 	 * 发送状态  0：失败   1：成功
 	 */
 	private Integer status;
+	/**
+	 * 客户id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/entity/OssEntity.java

@@ -8,6 +8,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -29,4 +31,10 @@ public class OssEntity extends BaseEpmetEntity {
 	 */
 	private String url;
 
+	/**
+	 * 客户Id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdjustmentLogDTO.java

@@ -103,4 +103,9 @@ public class PointAdjustmentLogDTO implements Serializable {
      */
 	private String updatedBy;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationLogDTO.java

@@ -118,4 +118,9 @@ public class PointVerificationLogDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdjustmentLogEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -73,4 +75,10 @@ public class PointAdjustmentLogEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationLogEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -88,4 +90,10 @@ public class PointVerificationLogEntity extends BaseEpmetEntity {
      */
 	private String address;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java

@@ -79,4 +79,9 @@ public class RoleOperationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java

@@ -83,4 +83,9 @@ public class RoleScopeDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }