diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904221743__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904221743__ADD_FLOW.sql new file mode 100644 index 000000000..0d8b9b163 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904221743__ADD_FLOW.sql @@ -0,0 +1,17 @@ +DROP TABLE IF EXISTS `wx_topic` ; +CREATE TABLE `wx_topic` ( + `id` bigint(64) NOT NULL COMMENT 'id', + `tenant_id` varchar(50) DEFAULT NULL COMMENT '租户id', + `name` varchar(300) NOT NULL DEFAULT '' COMMENT '名称', + `title` varchar(500) DEFAULT '0' COMMENT '标题', + `cover` varchar(300) DEFAULT '0' COMMENT '封面', + `advert` varchar(300) DEFAULT '0' COMMENT '广告图', + `begin_time` datetime DEFAULT NULL COMMENT '开始时间', + `end_time` datetime DEFAULT NULL COMMENT '结束时间', + `content` text COMMENT '内容', + `status` tinyint(1) DEFAULT '1' COMMENT '状态1生效2失效3作废', + `bg_color` varchar(300) DEFAULT NULL COMMENT '背景颜色', + `createtime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updatetime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专题表'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904221647__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904221747__ADD_FLOW_MSG_MODEL.sql similarity index 93% rename from mallinkAdmin/src/main/resources/db/migration/V201904221647__ADD_FLOW.sql rename to mallinkAdmin/src/main/resources/db/migration/V201904221747__ADD_FLOW_MSG_MODEL.sql index 59b2612c2..b524daa43 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201904221647__ADD_FLOW.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201904221747__ADD_FLOW_MSG_MODEL.sql @@ -1,26 +1,8 @@ -DROP TABLE IF EXISTS `wx_topic` ; -CREATE TABLE `wx_topic` ( - `id` bigint(64) NOT NULL COMMENT 'id', - `tenant_id` varchar(50) DEFAULT NULL COMMENT '租户id', - `name` varchar(300) NOT NULL DEFAULT '' COMMENT '名称', - `title` varchar(500) DEFAULT '0' COMMENT '标题', - `cover` varchar(300) DEFAULT '0' COMMENT '封面', - `advert` varchar(300) DEFAULT '0' COMMENT '广告图', - `begin_time` datetime DEFAULT NULL COMMENT '开始时间', - `end_time` datetime DEFAULT NULL COMMENT '结束时间', - `content` text COMMENT '内容', - `status` tinyint(1) DEFAULT '1' COMMENT '状态1生效2失效3作废', - `bg_color` varchar(300) DEFAULT NULL COMMENT '背景颜色', - `createtime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updatetime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专题表'; - INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`) VALUES - (205925185009271111, '789', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的合同已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1), - (205925185009271112, '789', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2), - (205925185009271113, '789', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的合同审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3), - (205925185009271114, '789', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4), - (205925185009271115, '789', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个合同待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5), - (205925185009271116, '789', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的合同合同审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6); + (205925981009271111, '789', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的合同已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1), + (205925981009271112, '789', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2), + (205925981009271113, '789', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的合同审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3), + (205925981009271114, '789', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4), + (205925981009271115, '789', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个合同待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5), + (205925981009271116, '789', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的合同合同审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 09df62a9e..e5d96db98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -132,6 +132,7 @@ public class WxShop implements Serializable { //结束时间 @Transient private Date enddate; + //闲置时间 @Transient private Integer freeDay; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index cc749854f..c300b1bf2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -701,7 +701,7 @@ public class WxFlowServiceImpl implements WxFlowService { Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); String email = (String)userMap.get("email"); List> variables = (List)mapInfo.get("variables"); - Integer flowType = (Integer)mapInfo.get("businessType"); + Integer flowType = (Integer)mapInfo.get("flowType"); // 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知 if(!isEnded(processInstanceId)){