From 1e1ce3ff9d4bafa92033905a2a2dd09ecb3119a5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 10 Jul 2019 17:29:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201907101649__L_ADD_FLOW_DATA.sql | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201907101649__L_ADD_FLOW_DATA.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907101649__L_ADD_FLOW_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201907101649__L_ADD_FLOW_DATA.sql new file mode 100644 index 000000000..48ed035f2 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907101649__L_ADD_FLOW_DATA.sql @@ -0,0 +1,83 @@ +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1008', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1008/hrhlc-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1008', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1008/hrhlc-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1008', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1008/hrhlc-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1008', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1008/hrhlc-h.jpeg'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1009', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1009/jyxh-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1009', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1009/jyxh-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1009', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1009/jyxh-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1009', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1009/jyxh-h.jpeg'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1010', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1010', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1010', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.png'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1010', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.png'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1011', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1011', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1011', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1011', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'); + +INSERT INTO `wx_msg_validationcode_model` (`id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1012', 24, '审批通过通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通过通知
\n
您申请的[{type}],[{name}]已经审批通过,请登录{page}跟进后续工作
\n
\n
\n\n\n', '2019-07-10 11:35:11', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1012', 26, '待办通知', '', '\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', '2019-07-10 11:37:33', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1012', 25, '审批通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意[{type}][{name}]的审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2019-07-10 11:36:23', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1012', 27, '驳回通知', '', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
您申请的[{type}],[{name}]被驳回,请登录{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', '2019-07-10 11:38:22', 0, 0, 500, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1010/qbj-h.jpeg'); From 8405120779a8f22574198acf0c322287bd6e8f9a Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 11 Jul 2019 10:46:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E7=94=B5=E9=87=8F=E6=8A=A5=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwMeterController.java | 1 + .../service/kw/impl/KwMeterServiceImpl.java | 4 +++ .../resources/mapper/KwMeterDataMapper.xml | 29 +++++++++---------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 73bd17425..6b05e395b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -67,6 +67,7 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); kwMeter.setTenantId(getTenantId()); kwMeter.setBoxId(0L); + kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); return kwMeterService.saveOrUpdate(kwMeter); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java index e0e46ca22..94a2bc165 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; @@ -38,8 +39,11 @@ public class KwMeterServiceImpl implements KwMeterService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreateTime(new Date()); + record.setUpdateTime(new Date()); kwMeterMapper.insertSelective(record); } else { + record.setUpdateTime(new Date()); kwMeterMapper.updateByPrimaryKeySelective(record); } return new ResultData(); diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 775d5ed50..50d96a68b 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -101,8 +101,8 @@