From 6a2023bd4b4ae0eb08dcb3ee77e6742c202d9678 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 9 Jul 2024 17:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/system/api/domain/SysUser.java | 10 ++++ .../sgzb/app/controller/TmTaskController.java | 10 ++-- .../app/service/impl/TmTaskServiceImpl.java | 35 ++++++------ .../bonus/sgzb/base/domain/RepairTask.java | 2 + .../resources/mapper/base/RepairMapper.xml | 3 ++ .../material/PurchaseAccessoryMapper.xml | 2 +- .../PurchaseCheckServiceCenterMapper.xml | 4 +- .../mapper/material/RepairTestInputMapper.xml | 2 +- .../system/exception/SystemException.java | 4 +- .../sgzb/system/mapper/SysUserMapper.java | 2 + .../service/impl/SysUserServiceImpl.java | 54 ++++++++++++++----- .../resources/mapper/system/SysUserMapper.xml | 19 ++++--- 12 files changed, 100 insertions(+), 47 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java index 9ae90a84..2955967e 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java @@ -40,6 +40,16 @@ public class SysUser extends BaseEntity @Excel(name = "用户名称") private String nickName; + public String getPickingFirst() { + return pickingFirst; + } + + public void setPickingFirst(String pickingFirst) { + this.pickingFirst = pickingFirst; + } + + private String pickingFirst; + /** 用户邮箱 */ @Excel(name = "用户邮箱") private String email; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index e3330cec..beb0d850 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -271,7 +271,7 @@ public class TmTaskController extends BaseController { } else { return AjaxResult.error("创建任务失败"); } - /*UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser(); + UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser(); urgentProcessingUser.setCompanyId(Long.valueOf(task.getCompanyId())); urgentProcessingUser.setTaskTypeId(task.getTaskType()); urgentProcessingUser.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId()); @@ -279,19 +279,19 @@ public class TmTaskController extends BaseController { case 30: urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo()); break; - case 31: + /* case 31: urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_RESPONSIBLE_DEPARTMENT_AUDIT.getInfo()); break; case 32: urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo()); - break; + break;*/ } List userList = remoteUserService.processingUser(urgentProcessingUser).getData(); if (userList.size()>0) { String message ="尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:"+ code +"的领料申请待处理，请及时查看"; if (CollectionUtils.isNotEmpty(userList)) { for (SysUser sysUser : userList) { - if (StringUtils.isNotBlank(sysUser.getPhonenumber())) { + if (sysUser.getPickingFirst().contains("pickingFirst") && StringUtils.isNotBlank(sysUser.getPhonenumber())) { try { remoteUserService.send(sysUser.getPhonenumber(), message); } catch (Exception e) { @@ -300,7 +300,7 @@ public class TmTaskController extends BaseController { } } } - }*/ + } return AjaxResult.success("任务创建成功"); } catch (Exception e) { return AjaxResult.error("创建任务失败," + e.getCause().toString() + "," + e.getMessage()); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index a33d8d14..db79797c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -203,7 +203,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - //sendMessageToLeader(record); + sendMessageToLeader(record); } else { // 先审核任务表 result += tmTaskMapper.updateTmTaskAuditStatus(record); @@ -227,7 +227,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - //sendMessageToLeader(record); + sendMessageToLeader(record); } } else { return 0; @@ -263,7 +263,7 @@ public class TmTaskServiceImpl implements TmTaskService { String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + record.getCode() + "的领料申请待处理，请及时查看"; if (CollectionUtils.isNotEmpty(userList)) { for (SysUser sysUser : userList) { - if (StringUtils.isNotBlank(sysUser.getPhonenumber())) { + if (sysUser.getPickingFirst().contains("pickingFirst") && StringUtils.isNotBlank(sysUser.getPhonenumber())) { try { remoteUserService.send(sysUser.getPhonenumber(), message); } catch (Exception e) { @@ -281,7 +281,7 @@ public class TmTaskServiceImpl implements TmTaskService { tmTask.setId(details.getParenntId().toString()); //获取机具所属人员 List leaseDetailByParent = tmTaskMapper.getUserByParenntId(tmTask); - HashSet set=new HashSet<>(); + HashSet set = new HashSet<>(); String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + code + "的领料申请待处理，请及时查看"; for (TmTask tmTaskNew : leaseDetailByParent) { //对手机号进行处理，因为存在一种类型的机具归属多个人的情况 @@ -294,14 +294,15 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - for (String str :set) { - try { - remoteUserService.send(str, message); - } catch (Exception e) { - log.info("手机号为：{}发送短信失败",str); - } + for (String str : set) { + try { + remoteUserService.send(str, message); + } catch (Exception e) { + log.info("手机号为：{}发送短信失败", str); + } } } + @Override public int updateLeaseTaskAuditInfoCq(TmTask record) { int result = 0; @@ -346,13 +347,13 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public List getLeaseAuditListByOne(TmTask record) { Set roles = SecurityUtils.getLoginUser().getRoles(); -// if (roles.contains("jjbz") || roles.contains("fbz")) { + if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ)) { List leaseDetailByParentId = tmTaskMapper.getLeaseDetailByjjbz(record); return leaseDetailByParentId; -// } else { -// List leaseDetailByParentId = tmTaskMapper.getLeaseDetailByParentId(record); -// return leaseDetailByParentId; -// } + } else { + List leaseDetailByParentId = tmTaskMapper.getLeaseDetailByParentId(record); + return leaseDetailByParentId; + } /* for (TmTask tmTask : leaseDetailByParentId) { if ("2".equals(tmTask.getManageType())) { List manageTypeByTypeId = tmTaskMapper.getManageTypeByTypeId(tmTask); @@ -659,7 +660,7 @@ public class TmTaskServiceImpl implements TmTaskService { if (roles.contains(STRING_ADMIN)) { return tmTaskMapper.getLeaseOutListByAdmin(task); } else if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ) || roles.contains(STRING_EM01) - || roles.contains(STRING_EM02) || roles.contains(STRING_EM03)) { + || roles.contains(STRING_EM02) || roles.contains(STRING_EM03)) { //机具班长、副班长、机具经理、机具副经理、安全员可以查看机具设备 return tmTaskMapper.getLeaseOutListByjjbz(task); } else if (roles.contains(STRING_DM01)) { @@ -701,7 +702,7 @@ public class TmTaskServiceImpl implements TmTaskService { leaseOutDetails.setCreateTime(new Date()); leaseOutDetails.setUpdateTime(new Date()); leaseOutDetails.setOutNum(0.0); - res = leaseOutDetailsMapper.insertSelective(leaseOutDetails); + res = leaseOutDetailsMapper.insertSelective(leaseOutDetails); return res; } else { return res; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java index b4539564..543043c7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java @@ -153,4 +153,6 @@ public class RepairTask { /** 驳回原因 */ private String remark; + /** 0：未提交 1：已提交 */ + private Integer commit; } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index cbf83c21..0e22ced5 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -54,6 +54,7 @@ update tm_task set task_status = '44', update_by = #{userId}, + is_commit = 1, update_time = now() where task_id in @@ -82,6 +83,7 @@ tt.task_status AS repairStatusCode, tt.company_id AS companyId, tt1.code AS forecastWasteCode, + tt.is_commit AS commit, GROUP_CONCAT(DISTINCT rd.company_id) as companyIds, GROUP_CONCAT(DISTINCT mt2.type_name) as type FROM @@ -294,6 +296,7 @@ tt.task_status AS repairStatusCode, tt.company_id AS companyId, tt1.code AS forecastWasteCode, + tt.is_commit AS commit, GROUP_CONCAT(DISTINCT rd.company_id) as companyIds, GROUP_CONCAT(DISTINCT mt2.type_name) as type FROM diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml index 21fffa31..51373291 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml @@ -278,7 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHEN 70 THEN '已审核' ELSE '' END taskStatusResult, - su.user_name purchaserName + su.nick_name purchaserName FROM purchase_part_details ppd LEFT JOIN purchase_part_info pci on pci.task_id=ppd.task_id diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml index 0a09758e..57bbf0b5 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml @@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into sys_user( user_id,