diff --git a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/controller/BizTodoItemController.java b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/controller/BizTodoItemController.java index 5c00932e..5a770dda 100644 --- a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/controller/BizTodoItemController.java +++ b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/controller/BizTodoItemController.java @@ -9,10 +9,14 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.process.leave.domain.BizLeaveVo; +import com.ruoyi.process.leave.service.IBizLeaveService; import com.ruoyi.process.todoitem.domain.BizTodoItem; import com.ruoyi.process.todoitem.service.IBizTodoItemService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -42,6 +46,9 @@ public class BizTodoItemController extends BaseController { // @Autowired // private IBizLeaveService bizLeaveService; + @Autowired + private IBizLeaveService bizLeaveService; + @Autowired private TaskService taskService; @@ -70,11 +77,11 @@ public class BizTodoItemController extends BaseController { // Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); // String processInstanceId = task.getProcessInstanceId(); // ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); -// BizLeaveVo bizLeave = bizLeaveService.selectBizLeaveById(new Long(processInstance.getBusinessKey())); -// mmap.put("bizLeave", bizLeave); +//// BizLeaveVo bizLeave = bizLeaveService.selectBizLeaveById(new Long(processInstance.getBusinessKey())); +//// mmap.put("bizLeave", bizLeave); // mmap.put("taskId", taskId); -//// String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); -// return "process/" + module + "/" + formPageName; +// String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); +// return prefix + "/task" + verifyName; // } @RequiresPermissions("process:todoitem:view") @@ -283,10 +290,4 @@ public class BizTodoItemController extends BaseController { result.put("total", total); return result; } - - - - - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/remind/controller/RemindController.java b/ruoyi-admin/src/main/java/com/ruoyi/remind/controller/RemindController.java index ffcac05d..a8101efb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/remind/controller/RemindController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/remind/controller/RemindController.java @@ -1,13 +1,27 @@ package com.ruoyi.remind.controller; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.remind.domain.Remind; +import com.ruoyi.remind.mapper.RemindMapper; import com.ruoyi.remind.service.RemindService; +import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -16,23 +30,147 @@ import java.util.Map; * Created by sunzhenhu on 2021/5/28 10:52 */ @RequestMapping("/remind") -public class RemindController { +@Controller +public class RemindController extends BaseController { + Logger logger = LoggerFactory.getLogger(getClass()); private String prefix = "remind"; @Autowired private RemindService remindService; -// @Autowired -// private RemindMapper remindMapper; - - @RequestMapping("/getRemindListNoPaging") - @ResponseBody - public List getRemindListNoPaging(HttpServletRequest request) { - Map paraMap = new HashMap(); - paraMap.put("receiver", ShiroUtils.getLoginName()); - paraMap.put("isView", "0"); - List list = remindService.getRemindListNoPaging(paraMap); - return list; - } + @Autowired + private SysUserMapper userMapper; + @Autowired + private RemindMapper remindMapper; + @GetMapping() + public String remind(ModelMap mmap) { + mmap.put("currentUser", ShiroUtils.getSysUser()); + return prefix + "/remind"; + } + @GetMapping("/view/{id}") + public String edit(@PathVariable("id")String id, ModelMap mmap) { + System.out.println("id="+id); + mmap.put("id",id); + return prefix + "/view"; + } + // + @RequestMapping("/getRemindList") + @ResponseBody + public Map getRemindList(Integer pageIndex, Integer pageSize, HttpServletRequest request) { + try { + request.setCharacterEncoding("UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + Map paraMap = new HashMap(); + + // 分页参数 + paraMap.put("pageIndex", pageIndex); + paraMap.put("pageSize", pageSize); + // 查询参数 + String fromBegin = request.getParameter("fromBegin"); + String toEnd = request.getParameter("toEnd"); + String vague = request.getParameter("vague"); + paraMap.put("fromBegin", fromBegin); + paraMap.put("toEnd", toEnd); + paraMap.put("vague", vague); + if (!SysUser.isAdmin(ShiroUtils.getUserId())) { + paraMap.put("receiver",ShiroUtils.getLoginName()); + } + Map result = new HashMap(); + List list = remindService.getRemindList(paraMap); + for(Remind remind:list) { + SysUser remindUser = userMapper.selectUserByLoginName(remind.getRemind()); + remind.setRemindName(remindUser.getUserName()); + remind.setRemindDeptName(remindUser.getDept().getDeptName()); + SysUser receiver = userMapper.selectUserByLoginName(remind.getReceiver()); + remind.setReceiverName(receiver.getUserName()); + } + long total = remindService.getRemindTotal(paraMap); + result.put("rows", list); + result.put("total", total); + return result; + } + + @RequestMapping("/getRemindListNoPaging") + @ResponseBody + public List getRemindListNoPaging(HttpServletRequest request) { + startPage(); + Map paraMap = new HashMap(); + paraMap.put("receiver",ShiroUtils.getLoginName()); + paraMap.put("isView", "0"); + paraMap.put("pageIndex", 1); + paraMap.put("pageSize", 11); + List list = remindService.getRemindListNoPaging(paraMap); + return list; + } -} + + // 结账资料申请单（浦东）主表查询单个对象 + @RequestMapping("/getRemind") + @ResponseBody + public Remind getRemind(HttpServletRequest request) { + String id = request.getParameter("id"); + Remind mc = remindService.getRemind(id); + SysUser remindUser = userMapper.selectUserByLoginName(mc.getRemind()); + mc.setRemindName(remindUser.getUserName()); + mc.setRemindDeptName(remindUser.getDept().getDeptName()); + return mc; + } + + //添 + @RequestMapping("/edit") + @ResponseBody + public String edit(HttpServletRequest request) { + String id = request.getParameter("id"); + String loginName = ShiroUtils.getLoginName(); + Remind remind = remindService.getRemind(id); + if(remind.getReceiver().equals(loginName)) { + Remind remind2 = new Remind(); + remind2.setId(Long.parseLong(id)); + remind2.setIsView("1"); + remindService.edit(remind2); + } + return "success"; + } + /** + * 发票申请单 综合管理部节点推送消息给维保部负责人 + * @param request + * @return + */ + @RequestMapping("/sendInvoiceRemind") + @ResponseBody + public Map sendInvoiceRemind(HttpServletRequest request){ + Map result = new HashMap(); + String msg = ""; + String gmUserId = request.getParameter("gmUserId"); + String keyNo = request.getParameter("keyNo"); + String companyNames = request.getParameter("companyNames"); + String formName = "发票申请单"; + Integer remindCount = remindMapper.getRemindCountByCondi(formName, keyNo); + if(remindCount>0) { + msg = "这笔发票申请单的提醒已推送过维保部负责人，无法重复推送！"; + }else { + Remind remind = new Remind(); + remind.setRemind(gmUserId); + String wbDeptLeaderId = userMapper.selectUserByUniqueRolekey("wbDeptLeader"); + remind.setReceiver(wbDeptLeaderId); + SysUser finance = userMapper.selectUserByLoginName(gmUserId); + remind.setRemindDept(finance.getDeptId()+""); + remind.setRemindDate(DateUtils.getTime()); + remind.setFormUrl("invoiceForm/edit/" + keyNo); + remind.setFormName(formName); + remind.setRemindContent("公司名称为["+companyNames+"]的这些公司的发票到了，请来我这里拿发票！！！"); + remind.setIsView("0"); + int add = remindService.add(remind); + if(add<1) { + msg = "提醒推送失败，请联系系统管理员！"; + }else { + msg = "提醒推送成功！"; + } + } + result.put("msg", msg); + return result; + } + } + diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 08894987..71f056c4 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -9,7 +9,6 @@ - @@ -142,7 +141,7 @@
待办任务
- 你有任务 +
你有任务
@@ -151,7 +150,7 @@
- 查看全部 + 查看全部
@@ -168,16 +167,15 @@
你有提醒 -
-
    +

    • 新的提醒

    - 查看全部 + 查看全部
    @@ -199,11 +197,11 @@ @@ -259,9 +257,9 @@ + diff --git a/ruoyi-admin/src/main/resources/templates/process/todoitem/doneitem.html b/ruoyi-admin/src/main/resources/templates/process/todoitem/doneitem.html new file mode 100644 index 00000000..421efbea --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/process/todoitem/doneitem.html @@ -0,0 +1,170 @@ + + + + + + + +
    +
    +
    +
    +
    +
      +
    • +

      事项标题：

      + +
      • +
    • +

      模块名称：

      + +
      • +
    • +

      任务 ID：

      + +
      • +
    • +

      任务名称：

      + +
      • +
    • +

      待办人 ID：

      + +
      • +
    • +

      待办人名称：

      + +
      • +
    • +

      处理人 ID：

      + +
      • +
    • +

      处理人名称：

      + +
      • +
    • +

      通知时间：

      + + - + +
      • +
    • +

      处理时间：

      + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/process/todoitem/todoList.html b/ruoyi-admin/src/main/resources/templates/process/todoitem/todoList.html new file mode 100644 index 00000000..d91320d4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/process/todoitem/todoList.html @@ -0,0 +1,74 @@ + + + + + + +
    +
    暂无任务
    +
    +
    +
    +
    +
    +
    + +
    +
    +

    【[[${ todoItem.nodeName }]]】[[${ todoItem.itemName }]]

    +

    [[${ todoItem.itemContent }]] +

    + 办理 + +
    + +     +
    +
    +
    +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/process/todoitem/todoitem.html b/ruoyi-admin/src/main/resources/templates/process/todoitem/todoitem.html new file mode 100644 index 00000000..e594dd91 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/process/todoitem/todoitem.html @@ -0,0 +1,111 @@ + + + + + + + +
    +
    +
    +
    +
    +
      +

    • 事项标题：

      • +

    • 模块名称：

      • +

    • 任务 ID：

      • +

    • 任务名称：

      • + +

    • 待办人名称：

      • +

    • 处理人 ID：

      • +

    • 处理人名称：

      • +
    • +

      通知时间：

      + + - + +
      • +
    • +

      处理时间：

      + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + + \ No newline at end of file