|
@@ -27,7 +27,9 @@ import com.factory.wx.service.WxService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -248,11 +250,14 @@ public class PlanPassFAServiceImpl implements PlanPassFAService {
|
|
|
.build());
|
|
|
|
|
|
//向下一级别发送提醒
|
|
|
+ Date date = new Date();
|
|
|
+ SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ //发送微信消息
|
|
|
wxService.sendWechatMessage(SendMsgReq.builder()
|
|
|
.toUserId(approvalUserRes.getUserId())
|
|
|
.title("计划放行提醒")
|
|
|
- .content("您有待放行的计划审批,请登录小程序查看")
|
|
|
- .endTime("2021-08-04")
|
|
|
+ .content("您有待放行的计划审批,请登录小程序查看【计划放行】")
|
|
|
+ .endTime(ft.format(date))
|
|
|
.fromUserId(planApprovalTaskReq.getUserId())
|
|
|
.build());
|
|
|
} else {
|