Skip to content

D
dd_school
Commit c1ef26fd by xuwenhao
Options

修改分班规则、消息通知模板

parent c999cb1f
Showing with 472 additions and 185 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/auditorium/SchoolAuditoriumController.java
package yangtz.cs.liu.campus.controller.auditorium; package yangtz.cs.liu.campus.controller.auditorium;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -42,6 +44,7 @@ import yangtz.cs.liu.campus.service.auditorium.ISchoolAuditoriumService; ...@@ -42,6 +44,7 @@ import yangtz.cs.liu.campus.service.auditorium.ISchoolAuditoriumService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo; import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO; import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
...@@ -167,17 +170,30 @@ public class SchoolAuditoriumController extends BaseController ...@@ -167,17 +170,30 @@ public class SchoolAuditoriumController extends BaseController
schoolAuditorium.setApplyTime(DateUtils.getNowDate()); schoolAuditorium.setApplyTime(DateUtils.getNowDate());
schoolAuditoriumService.submitApply(schoolAuditorium, userName, AUDITORIUMAPPLY, new HashMap<>()); schoolAuditoriumService.submitApply(schoolAuditorium, userName, AUDITORIUMAPPLY, new HashMap<>());
//转换时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = schoolAuditorium.getApplyTime();
String applyTime = format.format(time);
/**发送模板消息到分管领导*/ /**发送模板消息到分管领导*/
AuditoriumTemplate template = new AuditoriumTemplate(); //获取用户openid
String openId = teacherService.getOpenIdByUserId(schoolAuditorium.getLeadershipId()); String openId = teacherService.getOpenIdByUserId(schoolAuditorium.getLeadershipId());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setFirst("您好，您有礼堂预约申请等待审批。"); map.put("toUserOpenId",openId);
template.setApplyUser(schoolAuditorium.getApplyName()); map.put("applyTime",applyTime);
template.setContent(schoolAuditorium.getActivityName()); map.put("remark","请您尽快处理。");
template.setApplyTime(schoolAuditorium.getApplyTime()); map.put("applyUser",schoolAuditorium.getApplyName());
template.setRemark("请您尽快处理。"); map.put("content",schoolAuditorium.getActivityName());
wxApiService.sendAuditoriumTemplate(template); map.put("first","您好，您有礼堂预约申请等待审批!");
VxTemlateSendApi.sendVxTemlate(map);
// AuditoriumTemplate template = new AuditoriumTemplate();
// template.setToUserOpenId(openId);
// template.setFirst("您好，您有礼堂预约申请等待审批。");
// template.setApplyUser(schoolAuditorium.getApplyName());
// template.setContent(schoolAuditorium.getActivityName());
// template.setApplyTime(schoolAuditorium.getApplyTime());
// template.setRemark("请您尽快处理。");
// wxApiService.sendAuditoriumTemplate(template);
return AjaxResult.success("提交成功"); return AjaxResult.success("提交成功");
} }
...@@ -229,20 +245,25 @@ public class SchoolAuditoriumController extends BaseController ...@@ -229,20 +245,25 @@ public class SchoolAuditoriumController extends BaseController
schoolAuditoriumService.updateById(leave); schoolAuditoriumService.updateById(leave);
/**发送模板消息到申请人，审批结果*/ /**发送模板消息到申请人，审批结果*/
LeaveResultTemplate template = new LeaveResultTemplate();
template.setFirst("您好，您的礼堂预约申请已回复。");
//获取申请人openId //获取申请人openId
String openId = teacherService.getOpenIdByUserId(leave.getApplyId()); String openId = teacherService.getOpenIdByUserId(leave.getApplyId());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setResult(flag ? "已通过" : "已驳回"); map.put("toUserOpenId",openId);
template.setRemark("审批留言： "+ variables.get("comment")); map.put("first","您好，您的礼堂预约申请已回复。");
List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity()); map.put("content",flag ? "已通过" : "已驳回");
if(StringUtils.isNotNull(list) && list.size() > 0){ map.put("remark","审批留言： "+ variables.get("comment"));
HistoricActivity activity = list.get(0); VxTemlateSendApi.sendVxTemlate(map);
template.setAuditTime(activity.getEndTime()); // LeaveResultTemplate template = new LeaveResultTemplate();
} // template.setFirst("您好，您的礼堂预约申请已回复。");
wxApiService.sendLeaveResultTemplate(template); // template.setToUserOpenId(openId);
// template.setResult(flag ? "已通过" : "已驳回");
// template.setRemark("审批留言： "+ variables.get("comment"));
// List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity());
// if(StringUtils.isNotNull(list) && list.size() > 0){
// HistoricActivity activity = list.get(0);
// template.setAuditTime(activity.getEndTime());
// }
// wxApiService.sendLeaveResultTemplate(template);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/purchase/SchoolPurchaseController.java
...@@ -26,15 +26,14 @@ import yangtz.cs.liu.campus.service.assetsType.ISchoolAssetsTypeService; ...@@ -26,15 +26,14 @@ import yangtz.cs.liu.campus.service.assetsType.ISchoolAssetsTypeService;
import yangtz.cs.liu.campus.service.purchase.ISchoolPurchaseDetailService; import yangtz.cs.liu.campus.service.purchase.ISchoolPurchaseDetailService;
import yangtz.cs.liu.campus.service.purchase.ISchoolPurchaseService; import yangtz.cs.liu.campus.service.purchase.ISchoolPurchaseService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.purchase.SchoolPurchaseDetailsVo; import yangtz.cs.liu.campus.vo.purchase.SchoolPurchaseDetailsVo;
import yangtz.cs.liu.campus.vo.purchase.PurchaseVo; import yangtz.cs.liu.campus.vo.purchase.PurchaseVo;
import yangtz.cs.liu.campus.vo.purchase.SchoolPurchaseVo; import yangtz.cs.liu.campus.vo.purchase.SchoolPurchaseVo;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
import java.util.ArrayList; import java.text.SimpleDateFormat;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -169,17 +168,33 @@ public class SchoolPurchaseController extends BaseController { ...@@ -169,17 +168,33 @@ public class SchoolPurchaseController extends BaseController {
schoolPurchase.setApplyTime(DateUtils.getNowDate()); schoolPurchase.setApplyTime(DateUtils.getNowDate());
schoolPurchaseService.submitApply(schoolPurchase, userName, PURCHASEREQUEST, new HashMap<>()); schoolPurchaseService.submitApply(schoolPurchase, userName, PURCHASEREQUEST, new HashMap<>());
//转换时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = schoolPurchase.getApplyTime();
String applyTime = format.format(time);
/**发送模板消息到处室领导*/ /**发送模板消息到处室领导*/
PurchaseTemplate template = new PurchaseTemplate(); //获取openid
//String openId = userService.getOpenIdByUserId(schoolPurchase.getHandUserId1());
String openId = teacherService.getOpenIdByUserId(schoolPurchase.getHandUserId1()); String openId = teacherService.getOpenIdByUserId(schoolPurchase.getHandUserId1());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setFirst("您好，您有采购申请等待审批。"); map.put("toUserOpenId",openId);
template.setApplyUser(schoolPurchase.getApplyUser()); map.put("applyTime",applyTime);
template.setContent(schoolPurchase.getPurchaseName()); map.put("remark","请您尽快处理。");
template.setApplyTime(schoolPurchase.getApplyTime()); map.put("applyUser",schoolPurchase.getApplyUser());
template.setRemark("请您尽快处理。"); map.put("content",schoolPurchase.getPurchaseName());
wxApiService.sendPurchaseTemplate(template); map.put("first","您好，您有采购申请等待审批。");
VxTemlateSendApi.sendVxTemlate(map);
// PurchaseTemplate template = new PurchaseTemplate();
// //String openId = userService.getOpenIdByUserId(schoolPurchase.getHandUserId1());
//
// template.setToUserOpenId(openId);
// template.setFirst("您好，您有采购申请等待审批。");
// template.setApplyUser(schoolPurchase.getApplyUser());
// template.setContent(schoolPurchase.getPurchaseName());
// template.setApplyTime(schoolPurchase.getApplyTime());
// template.setRemark("请您尽快处理。");
// wxApiService.sendPurchaseTemplate(template);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
...@@ -227,34 +242,62 @@ public class SchoolPurchaseController extends BaseController { ...@@ -227,34 +242,62 @@ public class SchoolPurchaseController extends BaseController {
} }
/** 修改任务结果 */ /** 修改任务结果 */
schoolPurchaseService.updateById(schoolPurchase); schoolPurchaseService.updateById(schoolPurchase);
/**发送模板消息到申请人，审批结果*/ /**发送模板消息到申请人，审批结果*/
LeaveResultTemplate template = new LeaveResultTemplate(); //获取openid
template.setFirst("您好，您的采购申请已回复。");
//获取申请人openId
//String openId = userService.getOpenIdByUserId(schoolPurchase.getApplyId());
String openId = teacherService.getOpenIdByUserId(schoolPurchase.getApplyId()); String openId = teacherService.getOpenIdByUserId(schoolPurchase.getApplyId());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setResult(flag ? "已通过" : "已驳回"); map.put("toUserOpenId",openId);
template.setRemark("审批留言： "+ variables.get("comment")); map.put("first","您好，您的采购申请已回复。");
List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity()); map.put("content",flag ? "已通过" : "已驳回");
if(StringUtils.isNotNull(list) && list.size() > 0){ map.put("remark","审批留言： "+ variables.get("comment"));
HistoricActivity activity = list.get(0); VxTemlateSendApi.sendVxTemlate(map);
template.setAuditTime(activity.getEndTime());
} // LeaveResultTemplate template = new LeaveResultTemplate();
wxApiService.sendLeaveResultTemplate(template); // template.setFirst("您好，您的采购申请已回复。");
// //获取申请人openId
// //String openId = userService.getOpenIdByUserId(schoolPurchase.getApplyId());
//
// template.setToUserOpenId(openId);
// template.setResult(flag ? "已通过" : "已驳回");
// template.setRemark("审批留言： "+ variables.get("comment"));
// List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity());
// if(StringUtils.isNotNull(list) && list.size() > 0){
// HistoricActivity activity = list.get(0);
// template.setAuditTime(activity.getEndTime());
// }
// wxApiService.sendLeaveResultTemplate(template);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
//转换时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = schoolPurchase.getApplyTime();
String applyTime = format.format(time);
/**发送模板消息到财务领导*/ /**发送模板消息到财务领导*/
PurchaseTemplate template = new PurchaseTemplate(); //获取openid
//String openId = userService.getOpenIdByUserId(schoolPurchase.getHandUserId2());
String openId = teacherService.getOpenIdByUserId(schoolPurchase.getHandUserId2()); String openId = teacherService.getOpenIdByUserId(schoolPurchase.getHandUserId2());
template.setToUserOpenId(openId);
template.setFirst("您好，您有采购申请等待审批。"); Map<String,Object> map = new HashMap<>();
template.setApplyUser(schoolPurchase.getApplyUser()); map.put("toUserOpenId",openId);
template.setContent(schoolPurchase.getPurchaseName()); map.put("applyTime",applyTime);
template.setApplyTime(schoolPurchase.getApplyTime()); map.put("remark","请您尽快处理。");
template.setRemark("请您尽快处理。"); map.put("applyUser",schoolPurchase.getApplyUser());
wxApiService.sendPurchaseTemplate(template); map.put("content",schoolPurchase.getPurchaseName());
map.put("first","您好，您有采购申请等待审批。");
VxTemlateSendApi.sendVxTemlate(map);
// PurchaseTemplate template = new PurchaseTemplate();
// //String openId = userService.getOpenIdByUserId(schoolPurchase.getHandUserId2());
//
// template.setToUserOpenId(openId);
// template.setFirst("您好，您有采购申请等待审批。");
// template.setApplyUser(schoolPurchase.getApplyUser());
// template.setContent(schoolPurchase.getPurchaseName());
// template.setApplyTime(schoolPurchase.getApplyTime());
// template.setRemark("请您尽快处理。");
// wxApiService.sendPurchaseTemplate(template);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
...@@ -310,7 +353,8 @@ public class SchoolPurchaseController extends BaseController { ...@@ -310,7 +353,8 @@ public class SchoolPurchaseController extends BaseController {
@GetMapping("/selectRegisterById/{id}") @GetMapping("/selectRegisterById/{id}")
public AjaxResult selectRegisterById(@PathVariable("id") Long id) { public AjaxResult selectRegisterById(@PathVariable("id") Long id) {
// return AjaxResult.success(schoolPurchaseService.getById(id)); // return AjaxResult.success(schoolPurchaseService.getById(id));
// TODO 修改采购信息详情
//修改采购信息详情
SchoolPurchase schoolPurchase = schoolPurchaseService.getById(id); SchoolPurchase schoolPurchase = schoolPurchaseService.getById(id);
PurchaseVo purchaseVo = new PurchaseVo(); PurchaseVo purchaseVo = new PurchaseVo();
BeanUtils.copyProperties(schoolPurchase,purchaseVo); BeanUtils.copyProperties(schoolPurchase,purchaseVo);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDepartmentBudget/SchoolDepartmentBudgetController.java
...@@ -24,10 +24,13 @@ import yangtz.cs.liu.campus.domain.temp.DepartmentBudgetTemplate; ...@@ -24,10 +24,13 @@ import yangtz.cs.liu.campus.domain.temp.DepartmentBudgetTemplate;
import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate; import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetService; import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.schoolDepartmentBudget.SchoolDepartmentBudgetVo; import yangtz.cs.liu.campus.vo.schoolDepartmentBudget.SchoolDepartmentBudgetVo;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -156,15 +159,30 @@ public class SchoolDepartmentBudgetController extends BaseController ...@@ -156,15 +159,30 @@ public class SchoolDepartmentBudgetController extends BaseController
schoolDepartmentBudgetService.submitApply(schoolDepartmentBudget,userName,DEPARTMENTBUDGET,new HashMap<>()); schoolDepartmentBudgetService.submitApply(schoolDepartmentBudget,userName,DEPARTMENTBUDGET,new HashMap<>());
/**发送模板消息到分管领导*/ /**发送模板消息到分管领导*/
DepartmentBudgetTemplate template = new DepartmentBudgetTemplate(); //转换时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = schoolDepartmentBudget.getApplyTime();
String applyTime = format.format(time);
//获取openid
String openId = teacherService.getOpenIdByUserId(schoolDepartmentBudget.getLeadershipId()); String openId = teacherService.getOpenIdByUserId(schoolDepartmentBudget.getLeadershipId());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setFirst("您好，您有科室预算申请等待审批。"); map.put("toUserOpenId",openId);
template.setApplyUser(schoolDepartmentBudget.getApplyName()); map.put("applyTime",applyTime);
template.setContent(schoolDepartmentBudget.getYear() + "年度" + schoolDepartmentBudget.getDeptName() + "预算申请"); map.put("remark","请您尽快处理。");
template.setApplyTime(schoolDepartmentBudget.getApplyTime()); map.put("applyUser",schoolDepartmentBudget.getApplyName());
template.setRemark("请您尽快处理。"); map.put("content",schoolDepartmentBudget.getYear() + "年度" + schoolDepartmentBudget.getDeptName() + "预算申请");
wxApiService.sendDepartmentBudgetTemplate(template); map.put("first","您好，您有科室预算申请等待审批。");
VxTemlateSendApi.sendVxTemlate(map);
// DepartmentBudgetTemplate template = new DepartmentBudgetTemplate();
// template.setToUserOpenId(openId);
// template.setFirst("您好，您有科室预算申请等待审批。");
// template.setApplyUser(schoolDepartmentBudget.getApplyName());
// template.setContent(schoolDepartmentBudget.getYear() + "年度" + schoolDepartmentBudget.getDeptName() + "预算申请");
// template.setApplyTime(schoolDepartmentBudget.getApplyTime());
// template.setRemark("请您尽快处理。");
// wxApiService.sendDepartmentBudgetTemplate(template);
return AjaxResult.success("提交成功"); return AjaxResult.success("提交成功");
} }
...@@ -200,7 +218,7 @@ public class SchoolDepartmentBudgetController extends BaseController ...@@ -200,7 +218,7 @@ public class SchoolDepartmentBudgetController extends BaseController
SchoolDepartmentBudget leave = schoolDepartmentBudgetService.getOne(wrapper); SchoolDepartmentBudget leave = schoolDepartmentBudgetService.getOne(wrapper);
Boolean flag = Boolean.parseBoolean(variables.get("pass").toString()); Boolean flag = Boolean.parseBoolean(variables.get("pass").toString());
/**判断流程是否结束,如果结束则更新礼堂预约状态*/ /**判断流程是否结束,如果结束则更新科室预算状态*/
ProcessInstance rpi = runtimeService ProcessInstance rpi = runtimeService
.createProcessInstanceQuery()//创建流程实例查询对象 .createProcessInstanceQuery()//创建流程实例查询对象
.processInstanceId(instanceId) .processInstanceId(instanceId)
...@@ -212,20 +230,26 @@ public class SchoolDepartmentBudgetController extends BaseController ...@@ -212,20 +230,26 @@ public class SchoolDepartmentBudgetController extends BaseController
schoolDepartmentBudgetService.updateById(leave); schoolDepartmentBudgetService.updateById(leave);
/**发送模板消息到申请人，审批结果*/ /**发送模板消息到申请人，审批结果*/
LeaveResultTemplate template = new LeaveResultTemplate();
template.setFirst("您好，您的科室预算申请已回复。");
//获取申请人openId //获取申请人openId
String openId = teacherService.getOpenIdByUserId(leave.getApplyId()); String openId = teacherService.getOpenIdByUserId(leave.getApplyId());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setResult(flag ? "已通过" : "已驳回"); map.put("toUserOpenId",openId);
template.setRemark("审批留言： "+ variables.get("comment")); map.put("first","您好，您的科室预算申请已回复。");
List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity()); map.put("content",flag ? "已通过" : "已驳回");
if(StringUtils.isNotNull(list) && list.size() > 0){ map.put("remark","审批留言： "+ variables.get("comment"));
HistoricActivity activity = list.get(0); VxTemlateSendApi.sendVxTemlate(map);
template.setAuditTime(activity.getEndTime());
}
wxApiService.sendLeaveResultTemplate(template);
// LeaveResultTemplate template = new LeaveResultTemplate();
// template.setFirst("您好，您的科室预算申请已回复。");
// template.setToUserOpenId(openId);
// template.setResult(flag ? "已通过" : "已驳回");
// template.setRemark("审批留言： "+ variables.get("comment"));
// List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity());
// if(StringUtils.isNotNull(list) && list.size() > 0){
// HistoricActivity activity = list.get(0);
// template.setAuditTime(activity.getEndTime());
// }
// wxApiService.sendLeaveResultTemplate(template);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
//说明流程实例结束了 //说明流程实例结束了
...@@ -239,20 +263,26 @@ public class SchoolDepartmentBudgetController extends BaseController ...@@ -239,20 +263,26 @@ public class SchoolDepartmentBudgetController extends BaseController
schoolDepartmentBudgetService.updateById(leave); schoolDepartmentBudgetService.updateById(leave);
/**发送模板消息到申请人，审批结果*/ /**发送模板消息到申请人，审批结果*/
LeaveResultTemplate template = new LeaveResultTemplate();
template.setFirst("您好，您的科室预算申请已回复。");
//获取申请人openId //获取申请人openId
String openId = teacherService.getOpenIdByUserId(leave.getApplyId()); String openId = teacherService.getOpenIdByUserId(leave.getApplyId());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setResult(flag ? "已通过" : "已驳回"); map.put("toUserOpenId",openId);
template.setRemark("审批留言： "+ variables.get("comment")); map.put("first","您好，您的科室预算申请已回复。");
List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity()); map.put("content",flag ? "已通过" : "已驳回");
if(StringUtils.isNotNull(list) && list.size() > 0){ map.put("remark","审批留言： "+ variables.get("comment"));
HistoricActivity activity = list.get(0); VxTemlateSendApi.sendVxTemlate(map);
template.setAuditTime(activity.getEndTime());
}
wxApiService.sendLeaveResultTemplate(template);
// LeaveResultTemplate template = new LeaveResultTemplate();
// template.setFirst("您好，您的科室预算申请已回复。");
// template.setToUserOpenId(openId);
// template.setResult(flag ? "已通过" : "已驳回");
// template.setRemark("审批留言： "+ variables.get("comment"));
// List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity());
// if(StringUtils.isNotNull(list) && list.size() > 0){
// HistoricActivity activity = list.get(0);
// template.setAuditTime(activity.getEndTime());
// }
// wxApiService.sendLeaveResultTemplate(template);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schooloffical/SchoolOfficalController.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schooloffical; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schooloffical;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.core.utils.HolidayDateUtil;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -32,6 +33,7 @@ import yangtz.cs.liu.campus.service.pubFile.IPubFileService; ...@@ -32,6 +33,7 @@ import yangtz.cs.liu.campus.service.pubFile.IPubFileService;
import yangtz.cs.liu.campus.service.schooloffical.ISchoolOfficalService; import yangtz.cs.liu.campus.service.schooloffical.ISchoolOfficalService;
import yangtz.cs.liu.campus.service.schooloffical.ISchoolOfficialFlowService; import yangtz.cs.liu.campus.service.schooloffical.ISchoolOfficialFlowService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.schoolOfficial.SchoolOfficialFlowVo; import yangtz.cs.liu.campus.vo.schoolOfficial.SchoolOfficialFlowVo;
import yangtz.cs.liu.campus.vo.schoolOfficial.SchoolOfficialVo; import yangtz.cs.liu.campus.vo.schoolOfficial.SchoolOfficialVo;
import yangtz.cs.liu.campus.vo.schooloffical.SchoolOfficalVO; import yangtz.cs.liu.campus.vo.schooloffical.SchoolOfficalVO;
...@@ -39,7 +41,11 @@ import yangtz.cs.liu.wechat.service.api.IWxApiService; ...@@ -39,7 +41,11 @@ import yangtz.cs.liu.wechat.service.api.IWxApiService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import static yangtz.cs.liu.campus.constant.OfficalConstant.*; import static yangtz.cs.liu.campus.constant.OfficalConstant.*;
...@@ -159,17 +165,35 @@ public class SchoolOfficalController extends BaseController { ...@@ -159,17 +165,35 @@ public class SchoolOfficalController extends BaseController {
} }
/**发送模板消息到批阅人*/ /**发送模板消息到批阅人*/
// TODO 模板消息
public void send(SchoolOfficialVo vo){ public void send(SchoolOfficialVo vo){
OfficalTemplate template = new OfficalTemplate(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
template.setFirst("您好，您有一个新的公文需要批阅"); Date time = DateUtils.getNowDate();
//String openId = userService.getOpenIdByUserId(vo.getReceiveUser()); String applyTime = format.format(time);
String applyTime1 = HolidayDateUtil.format1.format(vo.getDeadline());
//获取openid
String openId = teacherService.getOpenIdByUserId(vo.getReceiveUser()); String openId = teacherService.getOpenIdByUserId(vo.getReceiveUser());
template.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
template.setTitle(vo.getIssuedName()); map.put("toUserOpenId",openId);
template.setFinishTime(vo.getDeadline()); map.put("applyTime",applyTime);
template.setContent("请领导批阅"); map.put("remark","请您于" + applyTime1 + "前前往电脑端进行处理。");
template.setRemark("请您前往电脑端进行处理"); map.put("applyUser","");
String s = wxApiService.sendOfficalTemplate(template); map.put("content",vo.getIssuedName());
map.put("first","您好，您有一个新的公文需要批阅");
VxTemlateSendApi.sendVxTemlate(map);
// OfficalTemplate template = new OfficalTemplate();
// template.setFirst("您好，您有一个新的公文需要批阅");
// //String openId = userService.getOpenIdByUserId(vo.getReceiveUser());
//
// template.setToUserOpenId(openId);
// template.setTitle(vo.getIssuedName());
// template.setFinishTime(vo.getDeadline());
// template.setContent("请领导批阅");
// template.setRemark("请您前往电脑端进行处理");
// String s = wxApiService.sendOfficalTemplate(template);
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/student/SchoolStudentLeaveController.java
...@@ -39,14 +39,18 @@ import yangtz.cs.liu.campus.service.student.ISchoolStudentLeaveService; ...@@ -39,14 +39,18 @@ import yangtz.cs.liu.campus.service.student.ISchoolStudentLeaveService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO; import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.campus.vo.student.StudentLeaveVO; import yangtz.cs.liu.campus.vo.student.StudentLeaveVO;
import yangtz.cs.liu.wechat.domain.TemplateInfo;
import yangtz.cs.liu.wechat.domain.template.LeaveStateTemplate; import yangtz.cs.liu.wechat.domain.template.LeaveStateTemplate;
import yangtz.cs.liu.wechat.domain.template.LeaveTemplate; import yangtz.cs.liu.wechat.domain.template.LeaveTemplate;
import yangtz.cs.liu.wechat.domain.template.StudentLeaveTemplate; import yangtz.cs.liu.wechat.domain.template.StudentLeaveTemplate;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
import yangtz.cs.liu.wechat.utils.DateUtil;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -232,17 +236,45 @@ public class SchoolStudentLeaveController extends BaseController { ...@@ -232,17 +236,45 @@ public class SchoolStudentLeaveController extends BaseController {
String userName = getUsername(); String userName = getUsername();
schoolStudentLeaveService.submitApply(schoolStudentLeave, userName, STUDENTLEAVE, new HashMap<>()); schoolStudentLeaveService.submitApply(schoolStudentLeave, userName, STUDENTLEAVE, new HashMap<>());
/** 提交请假模板消息 */ //转换时间
LeaveTemplate leaveTemplate = new LeaveTemplate(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = schoolStudentLeave.getApplyTime();
String applyTime = format.format(time);
//获取openid
String openId = userService.getOpenIdByUserId(schoolStudentLeave.getHandUserId()); String openId = userService.getOpenIdByUserId(schoolStudentLeave.getHandUserId());
leaveTemplate.setIdentity(0); Map<String,Object> map = new HashMap<>();
leaveTemplate.setToUserOpenId(openId); map.put("toUserOpenId",openId);
leaveTemplate.setReasonForLeave(schoolStudentLeave.getLeaveReason()); map.put("applyTime",applyTime);
leaveTemplate.setLeaveStartTime(schoolStudentLeave.getStartTime()); map.put("remark","请假原因：" + schoolStudentLeave.getLeaveReason());
leaveTemplate.setLeaveEndTime(schoolStudentLeave.getEndTime()); map.put("applyUser",schoolStudentLeave.getStudentName());
leaveTemplate.setUserName(schoolStudentLeave.getStudentName());
Date leaveStartTime = schoolStudentLeave.getStartTime();
Date leaveEndTime = schoolStudentLeave.getEndTime();
Double hours = DateUtil.getHoursBetween2Date(leaveStartTime, leaveEndTime);
String content = "";
if (hours < 24.0) content = hours + "小时";
else {
Integer t1 = (int) (hours / 24);
Double d2 = hours - 24 * t1;
if (d2 == 0.0) content = t1 + "天";
else content = t1 + "天" + d2 + "小时";
}
map.put("content",content);
map.put("first","您有一个待审批的请假事项");
VxTemlateSendApi.sendVxTemlate(map);
/** 提交请假模板消息 */
// LeaveTemplate leaveTemplate = new LeaveTemplate();
// leaveTemplate.setIdentity(0);
// leaveTemplate.setToUserOpenId(openId);
// leaveTemplate.setReasonForLeave(schoolStudentLeave.getLeaveReason());
// leaveTemplate.setLeaveStartTime(schoolStudentLeave.getStartTime());
// leaveTemplate.setLeaveEndTime(schoolStudentLeave.getEndTime());
// leaveTemplate.setUserName(schoolStudentLeave.getStudentName());
return AjaxResult.success(wxApiService.sendTemplate(leaveTemplate)); return AjaxResult.success("提交成功");
} }
/** /**
...@@ -285,36 +317,49 @@ public class SchoolStudentLeaveController extends BaseController { ...@@ -285,36 +317,49 @@ public class SchoolStudentLeaveController extends BaseController {
leave.setState(REFUSE); leave.setState(REFUSE);
} }
schoolStudentLeaveService.updateById(leave); schoolStudentLeaveService.updateById(leave);
//正常的话，销假有自己的接口，能进到这一步，一般是班主任或者级部主任驳回了请假申请
LeaveResultTemplate resultTemplate = new LeaveResultTemplate();
resultTemplate.setFirst("您好，" + leave.getStudentName() + "同学的请假申请已回复");
resultTemplate.setResult("已驳回");
resultTemplate.setRemark("审批留言： " + comment);
SchoolStudentParent parent = schoolStudentParentService.getById(leave.getApplyUserId());
//获取请假申请人openId //获取请假申请人openId
//String openId = userService.getOpenIdByUserId(parent.getUserId()); //String openId = userService.getOpenIdByUserId(parent.getUserId());
String openId = schoolStudentParentService.getOpenIdById(leave.getApplyUserId()); String openId = schoolStudentParentService.getOpenIdById(leave.getApplyUserId());
resultTemplate.setToUserOpenId(openId);
List<HistoricActivity> list = processService.selectHistoryList(instanceId, new HistoricActivity()); Map<String,Object> map = new HashMap<>();
if (StringUtils.isNotNull(list) && list.size() > 0) { map.put("toUserOpenId",openId);
HistoricActivity activity = list.get(0); map.put("first","您好，" + leave.getStudentName() + "同学的请假申请已回复");
resultTemplate.setAuditTime(activity.getEndTime()); map.put("content","已驳回");
} map.put("remark","审批留言： " + comment);
wxApiService.sendLeaveResultTemplate(resultTemplate); VxTemlateSendApi.sendVxTemlate(map);
//正常的话，销假有自己的接口，能进到这一步，一般是班主任或者级部主任驳回了请假申请
// LeaveResultTemplate resultTemplate = new LeaveResultTemplate();
// resultTemplate.setFirst("您好，" + leave.getStudentName() + "同学的请假申请已回复");
// resultTemplate.setResult("已驳回");
// resultTemplate.setRemark("审批留言： " + comment);
// SchoolStudentParent parent = schoolStudentParentService.getById(leave.getApplyUserId());
//
// resultTemplate.setToUserOpenId(openId);
// List<HistoricActivity> list = processService.selectHistoryList(instanceId, new HistoricActivity());
// if (StringUtils.isNotNull(list) && list.size() > 0) {
// HistoricActivity activity = list.get(0);
// resultTemplate.setAuditTime(activity.getEndTime());
// }
// wxApiService.sendLeaveResultTemplate(resultTemplate);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
/** 发送申请通知 */ /** 发送申请通知 */
StudentLeaveTemplate template = new StudentLeaveTemplate();
Map<String,Object> map = new HashMap<>();
// StudentLeaveTemplate template = new StudentLeaveTemplate();
String openId = ""; String openId = "";
template.setType(leave.getType()); // template.setType(leave.getType());
template.setReasonForLeave(leave.getLeaveReason()); // template.setReasonForLeave(leave.getLeaveReason());
template.setStudentName(leave.getStudentName()); // template.setStudentName(leave.getStudentName());
SchoolStudent ss = schoolStudentService.getById(leave.getStudentId()); // SchoolStudent ss = schoolStudentService.getById(leave.getStudentId());
SchoolClass sc = schoolClassService.getById(ss.getClassId()); // SchoolClass sc = schoolClassService.getById(ss.getClassId());
template.setClassName(sc.getClassAlias()); // template.setClassName(sc.getClassAlias());
template.setLeaveStartTime(leave.getStartTime()); // template.setLeaveStartTime(leave.getStartTime());
template.setLeaveEndTime(leave.getEndTime()); // template.setLeaveEndTime(leave.getEndTime());
//流程没结束，目前已到级部主任或者等待销假 //流程没结束，目前已到级部主任或者等待销假
List<Task> taskList = taskService.createTaskQuery() List<Task> taskList = taskService.createTaskQuery()
.processInstanceId(leave.getInstanceId()) .processInstanceId(leave.getInstanceId())
...@@ -324,19 +369,45 @@ public class SchoolStudentLeaveController extends BaseController { ...@@ -324,19 +369,45 @@ public class SchoolStudentLeaveController extends BaseController {
//级部主任审批 //级部主任审批
if (JIBU.equals(task.getName())) { if (JIBU.equals(task.getName())) {
template.setFirst("您好，您有请假申请等待审批。"); // template.setFirst("您好，您有请假申请等待审批。");
map.put("first","您好，您有请假申请等待审批。");
//openId = userService.getOpenIdByUserId(leave.getHandUserId2()); //openId = userService.getOpenIdByUserId(leave.getHandUserId2());
openId = teacherService.getOpenIdByUserId(leave.getHandUserId2()); openId = teacherService.getOpenIdByUserId(leave.getHandUserId2());
} }
//等待班主任销假 //等待班主任销假
if (XIAOJIA.equals(task.getName())) { if (XIAOJIA.equals(task.getName())) {
template.setFirst("您好，您有请假申请等待销假。"); // template.setFirst("您好，您有请假申请等待销假。");
map.put("first","您好，您有请假申请等待销假。");
//openId = userService.getOpenIdByUserId(leave.getHandUserId()); //openId = userService.getOpenIdByUserId(leave.getHandUserId());
openId = teacherService.getOpenIdByUserId(leave.getHandUserId()); openId = teacherService.getOpenIdByUserId(leave.getHandUserId());
} }
} }
template.setToUserOpenId(openId); // template.setToUserOpenId(openId);
wxApiService.sendStudentLeaveTemplate(template); // wxApiService.sendStudentLeaveTemplate(template);
//申请时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = leave.getApplyTime();
String applyTime = format.format(time);
map.put("toUserOpenId",openId);
map.put("applyTime",applyTime);
map.put("remark","请假原因：" + leave.getLeaveReason());
map.put("applyUser",leave.getStudentName());
Date leaveStartTime = leave.getStartTime();
Date leaveEndTime = leave.getEndTime();
Double hours = DateUtil.getHoursBetween2Date(leaveStartTime, leaveEndTime);
String content = "";
if (hours < 24.0) content = hours + "小时";
else {
Integer t1 = (int) (hours / 24);
Double d2 = hours - 24 * t1;
if (d2 == 0.0) content = t1 + "天";
else content = t1 + "天" + d2 + "小时";
}
map.put("content",content);
VxTemlateSendApi.sendVxTemlate(map);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
...@@ -365,21 +436,31 @@ public class SchoolStudentLeaveController extends BaseController { ...@@ -365,21 +436,31 @@ public class SchoolStudentLeaveController extends BaseController {
LambdaQueryWrapper<SchoolStudentLeave> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchoolStudentLeave> lqw = new LambdaQueryWrapper<>();
lqw.eq(SchoolStudentLeave::getInstanceId, instanceId); lqw.eq(SchoolStudentLeave::getInstanceId, instanceId);
SchoolStudentLeave leave = schoolStudentLeaveService.getOne(lqw); SchoolStudentLeave leave = schoolStudentLeaveService.getOne(lqw);
LeaveResultTemplate resultTemplate = new LeaveResultTemplate();
resultTemplate.setFirst("您好，" + leave.getStudentName() + "同学的销假申请已回复");
resultTemplate.setResult("已销假");
resultTemplate.setRemark(leave.getStudentName() + "同学已返校");
SchoolStudentParent parent = schoolStudentParentService.getById(leave.getApplyUserId());
//获取请假申请人openId //获取请假申请人openId
//String openId = userService.getOpenIdByUserId(parent.getUserId()); //String openId = userService.getOpenIdByUserId(parent.getUserId());
String openId = schoolStudentParentService.getOpenIdById(leave.getApplyUserId()); String openId = schoolStudentParentService.getOpenIdById(leave.getApplyUserId());
resultTemplate.setToUserOpenId(openId);
List<HistoricActivity> list = processService.selectHistoryList(instanceId, new HistoricActivity()); Map<String,Object> map = new HashMap<>();
if (StringUtils.isNotNull(list) && list.size() > 0) { map.put("toUserOpenId",openId);
HistoricActivity activity = list.get(0); map.put("remark",leave.getStudentName() + "同学已返校");
resultTemplate.setAuditTime(activity.getEndTime()); map.put("content","已销假");
} map.put("first","您好，" + leave.getStudentName() + "同学的销假申请已回复");
wxApiService.sendLeaveResultTemplate(resultTemplate); VxTemlateSendApi.sendVxTemlate(map);
// LeaveResultTemplate resultTemplate = new LeaveResultTemplate();
// resultTemplate.setFirst("您好，" + leave.getStudentName() + "同学的销假申请已回复");
// resultTemplate.setResult("已销假");
// resultTemplate.setRemark(leave.getStudentName() + "同学已返校");
// SchoolStudentParent parent = schoolStudentParentService.getById(leave.getApplyUserId());
//
// resultTemplate.setToUserOpenId(openId);
// List<HistoricActivity> list = processService.selectHistoryList(instanceId, new HistoricActivity());
// if (StringUtils.isNotNull(list) && list.size() > 0) {
// HistoricActivity activity = list.get(0);
// resultTemplate.setAuditTime(activity.getEndTime());
// }
// wxApiService.sendLeaveResultTemplate(resultTemplate);
return AjaxResult.success("销假完成"); return AjaxResult.success("销假完成");
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherLeaveController.java
...@@ -36,6 +36,7 @@ import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; ...@@ -36,6 +36,7 @@ import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherLeaveService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherLeaveService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.service.workDay.ISchoolWorkDayService; import yangtz.cs.liu.campus.service.workDay.ISchoolWorkDayService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherLeaveVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherLeaveVO;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO;
import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO; import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO;
...@@ -44,6 +45,7 @@ import yangtz.cs.liu.wechat.domain.template.LeaveTemplate; ...@@ -44,6 +45,7 @@ import yangtz.cs.liu.wechat.domain.template.LeaveTemplate;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import static com.core.constant.ProcessDefinition.TEACHERLEAVE; import static com.core.constant.ProcessDefinition.TEACHERLEAVE;
...@@ -222,20 +224,49 @@ public class SchoolTeacherLeaveController extends BaseController { ...@@ -222,20 +224,49 @@ public class SchoolTeacherLeaveController extends BaseController {
schoolTeacherLeave.setApplyTime(DateUtils.getNowDate()); schoolTeacherLeave.setApplyTime(DateUtils.getNowDate());
schoolTeacherLeaveService.submitApply(schoolTeacherLeave, userName, TEACHERLEAVE, new HashMap<>()); schoolTeacherLeaveService.submitApply(schoolTeacherLeave, userName, TEACHERLEAVE, new HashMap<>());
//转换时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = schoolTeacherLeave.getApplyTime();
String applyTime = format.format(time);
/** 发送申请通知 */ /** 发送申请通知 */
TeacherLeaveTemplate template = new TeacherLeaveTemplate(); //获取openid
//String openId = userService.getOpenIdByUserId(schoolTeacherLeave.getHandUserId1());
String openId = schoolTeacherService.getOpenIdByUserId(schoolTeacherLeave.getHandUserId1()); String openId = schoolTeacherService.getOpenIdByUserId(schoolTeacherLeave.getHandUserId1());
template.setUserType(schoolTeacherLeave.getApplyType()); Map<String,Object> map = new HashMap<>();
template.setToUserOpenId(openId); map.put("toUserOpenId",openId);
//template.setReasonForLeave(schoolTeacherLeave.getReasonForLeave()); map.put("applyTime",applyTime);
template.setType(schoolTeacherLeave.getType()); map.put("remark","共计" + schoolTeacherLeave.getTotalTime() +"天，请您尽快处理");
template.setLeaveStartTime(schoolTeacherLeave.getStartTime()); map.put("applyUser",schoolTeacherLeave.getTeacherName());
template.setLeaveEndTime(schoolTeacherLeave.getEndTime()); String start = "";
template.setStartSort(schoolTeacherLeave.getStartSort()); String end = "";
template.setEndSort(schoolTeacherLeave.getEndSort()); //请假开始时间、结束时间
template.setUserName(schoolTeacherLeave.getTeacherName()); //教工
wxApiService.sendTeacherLeaveTemplate(template); if("0".equals(schoolTeacherLeave.getApplyType())){
start = HolidayDateUtil.format.format(schoolTeacherLeave.getStartTime()) +" 第" + schoolTeacherLeave.getStartSort() + "节课";
end = HolidayDateUtil.format.format(schoolTeacherLeave.getEndTime()) +" 第" + schoolTeacherLeave.getEndSort() + "节课";
}else{
//教工
start = HolidayDateUtil.format.format(schoolTeacherLeave.getStartTime());
end = HolidayDateUtil.format.format(schoolTeacherLeave.getEndTime());
}
map.put("content","从" + start + "至" + end);
map.put("first",schoolTeacherLeave.getTeacherName() + "的请假申请需要您审批。");
VxTemlateSendApi.sendVxTemlate(map);
// TeacherLeaveTemplate template = new TeacherLeaveTemplate();
// //String openId = userService.getOpenIdByUserId(schoolTeacherLeave.getHandUserId1());
//// String openId = schoolTeacherService.getOpenIdByUserId(schoolTeacherLeave.getHandUserId1());
// template.setUserType(schoolTeacherLeave.getApplyType());
// template.setToUserOpenId(openId);
// //template.setReasonForLeave(schoolTeacherLeave.getReasonForLeave());
// template.setType(schoolTeacherLeave.getType());
// template.setLeaveStartTime(schoolTeacherLeave.getStartTime());
// template.setLeaveEndTime(schoolTeacherLeave.getEndTime());
// template.setStartSort(schoolTeacherLeave.getStartSort());
// template.setEndSort(schoolTeacherLeave.getEndSort());
// template.setUserName(schoolTeacherLeave.getTeacherName());
// wxApiService.sendTeacherLeaveTemplate(template);
return AjaxResult.success("提交成功"); return AjaxResult.success("提交成功");
} }
...@@ -282,35 +313,43 @@ public class SchoolTeacherLeaveController extends BaseController { ...@@ -282,35 +313,43 @@ public class SchoolTeacherLeaveController extends BaseController {
/** 修改任务结果 */ /** 修改任务结果 */
schoolTeacherLeaveService.updateById(leave); schoolTeacherLeaveService.updateById(leave);
//请假结果模板消息 //获取openid
LeaveResultTemplate resultTemplate = new LeaveResultTemplate();
resultTemplate.setFirst("您好，您的请假申请已回复。");
resultTemplate.setResult(flag ? "已批准 ": "已驳回");
resultTemplate.setRemark("审批留言： "+comment);
//获取请假教师openId
//String openId = userService.getOpenIdByUserId(leave.getTeacherId());
String openId = schoolTeacherService.getOpenIdByUserId(leave.getTeacherId()); String openId = schoolTeacherService.getOpenIdByUserId(leave.getTeacherId());
resultTemplate.setToUserOpenId(openId); Map<String,Object> map = new HashMap<>();
List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity()); map.put("toUserOpenId",openId);
if(StringUtils.isNotNull(list) && list.size() > 0){ map.put("first","您好，您的请假申请已回复。");
HistoricActivity activity = list.get(0); map.put("content",flag ? "已批准 ": "已驳回");
resultTemplate.setAuditTime(activity.getEndTime()); map.put("remark","审批留言： "+comment);
} VxTemlateSendApi.sendVxTemlate(map);
wxApiService.sendLeaveResultTemplate(resultTemplate); //请假结果模板消息
// LeaveResultTemplate resultTemplate = new LeaveResultTemplate();
// resultTemplate.setFirst("您好，您的请假申请已回复。");
// resultTemplate.setResult(flag ? "已批准 ": "已驳回");
// resultTemplate.setRemark("审批留言： "+comment);
// //获取请假教师openId
// //String openId = userService.getOpenIdByUserId(leave.getTeacherId());
//
// resultTemplate.setToUserOpenId(openId);
// List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity());
// if(StringUtils.isNotNull(list) && list.size() > 0){
// HistoricActivity activity = list.get(0);
// resultTemplate.setAuditTime(activity.getEndTime());
// }
// wxApiService.sendLeaveResultTemplate(resultTemplate);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
/** 发送申请通知 */ /** 发送申请通知 */
TeacherLeaveTemplate template = new TeacherLeaveTemplate(); // TeacherLeaveTemplate template = new TeacherLeaveTemplate();
String openId = ""; String openId = "";
template.setUserType(leave.getApplyType()); // template.setUserType(leave.getApplyType());
//template.setReasonForLeave(schoolTeacherLeave.getReasonForLeave()); // //template.setReasonForLeave(schoolTeacherLeave.getReasonForLeave());
template.setType(leave.getType()); // template.setType(leave.getType());
template.setLeaveStartTime(leave.getStartTime()); // template.setLeaveStartTime(leave.getStartTime());
template.setLeaveEndTime(leave.getEndTime()); // template.setLeaveEndTime(leave.getEndTime());
template.setStartSort(leave.getStartSort()); // template.setStartSort(leave.getStartSort());
template.setEndSort(leave.getEndSort()); // template.setEndSort(leave.getEndSort());
template.setUserName(leave.getTeacherName()); // template.setUserName(leave.getTeacherName());
//流程没结束，目前已到分管领导或主要领导 //流程没结束，目前已到分管领导或主要领导
List<Task> taskList = taskService.createTaskQuery() List<Task> taskList = taskService.createTaskQuery()
...@@ -331,8 +370,34 @@ public class SchoolTeacherLeaveController extends BaseController { ...@@ -331,8 +370,34 @@ public class SchoolTeacherLeaveController extends BaseController {
} }
} }
template.setToUserOpenId(openId); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
wxApiService.sendTeacherLeaveTemplate(template); Date time = leave.getApplyTime();
String applyTime = format.format(time);
Map<String,Object> map = new HashMap<>();
map.put("toUserOpenId",openId);
map.put("applyTime",applyTime);
map.put("remark","共计" + leave.getTotalTime() +"天，请您尽快处理");
map.put("applyUser",leave.getTeacherName());
String start = "";
String end = "";
//请假开始时间、结束时间
//教工
if("0".equals(leave.getApplyType())){
start = HolidayDateUtil.format.format(leave.getStartTime()) +" 第" + leave.getStartSort() + "节课";
end = HolidayDateUtil.format.format(leave.getEndTime()) +" 第" + leave.getEndSort() + "节课";
}else{
//教工
start = HolidayDateUtil.format.format(leave.getStartTime());
end = HolidayDateUtil.format.format(leave.getEndTime());
}
map.put("content","从" + start + "至" + end);
map.put("first",leave.getTeacherName() + "的请假申请需要您审批。");
VxTemlateSendApi.sendVxTemlate(map);
// template.setToUserOpenId(openId);
// wxApiService.sendTeacherLeaveTemplate(template);
return AjaxResult.success("审批完成"); return AjaxResult.success("审批完成");
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/curricula/DivisionClassesServiceImpl.java
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -40,6 +41,9 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe ...@@ -40,6 +41,9 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
public int insertDivisionClasses(List<SchoolDivisionClassesVo> list) { public int insertDivisionClasses(List<SchoolDivisionClassesVo> list) {
int row = 0; int row = 0;
for (SchoolDivisionClassesVo classesVo : list) { for (SchoolDivisionClassesVo classesVo : list) {
if (StringUtils.isEmpty(classesVo.getDivisionClassesRule())){
throw new ServiceException("请选择分班规则");
}
if (null == classesVo.getClassesNumber() || null == classesVo.getPeopleNumber()){ if (null == classesVo.getClassesNumber() || null == classesVo.getPeopleNumber()){
throw new ServiceException("班级数量或每班人数不能为空"); throw new ServiceException("班级数量或每班人数不能为空");
} }
...@@ -49,7 +53,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe ...@@ -49,7 +53,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
if (classesVo.getCoursePeopleNumber() < classesVo.getClassesNumber()){ if (classesVo.getCoursePeopleNumber() < classesVo.getClassesNumber()){
throw new ServiceException("输入的班级数量大于该课程总人数"); throw new ServiceException("输入的班级数量大于该课程总人数");
} }
if (classesVo.getClassesNumber() * classesVo.getPeopleNumber() < classesVo.getCoursePeopleNumber() ){ if (classesVo.getClassesNumber() * classesVo.getPeopleNumber() > classesVo.getCoursePeopleNumber() || classesVo.getClassesNumber() * classesVo.getPeopleNumber() < classesVo.getCoursePeopleNumber()){
throw new ServiceException("输入的班级数量和每班人数不符"); throw new ServiceException("输入的班级数量和每班人数不符");
} }
if (classesVo.getPeopleNumber() > classesVo.getCoursePeopleNumber()){ if (classesVo.getPeopleNumber() > classesVo.getCoursePeopleNumber()){
...@@ -285,6 +289,9 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe ...@@ -285,6 +289,9 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
public int insertDivisionClassesEc(List<SchoolDivisionClassesVo> list) { public int insertDivisionClassesEc(List<SchoolDivisionClassesVo> list) {
int row = 0; int row = 0;
for (SchoolDivisionClassesVo classesVo : list) { for (SchoolDivisionClassesVo classesVo : list) {
if (StringUtils.isEmpty(classesVo.getDivisionClassesRule())){
throw new ServiceException("请选择分班规则");
}
if (null == classesVo.getClassesNumber() || null == classesVo.getPeopleNumber()){ if (null == classesVo.getClassesNumber() || null == classesVo.getPeopleNumber()){
throw new ServiceException("班级数量或每班人数不能为空"); throw new ServiceException("班级数量或每班人数不能为空");
} }
...@@ -294,7 +301,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe ...@@ -294,7 +301,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
if (classesVo.getCoursePeopleNumber() < classesVo.getClassesNumber()){ if (classesVo.getCoursePeopleNumber() < classesVo.getClassesNumber()){
throw new ServiceException("输入的班级数量大于该课程总人数"); throw new ServiceException("输入的班级数量大于该课程总人数");
} }
if (classesVo.getClassesNumber() * classesVo.getPeopleNumber() < classesVo.getCoursePeopleNumber() ){ if (classesVo.getClassesNumber() * classesVo.getPeopleNumber() > classesVo.getCoursePeopleNumber() || classesVo.getClassesNumber() * classesVo.getPeopleNumber() < classesVo.getCoursePeopleNumber()){
throw new ServiceException("输入的班级数量和每班人数不符"); throw new ServiceException("输入的班级数量和每班人数不符");
} }
if (classesVo.getPeopleNumber() > classesVo.getCoursePeopleNumber()){ if (classesVo.getPeopleNumber() > classesVo.getCoursePeopleNumber()){
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/utils/CheckUtil.java
...@@ -26,6 +26,9 @@ public class CheckUtil { ...@@ -26,6 +26,9 @@ public class CheckUtil {
public void setMap(Map<String,Object> maps) { public void setMap(Map<String,Object> maps) {
map.putAll(maps); map.putAll(maps);
} }
public static void setMap(HashMap<String, Object> map) {
map.putAll(map);
}
/** /**
* 检验签名是否正确 * 检验签名是否正确
......
smart-campus/src/main/resources/mapper/auditorium/SchoolAuditoriumMapper.xml
...@@ -70,8 +70,14 @@ ...@@ -70,8 +70,14 @@
<if test="applyDeptId != null and applyDeptId != ''"> and apply_dept_id = #{applyDeptId}</if> <if test="applyDeptId != null and applyDeptId != ''"> and apply_dept_id = #{applyDeptId}</if>
<if test="applyDept != null and applyDept != ''"> and apply_dept = #{applyDept}</if> <if test="applyDept != null and applyDept != ''"> and apply_dept = #{applyDept}</if>
<if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(activity_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if> <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(activity_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
<if test="createById != null">and create_by_id = #{createById}</if>
<if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
<if test="createTime != null">and create_time = #{createTime}</if>
<if test="updateById != null">and update_by_id = #{updateById}</if>
<if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if>
<if test="updateTime != null">and update_time = #{update_time}</if>
</where> </where>
ORDER BY activity_time DESC ORDER BY apply_time DESC
</select> </select>
<select id="selectSchoolAuditoriumListGr" parameterType="SchoolAuditoriumVo" resultMap="SchoolAuditoriumResult"> <select id="selectSchoolAuditoriumListGr" parameterType="SchoolAuditoriumVo" resultMap="SchoolAuditoriumResult">
...@@ -100,8 +106,14 @@ ...@@ -100,8 +106,14 @@
<if test="applyDeptId != null and applyDeptId != ''"> and apply_dept_id = #{applyDeptId}</if> <if test="applyDeptId != null and applyDeptId != ''"> and apply_dept_id = #{applyDeptId}</if>
<if test="applyDept != null and applyDept != ''"> and apply_dept = #{applyDept}</if> <if test="applyDept != null and applyDept != ''"> and apply_dept = #{applyDept}</if>
<if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(activity_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if> <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(activity_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
<if test="createById != null">and create_by_id = #{createById}</if>
<if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
<if test="createTime != null">and create_time = #{createTime}</if>
<if test="updateById != null">and update_by_id = #{updateById}</if>
<if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if>
<if test="updateTime != null">and update_time = #{update_time}</if>
</where> </where>
ORDER BY activity_time DESC ORDER BY apply_time DESC
</select> </select>
<select id="selectSchoolAuditoriumById" parameterType="Long" resultMap="SchoolAuditoriumResult"> <select id="selectSchoolAuditoriumById" parameterType="Long" resultMap="SchoolAuditoriumResult">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment