elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_project_process' 

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
master
jianjun 3 years ago
parent
39ca2f2271 0a8549bfa6
commit
937c1db3bc
6 changed files with 56 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
  2. 13
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
  3. 26
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  4. 15
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
  5. 2
      epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.26__alter_project_process.sql
  6. 2
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
View File

@ -56,7 +56,7 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
* 负负责人ID
*/
private String staffId;
private String staffName;
/**
* 处理：结案close，退回return，部门流转transfer，创建项目created
*/

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

@ -25,10 +25,13 @@ import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.scan.param.TextScanParamDTO;
import com.epmet.commons.tools.scan.param.TextTaskDTO;
import com.epmet.commons.tools.scan.result.SyncScanResult;
@ -250,6 +253,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
}
//2:项目处理进展列表新增数据
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(staffEntity.getCustomerId(), staffEntity.getStaffId());
if (null == staffInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
}
ProjectProcessEntity processEntity = ConvertUtils.sourceToTarget(formDTO, ProjectProcessEntity.class);
processEntity.setCustomerId(staffEntity.getCustomerId());
processEntity.setDepartmentName(staffEntity.getDepartmentName());
@ -260,6 +267,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
processEntity.setDepartmentId(staffEntity.getDepartmentId());
processEntity.setGridId(staffEntity.getGridId());
processEntity.setOrgIdPath(staffEntity.getOrgIdPath());
processEntity.setStaffName(staffInfo.getRealName());
projectProcessDao.insert(processEntity);
//3:项目人员关联表新增部门流转数据
List<TickStaffFormDTO> staffList = formDTO.getStaffList();
@ -636,6 +644,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
}
//2:项目处理进展列表新增数据
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(staffEntity.getCustomerId(), staffEntity.getStaffId());
if (null == staffInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
}
ProjectProcessEntity processEntity = ConvertUtils.sourceToTarget(formDTO, ProjectProcessEntity.class);
processEntity.setCustomerId(staffEntity.getCustomerId());
processEntity.setDepartmentName(staffEntity.getDepartmentName());
@ -648,6 +660,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
processEntity.setOrgIdPath(staffEntity.getOrgIdPath());
processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
processEntity.setStaffName(staffInfo.getRealName());
projectProcessDao.insert(processEntity);
//2-1.项目附件表新增数据
if ((null != formDTO.getPublicFile() && formDTO.getPublicFile().size() > NumConstant.ZERO)

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

@ -51,7 +51,6 @@ import com.epmet.dto.result.*;
import com.epmet.entity.*;
import com.epmet.excel.ProjectListExportExcel;
import com.epmet.feign.*;
import com.epmet.redis.ProjectRedis;
import com.epmet.resi.group.constant.TopicConstant;
import com.epmet.resi.group.dto.topic.ResiTopicDTO;
import com.epmet.resi.group.dto.topic.form.TopicAttachmentFormDTO;
@ -496,6 +495,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
//结案记录加入项目进展表
CustomerStaffInfoCacheResult staffInfo = getStaffInfo(fromDTO.getCustomerId(), fromDTO.getUserId());
ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
projectProcessEntity.setProjectId(fromDTO.getProjectId());
projectProcessEntity.setCustomerId(operatorProjectReference.getCustomerId());
@ -513,6 +513,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
ProjectDTO projectDto = ConvertUtils.sourceToTarget(projectEntity, ProjectDTO.class);
projectDto.setUpdatedTime(projectDto.getCreatedTime());
projectProcessEntity.setCostWorkdays(getDetentionDays(projectDto));
projectProcessEntity.setStaffName(staffInfo.getRealName());
projectProcessService.insert(projectProcessEntity);
ProjectOrgRelationEntity orientRelation = relationDao.selectByProjectStaffId(operatorProjectReference.getId());
@ -698,7 +699,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
log.error("com.epmet.service.impl.ProjectServiceImpl.closed，找不到结案工作人员的相关记录，参数:{}",JSON.toJSONString(fromDTO));
throw new RenException("找不到结案工作人员的相关记录");
}
CustomerStaffInfoCacheResult staffInfo = getStaffInfo(fromDTO.getCustomerId(), fromDTO.getUserId());
//结案记录加入项目进展表
ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
projectProcessEntity.setProjectId(fromDTO.getProjectId());
@ -719,6 +720,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
projectProcessEntity.setCostWorkdays(getDetentionDays(projectDto));
projectProcessEntity.setAssistanceUnitType(fromDTO.getAssistanceUnitType());
projectProcessEntity.setAssistanceUnitId(fromDTO.getAssistanceUnitId());
projectProcessEntity.setStaffName(staffInfo.getRealName());
projectProcessService.insert(projectProcessEntity);
//保存附件
@ -912,6 +914,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
//结案记录加入项目进展表
CustomerStaffInfoCacheResult staffInfo = getStaffInfo(sourceProjectStaff.getCustomerId(), fromDTO.getUserId());
ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
projectProcessEntity.setProjectId(fromDTO.getProjectId());
projectProcessEntity.setCustomerId(sourceProjectStaff.getCustomerId());
@ -925,6 +928,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
projectProcessEntity.setPublicReply(fromDTO.getPublicReply());
projectProcessEntity.setInternalRemark(fromDTO.getInternalRemark());
projectProcessEntity.setStaffId(fromDTO.getUserId());
projectProcessEntity.setStaffName(staffInfo.getRealName());
projectProcessService.insert(projectProcessEntity);
//将人员关系添加到项目关联表
@ -1187,6 +1191,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
baseDao.insert(projectEntity);
//3:项目处理进展表新增数据
CustomerStaffInfoCacheResult staffInfo = getStaffInfo(issueDTO.getCustomerId(), formDTO.getStaffId());
ProjectProcessEntity processEntity = new ProjectProcessEntity();
processEntity.setProjectId(projectEntity.getId());
processEntity.setCustomerId(issueDTO.getCustomerId());
@ -1197,6 +1202,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
processEntity.setInternalRemark(formDTO.getInternalRemark());
processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
processEntity.setStaffName(staffInfo.getRealName());
agencyDeptGrid.getAgencyList().forEach(agency -> {
if (issueDTO.getOrgId().equals(agency.getId())) {
processEntity.setDepartmentName(agency.getOrganizationName());
@ -1403,6 +1409,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
//处理响应记录加入项目进展表
CustomerStaffInfoCacheResult staffInfo = getStaffInfo(projectStaff.getCustomerId(), formDTO.getUserId());
ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
projectProcessEntity.setProjectId(formDTO.getProjectId());
projectProcessEntity.setCustomerId(projectStaff.getCustomerId());
@ -1416,6 +1423,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
projectProcessEntity.setPublicReply(formDTO.getPublicReply());
projectProcessEntity.setInternalRemark(formDTO.getInternalRemark());
projectProcessEntity.setStaffId(formDTO.getUserId());
projectProcessEntity.setStaffName(staffInfo.getRealName());
projectProcessService.insert(projectProcessEntity);
//项目节点历时
@ -2115,6 +2123,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
//结案记录加入项目进展表
CustomerStaffInfoCacheResult staffInfo = getStaffInfo(sourceProjectStaff.getCustomerId(), fromDTO.getUserId());
ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
projectProcessEntity.setProjectId(fromDTO.getProjectId());
projectProcessEntity.setCustomerId(sourceProjectStaff.getCustomerId());
@ -2128,6 +2137,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
projectProcessEntity.setPublicReply(fromDTO.getPublicReply());
projectProcessEntity.setInternalRemark(fromDTO.getInternalRemark());
projectProcessEntity.setStaffId(fromDTO.getUserId());
projectProcessEntity.setStaffName(staffInfo.getRealName());
projectProcessService.insert(projectProcessEntity);
//项目附件表新增数据 sun 2020.12.22
@ -2294,6 +2304,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
//处理响应记录加入项目进展表
CustomerStaffInfoCacheResult staffInfo = getStaffInfo(projectStaff.getCustomerId(), formDTO.getUserId());
ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
projectProcessEntity.setProjectId(formDTO.getProjectId());
projectProcessEntity.setCustomerId(projectStaff.getCustomerId());
@ -2309,6 +2320,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
projectProcessEntity.setStaffId(formDTO.getUserId());
projectProcessEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
projectProcessEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
projectProcessEntity.setStaffName(staffInfo.getRealName());
projectProcessService.insert(projectProcessEntity);
//项目附件表新增数据 sun 2020.12.22
@ -2429,6 +2441,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
ProjectStaffDTO projectStaff = projectStaffService.get(formDTO.getProjectStaffId());
//处理响应记录加入项目进展表
CustomerStaffInfoCacheResult staff = getStaffInfo(projectStaff.getCustomerId(), formDTO.getUserId());
ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
projectProcessEntity.setProjectId(formDTO.getProjectId());
projectProcessEntity.setCustomerId(projectStaff.getCustomerId());
@ -2443,6 +2456,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
projectProcessEntity.setInternalRemark(formDTO.getInternalRemark());
projectProcessEntity.setStaffId(formDTO.getUserId());
projectProcessEntity.setIsSend(NumConstant.ONE);
projectProcessEntity.setStaffName(staff.getRealName());
projectProcessService.insert(projectProcessEntity);
//项目附件表新增数据 sun 2020.12.22
@ -3454,4 +3468,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
return projectList;
}
private CustomerStaffInfoCacheResult getStaffInfo(String customerId, String staffId) {
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
if (null == staffInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
}
return staffInfo;
}
}

15
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
View File

@ -427,6 +427,10 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
projectService.insert(projectEntity);
//3-2.项目进展表新增第一个节点数据
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
if (null == staffInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
}
ProjectProcessEntity processEntity = new ProjectProcessEntity();
processEntity.setProjectId(projectEntity.getId());
processEntity.setCustomerId(formDTO.getCustomerId());
@ -437,6 +441,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
processEntity.setInternalRemark(formDTO.getInternalRemark());
processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
processEntity.setStaffName(staffInfo.getRealName());
agencyDeptGrid.getAgencyList().forEach(agency -> {
if (loginUser.getAgencyId().equals(agency.getId())) {
processEntity.setDepartmentName(agency.getOrganizationName());
@ -760,6 +765,10 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
projectService.insert(projectEntity);
//3-2.项目进展表新增第一个节点数据
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
if (null == staffInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
}
ProjectProcessEntity processEntity = new ProjectProcessEntity();
processEntity.setProjectId(projectEntity.getId());
processEntity.setCustomerId(formDTO.getCustomerId());
@ -770,6 +779,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
processEntity.setInternalRemark(formDTO.getInternalRemark());
processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
processEntity.setStaffName(staffInfo.getRealName());
agencyDeptGrid.getAgencyList().forEach(agency -> {
if (loginUser.getAgencyId().equals(agency.getId())) {
processEntity.setDepartmentName(agency.getOrganizationName());
@ -1281,6 +1291,10 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
projectService.insert(projectEntity);
//3-2.项目进展表新增第一个节点数据
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
if (null == staffInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
}
ProjectProcessEntity processEntity = new ProjectProcessEntity();
processEntity.setProjectId(projectEntity.getId());
processEntity.setCustomerId(formDTO.getCustomerId());
@ -1291,6 +1305,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
processEntity.setInternalRemark(formDTO.getInternalRemark());
processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
processEntity.setStaffName(staffInfo.getRealName());
agencyDeptGrid.getAgencyList().forEach(agency -> {
if (loginUser.getAgencyId().equals(agency.getId())) {
processEntity.setDepartmentName(agency.getOrganizationName());

2
epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.26__alter_project_process.sql
View File

@ -0,0 +1,2 @@
ALTER TABLE `epmet_gov_project`.`project_process`
ADD COLUMN `STAFF_NAME` varchar(64) NULL COMMENT '负责人姓名' AFTER `STAFF_ID`;

2
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
View File

@ -92,7 +92,7 @@
ID AS processId,
OPERATION_NAME AS processName,
UNIX_TIMESTAMP(created_time) AS processTime,
DEPARTMENT_NAME,
CONCAT(DEPARTMENT_NAME,'(',STAFF_NAME,')') AS "departmentName",
PUBLIC_REPLY,
INTERNAL_REMARK,
IS_SEND,

Write Preview
Loading…
Cancel
Save