From 6c865b0625b480925bc9516538fb1eec1484aa45 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 22 Apr 2019 15:43:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201904221513__ADD_FLOW.sql | 27 +++++++++++++++++++ .../java/com/iformall/utils/DateUtils.java | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201904221513__ADD_FLOW.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904221513__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904221513__ADD_FLOW.sql new file mode 100644 index 000000000..1a41872f3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904221513__ADD_FLOW.sql @@ -0,0 +1,27 @@ +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 + (205925985009271111, '789', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的合同已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 345), + (205925985009271112, '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, 346), + (205925985009271113, '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, 347), + (205925985009271114, '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, 348), + (205925985009271115, '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, 349), + (205925985009271116, '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, 350); diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 1c466d402..a3ce3a0a4 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -967,7 +967,7 @@ public class DateUtils { Calendar ca = Calendar.getInstance(); ca.setTime(date); ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH)); - return ca.getTime(); + return DateUtils.getDateFromString(DateUtils.date2String(ca.getTime(),"yyyy-MM-dd")+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); } /**