From a672e4e8c05be9c763943a06cfe5220ef217934c Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 23 Jan 2021 20:07:44 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 66d08eb..47aae8a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -101,11 +101,13 @@
                     queryUse.setIsOver(Dictionary.FLAG_NO_N);
                     break;
                 case "2":
-                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
-                    queryUse.setIsOver(Dictionary.FLAG_YES_Y);
+                    queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
+                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
+                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                     break;
                 case "3":
-                    queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
+                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
+                    queryUse.setIsOver(Dictionary.FLAG_YES_Y);
                     break;
                 default:
                     queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
@@ -285,6 +287,7 @@
         int i = projServicesService.modify(services);
         if (i > 0) {
             //发送微信公众号提醒
+            services=projServicesService.findById(services.getId());
             UniformMsgParam uniformMsgParam=new UniformMsgParam(services.getCompanyId(),UniformMsgParam.GZH_YYCG);
             uniformMsgParam.put("serviceId",services.getId());
             rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());

--
Gitblit v1.9.1