From d754f091b5a113d91c57ae7128f07cdb06aeed9e Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 15 Jul 2024 15:38:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8A=9F=E8=83=BD=E5=8F=8A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/app/controller/TmTaskController.java | 4 ++-- .../bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 8 ++++---- .../main/resources/mapper/material/BackRecordMapper.xml | 4 ++-- .../main/resources/mapper/material/LeaseRecordMapper.xml | 4 ++-- .../resources/mapper/material/ScrapApplyDetailsMapper.xml | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) 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 9adce70c..f3df5ff0 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()); @@ -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 f52077fa..c1e46b19 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 @@ -153,7 +153,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } //短信通知人员进行出库 - /* for (LeaseApplyDetails details : leaseApplyDetails) { + for (LeaseApplyDetails details : leaseApplyDetails) { //内部审核以后通知机具管理人进行出库 set = smsNotification(details, record.getCode(), set); } @@ -163,7 +163,7 @@ public class TmTaskServiceImpl implements TmTaskService { } catch (Exception e) { log.info("手机号为：{}发送短信失败", str); } - }*/ + } } else if (record.getTaskStatus() == 32 && companyId != null) { // 再审核领料任务信息表 List leaseApplyInfoList = record.getLeaseApplyInfoList(); @@ -210,7 +210,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } -// sendMessageToLeader(record); + sendMessageToLeader(record); } else { // 先审核任务表 result += tmTaskMapper.updateTmTaskAuditStatus(record); @@ -234,7 +234,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } -// sendMessageToLeader(record); + sendMessageToLeader(record); } } else { return 0; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml index faf8dd90..254aa23a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" baif.`code`, mm.ma_code AS maCode, bcd.back_num AS backNum, - su.nick_name AS backPerson, + baif.back_person AS backPerson, bcd.create_time AS createTime, bpl.lot_name AS proName, bui.unit_name AS unitName @@ -114,7 +114,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id - LEFT JOIN sys_user su ON su.user_id = baif.back_person where 1 = 1 and (baif.`code` like concat('%',#{keyWord},'%') or @@ -139,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bai.agreement_code like concat('%',#{agreementCode},'%') + ORDER BY bcd.create_time DESC SELECT mt2.type_name AS typeName, + lai.lease_person AS leasePerson, mt.type_name AS typeModelName, bai.agreement_code AS agreementCode, mm.ma_code AS maCode, mt.unit_name AS unit, lod.out_num AS preNum, lai.`code` AS code, - su.nick_name AS leasePerson, lod.create_time AS createTime, bpl.lot_name AS proName, lod.car_code AS carCode, @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt ON mt.type_id = lod.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_machine mm ON mm.ma_id = lod.ma_id - LEFT JOIN sys_user su ON su.user_id = lai.lease_person + LEFT JOIN sys_user su ON su.user_id = lai.create_by WHERE 1 = 1 diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml index 5a3aa877..836e1e49 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml @@ -936,6 +936,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scrap_check_details scd1 LEFT JOIN scrap_apply_details sad1 ON scd1.parent_id = sad1.parent_id AND scd1.type_id = sad1.type_id + WHERE sad1.task_id = #{taskId} GROUP BY scd1.parent_id, sad1.type_id ) aa ON sad.parent_id = aa.parent_id AND sad.type_id = aa.type_id