From 17bd1141f248f368d2d69101db10e89fdee88163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 21 Apr 2024 13:07:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/constant/CacheConstants.java | 5 + .../ruoyi/common/enums/MessageTypeEnum.java | 4 +- .../system/mapper/SysUserOpenidMapper.java | 8 + .../mapper/system/SysUserOpenidMapper.xml | 8 + ruoyi-ui/src/api/flow/flowLabourInfo.js | 18 + .../src/layout/components/Sidebar/Item.vue | 2 +- ruoyi-ui/src/store/modules/flowtask.js | 22 + .../approveFlowLabourDrawer.vue | 437 ++++++++++++++++++ .../flowLabourInfo/detailFlowLabourDrawer.vue | 313 +++++++++++++ .../src/views/flow/flowLabourInfo/index.vue | 268 +++++++---- .../views/wxsetting/labourComplaint/index.vue | 8 +- .../controller/WcFlowLabourController.java | 91 ++++ .../src/main/resources/application-druid.yml | 4 +- .../FlowLabourAuditNodeController.java | 7 +- .../controller/FlowLabourInfoController.java | 60 ++- .../jh/flow/mapper/FlowLabourInfoMapper.java | 18 + .../flow/service/IFlowLabourInfoService.java | 9 + .../impl/FlowLabourAuditNodeServiceImpl.java | 69 ++- .../impl/FlowLabourInfoServiceImpl.java | 62 +++ .../impl/SurProjectAuditinfoServiceImpl.java | 23 + .../impl/WeChatMessageServiceImpl.java | 76 +++ .../mapper/flow/FlowLabourInfoMapper.xml | 120 ++++- 22 files changed, 1487 insertions(+), 145 deletions(-) create mode 100644 ruoyi-ui/src/views/flow/flowLabourInfo/approveFlowLabourDrawer.vue create mode 100644 ruoyi-ui/src/views/flow/flowLabourInfo/detailFlowLabourDrawer.vue create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowLabourController.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java index abd2e53e..106912c0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java @@ -81,4 +81,9 @@ public class CacheConstants * 微信消息推送项目甲代 */ public static final String WX_MPMESSAGE_P_MAG = "wx.mpmessage.p.mag::"; + + /** + * 微信消息推送项目经理 + */ + public static final String WX_MPMESSAGE_P_ORG = "wx.mpmessage.p.org::"; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java index 4b9da3dc..ed977ac3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java @@ -16,7 +16,9 @@ public enum MessageTypeEnum { GCSPCSBL("70", "办理工程审批超时提醒"), GCSPCSCS("80", "抄送工程审批超时提醒"), YHZGCSGZ("90", "隐患整改超时通知"), - YHFJCSGZ("100", "隐患复检超时通知"); + YHFJCSGZ("100", "隐患复检超时通知"), + LZYJSP("110", "劳资预警审批"), + LZYJCSTZ("120", "劳资预警审批超时"); //工作流审批由ProcDefKey组成 private final String code; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOpenidMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOpenidMapper.java index 97e44c5f..19cdbde1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOpenidMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOpenidMapper.java @@ -51,6 +51,14 @@ public interface SysUserOpenidMapper */ public List findMsgProSupUsers(Long proId); + /** + * 查询用户绑定小程序openId列表[项目经理] + * + * @param proId 项目信息 + * @return 用户绑定小程序openId集合 + */ + public List findMsgProOrgUsers(Long proId); + /** * 查询用户绑定小程序openId列表[项目甲代] * diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserOpenidMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserOpenidMapper.xml index 2e69f755..bdb7ea68 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserOpenidMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserOpenidMapper.xml @@ -45,6 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where spu.project_id = #{proId} and spu.job_type=1 and spu.is_del = 0 and su.del_flag = '0' and suo.isDel=0 + + - is_del=0 - and project_id = #{projectId} - and project_name like concat('%', #{projectName}, '%') - and dept_id = #{deptId} - and dept_name like concat('%', #{deptName}, '%') - and sub_dept_id = #{subDeptId} - and sub_dept_name like concat('%', #{subDeptName}, '%') - and labor_name like concat('%', #{laborName}, '%') - and labor_cardId like concat('%', #{laborCardId}, '%') - and labor_phone = #{laborPhone} - and approve_status = #{approveStatus} - and approve_status != 100 + fl.is_del=0 + and fl.project_id = #{projectId} + and fl.project_name like concat('%', #{projectName}, '%') + and fl.dept_id = #{deptId} + and fl.dept_name like concat('%', #{deptName}, '%') + and fl.sub_dept_id = #{subDeptId} + and fl.sub_dept_name like concat('%', #{subDeptName}, '%') + and fl.labor_name like concat('%', #{laborName}, '%') + and fl.labor_cardId like concat('%', #{laborCardId}, '%') + and fl.labor_phone = #{laborPhone} + and fl.approve_status = #{approveStatus} + and fl.approve_status != 100 + and date(fl.create_time) between #{params.beginDate} and #{params.endDate} + + and sp.deptId = #{projectDeptId} + + and sp.deptId = #{nowDept} + + + and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.job_type='24' and spui.del_flag=0 ) + + and fl.approve_status in ('10','21','30','31','100') and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.user_id=#{nowUser} and spui.job_type='24' and spui.del_flag=0 ) + + and fl.approve_status in ('20','31') + + and fl.approve_status in ('10','21') + and fl.approve_status in ('10','21') + and fl.approve_status != '100' + + + and fl.approve_status in ('21','30','100') + + and fl.approve_status in ('11','20','100') + and fl.approve_status in ('11','20','100') + - order by create_time desc + order by fl.approve_status desc, fl.id asc + + + + +