From 044a784761b5a7c43c227871d92e3d0d275bcaff Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 18:59:57 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index 5c53810..831ac1d 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -12,6 +12,7 @@
import com.dg.core.util.Snowflake;
import com.dg.core.util.TestDate;
import com.dg.core.util.WxUtil;
+import com.iceyyy.workday.WorkUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -106,7 +107,7 @@
GuideEvolveEntity entity = new GuideEvolveEntity();
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setState("10");
+ entity.setState("8");
entity.setDepartmentalId(sysUser.getDepartmentId());
entity.setToUserId(guideRepairOrder.getGuideUserId() + "");
entity.setFromUserId(guideRepairOrder.getSubmitUserId());
@@ -117,6 +118,8 @@
//超时时间设置业务结束
//消息推送
this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
+ //短信发送
+ smsUtil.sendSmsSubmit(sysUser.getPhonenumber(),sysUser.getUserName());
guideEvolveMapper.insertConfig(entity);
}
} else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
@@ -220,6 +223,8 @@
if (guideRepairOrder!=null){
this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
}
+ //短信发送
+ smsUtil.sendSmsSubmit(sysUser.getPhonenumber(),sysUser.getUserName());
sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
return sysUserMapper.updateById(sysUser);
} else if (order.getState().equals("10")) {
@@ -230,6 +235,8 @@
sysUserMapper.updateById(sysUserFrom);
GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
.eq(GuideRepairOrder::getId, order.getGuideId()));
+ //短信发送
+ smsUtil.sendSmsSubmit(sysUserTo.getPhonenumber(),sysUserTo.getUserName());
if (guideRepairOrder!=null){
this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(),guideRepairOrder);
}
@@ -278,7 +285,9 @@
LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);//今天结束时间
TestDate td = new TestDate();
DateTime dateTimeUser= DateTime.now();
- if (td.isWeekday(dateTimeUser)){
+ String format="YYYYMMdd";
+ String dateTimeToday=dateTimeUser.toString(format);
+ if (!WorkUtils.isWorkendDay(dateTimeToday)){
if ( LocalDateTime.now().isAfter(startTime)&&LocalDateTime.now().isBefore(morningStartTime)){//提交时间是上午上班前
guideRepairOrder.setTimeoutTime(LocalDate.now().
atTime(9+automessageSysSettings.getTimeoutNotificationNum(),0,0));
@@ -322,5 +331,10 @@
// smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
}
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
}
--
Gitblit v1.7.1