From 21b53044906fc278e6c65a92b46eda9aa740f168 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Fri, 14 Jun 2024 17:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=82=AC=E5=8A=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/common/core/enums/TaskTypeEnum.java | 30 +++++ .../bonus/sgzb/material/domain/ToDoBean.java | 6 + .../service/impl/ToDoServiceImpl.java | 1 - .../resources/mapper/material/ToDoMapper.xml | 1 + .../domain/po/UrgentProcessingUser.java | 20 ++++ .../sgzb/system/mapper/SysUserMapper.java | 8 ++ .../service/impl/SysSmsServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 53 +++++++-- .../resources/mapper/system/SysUserMapper.xml | 106 ++++++++++++++++++ 9 files changed, 215 insertions(+), 12 deletions(-) diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java index ffdc94db..90ec54f7 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java @@ -13,10 +13,40 @@ public enum TaskTypeEnum { * 退料待报废 */ REPAIR_TO_BE_SCRAPPED(21, "维修待报废"), + + /** + *新购任务 + */ + NEW_PURCHASE_TASK(23, "新购任务"), + /** + *领料任务 + */ + MATERIAL_REQUISITION_TASK(29, "领料任务"), + /** + *退料任务 + */ + MATERIAL_RETURN_TASK(36, "退料任务"), + /** *维修任务 */ MAINTENANCE_TASK(41, "维修任务"), + + /** + *维修审核 + */ + MAINTENANCE_REVIEW(45, "维修审核"), + + /** + *修试后入库任务 + */ + INVENTORY_TASK(50, "修试后入库任务"), + + /** + *新购配件任务 + */ + NEW_ACCESSORY_PURCHASE_TASK(67, "新购配件任务"), + /** * 报废任务 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ToDoBean.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ToDoBean.java index 920b097e..3223fae0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ToDoBean.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ToDoBean.java @@ -4,6 +4,7 @@ import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; import java.util.Date; @@ -73,4 +74,9 @@ public class ToDoBean extends BaseEntity { */ private String endTime; + /** + * 数据所属组织 + */ + private Integer companyId; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java index 49a18992..8a946c44 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java @@ -85,7 +85,6 @@ public class ToDoServiceImpl implements ToDoService { for (BmNoticeInfo bmNoticeInfo : bmNoticeInfoList) { bmNoticeInfo.setContent(message); bmNoticeInfo.setTaskId(taskId); - bmNoticeInfo.setModelName(bmNoticeInfo.getModelName()); bmNoticeInfo.setCreateTime(new Date()); String phone = bmNoticeInfo.getPhone(); try { diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml index 6bcb50fb..e61774ad 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sd.`name` as taskEvent, us.user_name as createName, tt.create_by as createBy, + tt.company_id as companyId, tt.create_time as createTime FROM tm_task tt diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/po/UrgentProcessingUser.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/po/UrgentProcessingUser.java index 1cc9f46b..b176ae67 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/po/UrgentProcessingUser.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/po/UrgentProcessingUser.java @@ -9,4 +9,24 @@ public class UrgentProcessingUser { * 任务状态 */ private String taskStatus; + + /** + * 任务类型 + */ + private Integer taskTypeId; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 数据所属组织 + */ + private Long companyId; + + /** + * 部门id + */ + private Long deptId; } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java index ad1744a5..7f6d786e 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java @@ -132,4 +132,12 @@ public interface SysUserMapper * @return 结果 */ List selectUserByRole(SysUser sysUser); + + List selectUserByDeptId(SysUser sysUser); + + List selectUserBySgb(); + + List selectUserByEm(); + + List selectUserByDm(); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java index 002ed730..6c15cbab 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java @@ -118,7 +118,7 @@ public class SysSmsServiceImpl implements ISysSmsService { // String URL = "http://106.ihuyi.common/webservice/sms.php?method=Submit"; String content = URL + "&mobile=" + phone + "&content=【智慧仓储】" + msg + "。"; String body = HttpRequest.post(content).execute(false).body(); - System.out.println("发送手机号码：" + phone + "，内容：" + msg + "，返回结果：" + body); + // System.out.println("发送手机号码：" + phone + "，内容：" + msg + "，返回结果：" + body); if (body == null || !body.contains(GlobalConstants.STRING_OK)) { return AjaxResult.error("发送失败"); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java index 63e1bd9e..90a22ae3 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.system.service.impl; import com.bonus.sgzb.common.core.constant.UserConstants; import com.bonus.sgzb.common.core.enums.RoleEnum; import com.bonus.sgzb.common.core.enums.TaskStatusEnum; +import com.bonus.sgzb.common.core.enums.TaskTypeEnum; import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.utils.SpringUtils; import com.bonus.sgzb.common.core.utils.StringUtils; @@ -565,21 +566,53 @@ public class SysUserServiceImpl implements ISysUserService { log.info("ToDoServiceImpl urgentProcessingUser {} begin" ,urgentProcessingUser); List userList = new ArrayList<>(); SysUser sysUser = new SysUser(); + sysUser.setDeptId(urgentProcessingUser.getDeptId()); // 验证是否为空 if (urgentProcessingUser == null || urgentProcessingUser.getTaskStatus() == null) { throw new ServiceException(SystemException.TASK_ID_IS_EMPTY_MSG,SystemException.TASK_ID_IS_EMPTY); } - //判断当前催办任务的状态，获取需要催办人的信息 - if(TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())){//待分公司审核 - sysUser.setRoleId(RoleEnum.BRANCH_OFFICES.getCode()); - //TODO 后期逻辑需要待确认 - }else if (TaskStatusEnum.STAY_RESPONSIBLE_DEPARTMENT_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {//待分管部门审核 - sysUser.setRoleId(RoleEnum.CONSTRUCTION_MANAGEMENT_DEPARTMENT.getCode()); - }else if (TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {//待内部审核 - sysUser.setRoleId(RoleEnum.MACHINERY_BRANCH.getCode()); + switch (urgentProcessingUser.getTaskTypeId()){ + //领料任务 + case 29: + userList = materialRequisitionTask(urgentProcessingUser,sysUser); + break; } - userList = userMapper.selectUserByRole(sysUser); - log.info("ToDoServiceImpl urgentProcessingUser {} end" ,urgentProcessingUser); + log.info("ToDoServiceImpl urgentProcessingUser end !"); return success(userList); } + + /** + * 领料任务催办 + * @param urgentProcessingUser + * @param sysUser + * @return + */ + private List materialRequisitionTask(UrgentProcessingUser urgentProcessingUser,SysUser sysUser) { + List userList = new ArrayList<>(); + //判断当前设备是否是机具设备101：机具设备，102：调试设备 + if (urgentProcessingUser.getCompanyId().equals(101L)){ + //判断当前审批阶段，获取下一阶段需要催办的人员信息 + if(TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())){ + //获取创建人同一公司经理信息 + userList = userMapper.selectUserByDeptId(sysUser); + + }else if (TaskStatusEnum.STAY_RESPONSIBLE_DEPARTMENT_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) { + //获取施管部经理信息 + userList = userMapper.selectUserBySgb(); + }else if (TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) { + //获取机具经理和机具副经理的信息 + userList = userMapper.selectUserByEm(); + } + //当为调试设备时，只需要分公司审核和内部审核 + } else if (urgentProcessingUser.getCompanyId().equals(102L)) { + if(TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())){ + //获取创建人同一公司经理信息 + userList = userMapper.selectUserByDeptId(sysUser); + }else if (TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) { + //获取调试经理和机具副经理的信息 + userList = userMapper.selectUserByDm(); + } + } + return userList; + } } diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml index 6f919743..919d9bee 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -168,7 +168,113 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.del_flag = '0' AND sur.role_id IN (133,134) + + + + insert into sys_user( user_id,