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

Merge branch 'dev_import' into develop

dev
zhaoqifeng 4 years ago
parent
de1e5ae229 e80c4e6733
commit
0f77c00dc8
2 changed files with 76 additions and 8 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. 16
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
  2. 68
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.11__ic_party_change.sql

16
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
View File

@ -1516,10 +1516,10 @@ public class WorkActServiceImpl implements WorkActService {
AtomicInteger i = new AtomicInteger(NumConstant.ONE);
List<IcActivityUnitRelationEntity> unitRelationList = rePublishFormDTO.getUnitIdList().stream().map(unitId -> {
IcActivityUnitRelationEntity relation = new IcActivityUnitRelationEntity();
relation.setCustomerId(activity.getCustomerId());
relation.setAgencyId(activity.getAgencyId());
relation.setPids(activity.getPids());
relation.setActivityId(activity.getId());
relation.setCustomerId(activityDTO.getCustomerId());
relation.setAgencyId(activityDTO.getAgencyId());
relation.setPids(activityDTO.getPids());
relation.setActivityId(activityDTO.getId());
relation.setUnitId(unitId);
relation.setSort(i.getAndIncrement());
return relation;
@ -1531,10 +1531,10 @@ public class WorkActServiceImpl implements WorkActService {
AtomicInteger j = new AtomicInteger(NumConstant.ONE);
List<IcActivityServiceRelationEntity> serviceRelationList = rePublishFormDTO.getServiceMatterList().stream().map(service -> {
IcActivityServiceRelationEntity relation = new IcActivityServiceRelationEntity();
relation.setCustomerId(activity.getCustomerId());
relation.setAgencyId(activity.getAgencyId());
relation.setPids(activity.getPids());
relation.setActivityId(activity.getId());
relation.setCustomerId(activityDTO.getCustomerId());
relation.setAgencyId(activityDTO.getAgencyId());
relation.setPids(activityDTO.getPids());
relation.setActivityId(activityDTO.getId());
relation.setServiceMatter(service);
relation.setSort(j.getAndIncrement());
return relation;

68
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.11__ic_party_change.sql
View File

@ -0,0 +1,68 @@
CREATE TABLE `ic_activity_service_relation` (
`ID` varchar(64) NOT NULL COMMENT '主键',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
`AGENCY_ID` varchar(64) NOT NULL COMMENT '组织ID',
`PIDS` varchar(255) DEFAULT NULL COMMENT '组织的所有上级',
`ACTIVITY_ID` varchar(32) NOT NULL COMMENT '活动ID',
`ACT_ID` varchar(64) DEFAULT NULL COMMENT 'act_info表ID',
`SERVICE_MATTER` varchar(32) NOT NULL DEFAULT '1' COMMENT '服务事项',
`SORT` int(4) DEFAULT NULL COMMENT '排序',
`DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
`REVISION` int(11) NOT NULL DEFAULT '0' 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 `ic_activity_unit_relation` (
`ID` varchar(64) NOT NULL COMMENT '主键',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
`AGENCY_ID` varchar(64) NOT NULL COMMENT '组织ID',
`PIDS` varchar(255) DEFAULT NULL COMMENT '组织的所有上级',
`ACTIVITY_ID` varchar(32) NOT NULL COMMENT '活动ID',
`ACT_ID` varchar(64) DEFAULT NULL COMMENT 'act_info表ID',
`UNIT_ID` varchar(32) NOT NULL COMMENT '单位ID',
`SORT` int(4) DEFAULT '1' COMMENT '排序',
`DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
`REVISION` int(11) NOT NULL DEFAULT '0' 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 `latest_act_service_relation` (
`ID` varchar(64) NOT NULL COMMENT '主键',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
`ACT_ID` varchar(64) DEFAULT NULL COMMENT 'latest_act_info表ID',
`SERVICE_MATTER` varchar(32) NOT NULL COMMENT '服务事项',
`SORT` int(4) DEFAULT '1' COMMENT '排序',
`DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
`REVISION` int(11) NOT NULL DEFAULT '0' 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 `latest_act_unit_relation` (
`ID` varchar(64) NOT NULL DEFAULT '1' COMMENT '主键',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
`ACT_ID` varchar(64) DEFAULT NULL COMMENT 'latest_act_info表ID',
`UNIT_ID` varchar(32) NOT NULL COMMENT '单位ID',
`SORT` int(4) DEFAULT NULL COMMENT '排序',
`DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
`REVISION` int(11) NOT NULL DEFAULT '0' 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='联建活动与单位关联表';
ALTER TABLE `epmet_heart`.`ic_party_activity`
MODIFY COLUMN `UNIT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '单位ID' AFTER `ACT_ID`,
MODIFY COLUMN `SERVICE_MATTER` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '服务事项' AFTER `UNIT_ID`;
UPDATE act_info SET ACT_TYPE = 'heart' WHERE ACT_TYPE IS NULL;
Write Preview
Loading…
Cancel
Save