Просмотр исходного кода

[审批流][修改][修改拆分物业审批流]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
14aec96736
4 измененных файлов: 127 добавлений и 1 удалений
  1. +104
    -0
      mallinkAdmin/src/main/resources/db/migration/V201907151748__L_FLOW_CONFIG_DATA.sql
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java
  3. +9
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  4. +9
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 104
- 0
mallinkAdmin/src/main/resources/db/migration/V201907151748__L_FLOW_CONFIG_DATA.sql Просмотреть файл

@@ -0,0 +1,104 @@
INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '456', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '456', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '456', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '456', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '789', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '789', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '789', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '789', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '790', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '790', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '790', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '790', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1001', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1001', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1001', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1001', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1002', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1002', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1002', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1002', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1003', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1003', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1003', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1003', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1004', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1004', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1004', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1004', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1005', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1005', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1005', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1005', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1006', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1006', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1006', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1006', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1007', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1007', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1007', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1007', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1008', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1008', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1008', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1008', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1009', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1009', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1009', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1009', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1010', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1010', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1010', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1010', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1011', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1011', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1011', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1011', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1012', '商铺租赁合同签约', 17, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 9),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1012', '商铺租赁合同终止', 18, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 10),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1012', '多经点位商铺租赁合同签约', 19, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 11),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1561009249, '1012', '多经点位商铺租赁合同终止', 20, 0, '2019-06-11 14:02:42', '2019-07-11 21:06:31', 12);

+ 5
- 0
mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java Просмотреть файл

@@ -25,6 +25,11 @@ public enum EnumFlowKey {
NEW_PRO_END(14, "商铺物业合同终止"),
NEW_PRO_POINT_CONTRACT(15, "多经点位物业合同签约"),
NEW_PRO_POINT_CONTRACT_END(16, "多经点位物业合同终止"),

NNEW_RENT_CONTRACT(17, "商铺租赁合同签约"),
NEW_RENT_END(18, "商铺租赁合同终止"),
NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租赁合同签约"),
NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租赁合同终止"),
;

public static EnumFlowKey getEnum(Integer code) {


+ 9
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -126,7 +126,9 @@ public class WxFlowServiceImpl implements WxFlowService {
EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) ||
EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType)||
EnumFlowKey.NEW_PRO_CONTRACT.getCode().equals(flowType)||
EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().equals(flowType)
EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().equals(flowType)||
EnumFlowKey.NNEW_RENT_CONTRACT.getCode().equals(flowType)||
EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().equals(flowType)
){
// 1租赁合同 2点位合同 3物业 4点位物业合同 5 合并合同-店铺 6 合并合同-多经点位
if (EnumFlowContractType.RENT.getCode().equals(contractType) ||
@@ -160,6 +162,8 @@ public class WxFlowServiceImpl implements WxFlowService {
|| EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType)
|| EnumFlowKey.NEW_PRO_END.getCode().equals(flowType)
|| EnumFlowKey.NEW_PRO_POINT_CONTRACT_END.getCode().equals(flowType)
|| EnumFlowKey.NEW_RENT_END.getCode().equals(flowType)
|| EnumFlowKey.NEW_RENT_POINT_CONTRACT_END.getCode().equals(flowType)
){
if(EnumFlowContractType.RENT.getCode().equals(contractType) || EnumFlowContractType.RENT_POINT.getCode().equals(contractType) ){
WxRentContract rent = new WxRentContract();
@@ -473,6 +477,10 @@ public class WxFlowServiceImpl implements WxFlowService {
|| EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().equals(flowType)
|| EnumFlowKey.NEW_PRO_END.getCode().equals(flowType)
|| EnumFlowKey.NEW_PRO_POINT_CONTRACT_END.getCode().equals(flowType)
|| EnumFlowKey.NNEW_RENT_CONTRACT.getCode().equals(flowType)
|| EnumFlowKey.NEW_RENT_END.getCode().equals(flowType)
|| EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().equals(flowType)
|| EnumFlowKey.NEW_RENT_POINT_CONTRACT_END.getCode().equals(flowType)
){
return true;
}


+ 9
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -750,6 +750,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxFlowModel flowModel_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_CONTRACT.getCode().intValue(),record.getTenantId());
WxFlowModel flowModelPoint_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().intValue(),record.getTenantId());

WxFlowModel flowModel_rent = wxFlowService.getModelByType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode().intValue(),record.getTenantId());
WxFlowModel flowModelPoint_rent = wxFlowService.getModelByType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().intValue(),record.getTenantId());

List<String> keyList = new ArrayList<>();
if(flowModel != null){
keyList.add(flowModel.getFlowId());
@@ -763,6 +766,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if(flowModelPoint_pro != null){
keyList.add(flowModelPoint_pro.getFlowId());
}
if(flowModel_rent != null){
keyList.add(flowModel_rent.getFlowId());
}
if(flowModelPoint_rent != null){
keyList.add(flowModelPoint_rent.getFlowId());
}
keyList.add(EnumFlowKey.CONTRACT.getMessage());
List<Task> tasks = taskService.createTaskQuery()
.processDefinitionKeyIn(keyList)


Загрузка…
Отмена
Сохранить