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/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index a1ac70854..0329f478e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -69,7 +69,28 @@ public class WxBusinessController extends BaseController { wxBusiness.setStartdate(sdT.parse(sd.format(sDate)+" 00:00:00")); wxBusiness.setEnddate(sdT.parse(sd.format(eDate)+" 23:59:59")); } - return wxBusinessService.businessDataList(wxBusiness); + + List> mapList = wxBusinessService.businessDataList(wxBusiness); + for (Map map:mapList) { + if(map.get("rent") == null){ + map.put("rent",0); + } + if(map.get("sale") == null){ + map.put("sale",0); + map.put("rentSaleRate",0); + continue; + } + BigDecimal sale = new BigDecimal(map.get("sale").toString()); + BigDecimal rent = new BigDecimal(map.get("rent").toString()); + if(sale.doubleValue() <= 0){ + map.put("rentSaleRate",0); + continue; + }else { + BigDecimal divide = rent.divide(sale, 2, BigDecimal.ROUND_HALF_UP); + map.put("rentSaleRate", divide); + } + } + return new ResultData(mapList); } @ApiOperation("导出业态数据列表") @@ -86,7 +107,7 @@ public class WxBusinessController extends BaseController { wxBusiness.setStartdate(sdT.parse(sd.format(sDate)+" 00:00:00")); wxBusiness.setEnddate(sdT.parse(sd.format(eDate)+" 23:59:59")); } - List> dataList = (List>)wxBusinessService.businessDataList(wxBusiness).data; + List> dataList = wxBusinessService.businessDataList(wxBusiness); List exeList = new ArrayList<>(); for (Map m:dataList) { WxBusinessDataVo businessDataVo = new WxBusinessDataVo(); 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'); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 00a95a37a..57496cfdf 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; import java.util.List; +import java.util.Map; public interface WxBusinessService { @@ -42,7 +43,7 @@ public interface WxBusinessService { - ResultData businessDataList(WxBusiness wxBusiness); + List> businessDataList(WxBusiness wxBusiness); ResultData devoteList(WxBusiness wxBusiness,Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 9e5f09641..4791fd635 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -57,8 +57,8 @@ public class WxBusinessServiceImpl implements WxBusinessService { @Override - public ResultData businessDataList(WxBusiness wxBusiness) { - return new ResultData(wxBusinessMapper.businessDataList(wxBusiness)); + public List> businessDataList(WxBusiness wxBusiness) { + return wxBusinessMapper.businessDataList(wxBusiness); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 82249435e..4eb47ca0f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -231,10 +231,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.setPeriod(count); bill.setIsPreview(EnumIsPreview.YES.getCode()); bill.setShopInfo(getShopInfoStr(record)); - bill.setRevenue(0l); + bill.setRevenue(0L); bill.setLatePayRatio(0); - bill.setPay(0l); - bill.setIsDel(0); + bill.setPay(0L); + bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + bill.setShopId(record.getShopId()); setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); count++; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 889b4ab57..b3af7eff7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -465,10 +465,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setPeriod(count); bill.setIsPreview(EnumIsPreview.YES.getCode()); bill.setShopInfo(getShopInfoStr(record)); - bill.setRevenue(0l); + bill.setRevenue(0L); bill.setLatePayRatio(0); - bill.setPay(0l); - bill.setIsDel(0); + bill.setPay(0L); + bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + bill.setShopId(record.getShopId()); + bill.setShopInfo(record.getRentInfo()); setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); count++; } 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 @@