Browse Source

Merge branch 'dev_thirdplatform' into dev_temp

master
zhaoqifeng 5 years ago
parent
commit
8fbee8382d
  1. 11
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
  2. 11
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  3. 50
      epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql

11
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java

@ -3,6 +3,7 @@ package com.epmet.dto.form;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
import java.util.List;
@ -67,8 +68,16 @@ public class ProjectDetailDTO implements Serializable {
/**
* 话题发表人电话
* */
*/
private String topicPublisherMobile;
/**
* 公开答复
*/
private String publicReply;
/**
* 内部备注
*/
private String internalRemark;
@Override
public String toString() {

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

@ -2113,9 +2113,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
if (CollectionUtils.isNotEmpty(imageList)) {
applyAssistFormDTO.setVideoLink(String.join(StrConstant.COMMA, videoList));
}
}
//获取工作人员信息
Result<CustomerStaffDTO> staffInfo = epmetUserOpenFeignClient.getCustomerStaff(formDTO.getUserId());
if (!staffInfo.success()) {
throw new RenException(staffInfo.getCode(), staffInfo.getMsg());
}
applyAssistFormDTO.setPersonName(staffInfo.getData().getRealName());
applyAssistFormDTO.setMobile(staffInfo.getData().getMobile());
//获取网格信息
List<ProjectRelatedPersonnelDTO> relatedPersonnel = projectRelatedPersonnelService.getPersonnelListByProjectId(formDTO.getProjectId());
CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
@ -2136,6 +2141,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
ProjectDetailDTO projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData(), ProjectDetailDTO.class);
projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData().getTopicInfo(), ProjectDetailDTO.class);
projectDetailDTO.setPublicReply(formDTO.getPublicReply());
projectDetailDTO.setInternalRemark(formDTO.getInternalRemark());
applyAssistFormDTO.setDetail(projectDetailDTO.toString());
applyAssistFormDTO.setDetailAddress(projectDetailDTO.getBelongsGridName());
Result result = epmetThirdOpenFeignClient.applyAssist(applyAssistFormDTO);

50
epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql

@ -0,0 +1,50 @@
CREATE TABLE `project_sub_process` (
`ID` varchar(64) NOT NULL COMMENT '唯一标识',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`PROJECT_ID` varchar(64) NOT NULL COMMENT '项目ID',
`PROCESS_ID` varchar(64) NOT NULL COMMENT '节点ID',
`PROJECT_STAFF_ID` varchar(64) NOT NULL COMMENT '项目人员关联表ID:project_staff.id',
`PLATFORM_ID` varchar(64) NOT NULL COMMENT '系统ID',
`PLATFORM_NAME` varchar(32) NOT NULL COMMENT '系统名',
`TASK_ID` varchar(32) NOT NULL COMMENT '第三方平台返回的项目关联ID(事件Id)',
`RESULT` varchar(1024) DEFAULT NULL COMMENT '事件处理详细内容',
`EXTERNAL_STATUS` varchar(16) DEFAULT NULL COMMENT '外部状态:1待处理,2待核实,3已上报,4已完结,5处理中,6待分发,7归档,8催办,9超时',
`EXTERNAL_STATUS_DESC` varchar(32) DEFAULT NULL COMMENT '外部状态描述',
`INTERNAL_STATUS` varchar(16) DEFAULT NULL COMMENT '内部状态:待处理 pending,结案closed',
`HANDLE_DATE` datetime DEFAULT NULL COMMENT '处理日期',
`HANDLE_USER_NAME` varchar(32) DEFAULT NULL COMMENT '处理人姓名',
`DEL_FLAG` int(1) NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='节点事件关联表 ';
CREATE TABLE `project_sub_attachment` (
`ID` varchar(64) NOT NULL COMMENT '唯一标识',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`PROJECT_ID` varchar(64) NOT NULL COMMENT '项目ID',
`SUB_ID` varchar(64) NOT NULL COMMENT '子节点ID,project_sub_process.id',
`TASK_ID` varchar(64) NOT NULL COMMENT '第三方平台返回的项目关联ID(事件Id)',
`ATTACHMENT_NAME` varchar(128) DEFAULT NULL COMMENT '附件名',
`ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小 单位b',
`ATTACHMENT_FORMAT` varchar(32) DEFAULT NULL COMMENT '文件格式',
`ATTACHMENT_TYPE` varchar(32) DEFAULT NULL COMMENT '类型',
`ATTACHMENT_URL` varchar(256) DEFAULT NULL COMMENT '附件地址',
`DURATION` int(11) DEFAULT NULL COMMENT '语音或视频时长,秒',
`SORT` int(11) NOT NULL COMMENT '排序',
`DEL_FLAG` int(1) NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='外部系统事件附件 ';
ALTER TABLE `project_process`
ADD COLUMN `IS_SEND` int(1) NOT NULL DEFAULT 0 COMMENT '是否发送到外部系统 0否 1是' AFTER `END_TIME`;
INSERT INTO `customer_project_parameter`(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1006', 'default', 'third_platform_project_send', '发送外部系统项目协助开关', '0', '0:关(默认) 1:开 ', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
Loading…
Cancel
Save