表添加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
      */

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/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java

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

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java

@@ -38,6 +38,11 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private String id;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
     /**
      * 项目ID
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java

@@ -38,6 +38,11 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
     /**
      * 关联PROJECT_STAFF，由此ID可以关联出PROJECT_ID、CUSTOMER_ID、PROCESS_ID
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java

@@ -37,6 +37,10 @@ import java.util.Date;
 public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
 
     /**
      * 项目ID

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -345,6 +345,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         List<ProjectOrgRelationEntity> relationList = new LinkedList<>();
         entityList.forEach(staff -> {
             ProjectOrgRelationEntity relation = new ProjectOrgRelationEntity();
+            relation.setCustomerId(staffEntity.getCustomerId());
             relation.setProjectStaffId(staff.getId());
             relation.setInformedDate(current);
             relation.setSourceOperation(ProjectConstant.OPERATION_TRANSFER);
@@ -691,6 +692,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         List<ProjectOrgRelationEntity> relationList = new LinkedList<>();
         entityList.forEach(staff -> {
             ProjectOrgRelationEntity relation = new ProjectOrgRelationEntity();
+            relation.setCustomerId(staffEntity.getCustomerId());
             relation.setProjectStaffId(staff.getId());
             relation.setInformedDate(current);
             relation.setSourceOperation(ProjectConstant.OPERATION_TRANSFER);

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -737,6 +737,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		newRelation.setProjectStaffId(projectStaff.getId());
 		newRelation.setSourceOperation(ProjectConstant.OPERATION_RETURN);
 		newRelation.setInformedDate(current);
+		newRelation.setCustomerId(sourceProjectStaff.getCustomerId());
 		relationDao.insert(newRelation);
 
 		//通知
@@ -982,6 +983,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				ProjectOrgRelationEntity period = new ProjectOrgRelationEntity();
 				period.setProjectStaffId(o);
 				period.setInformedDate(current);
+				period.setCustomerId(issueDTO.getCustomerId());
 				//created
 				period.setSourceOperation(ProjectConstant.OPERATION_CREATED);
 				period.setCreatedBy(formDTO.getStaffId());
@@ -993,6 +995,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		//5:项目相关人员表初始数据
 		List<ProjectRelatedPersonnelEntity> list = new ArrayList<>();
 		ProjectRelatedPersonnelEntity entity1 = new ProjectRelatedPersonnelEntity();
+		entity1.setCustomerId(issueDTO.getCustomerId());
 		entity1.setProjectId(projectEntity.getId());
 		entity1.setApp(AppClientConstant.APP_RESI);
 		entity1.setGridId(issueDTO.getGridId());
@@ -1765,6 +1768,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			throw new RenException("找不到发起退回的项目相关人员的节点耗时记录");
 		}
 		ProjectOrgRelationEntity relationDto = new ProjectOrgRelationEntity();
+		relationDto.setCustomerId(sourceProjectStaff.getCustomerId());
 		relationDto.setProjectStaffId(orientRelation.getProjectStaffId());
 		relationDto.setHandledDate(current);
 		Integer costTime = calculateDelta_T(ProjectConstant.IMPRECISE_CALCULATION,