From 670411c42db33d20452ee2a47029032aa3d301b1 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 21 Jan 2025 18:26:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=B7=B2=E8=AF=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/material/basic/BmMessageMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml index be92b9b..8cf7c75 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml @@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_time = #{updateTime}, - where id = #{id} + where from_company = #{fromCompany} and to_company = #{toCompany} From 115de905e535e0430ae910611897879914822549 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 22 Jan 2025 09:46:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/material/basic/ToDoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml index 5feac70..7aa5a69 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept dept1 on dept1.dept_id=tt.buyer_company_id LEFT JOIN sys_dept dept2 on dept2.dept_id=tt.seller_company_id WHERE - tt.`status` = '1' + tt.`status` = '1' and tt.task_status < 20 and tt.task_type in (2) and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId} From e4f42a6456fccc8365f35d43a93243e7c4dbef85 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 22 Jan 2025 09:57:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/basic/domain/ToDoBean.java | 3 +++ .../bonus/material/basic/service/impl/ToDoServiceImpl.java | 7 ++++++- .../main/resources/mapper/material/basic/ToDoMapper.xml | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java index 3ed10ae..db637c6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java @@ -18,6 +18,9 @@ import java.util.Date; public class ToDoBean extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "true:出租方 false:承租方") + private boolean flag; + /** 任务ID */ @ApiModelProperty(value = "任务ID") private Long taskId; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java index b91f930..dd63472 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java @@ -25,7 +25,12 @@ public class ToDoServiceImpl implements ToDoService { @Override public List getToDoList(ToDoBean bean) { - bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); + //true:出租方 false:承租方 + if (bean.isFlag()) { + bean.setSellerCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); + } else { + bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); + } return toDoMapper.getToDoList(bean); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml index 7aa5a69..84f026e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml @@ -24,7 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.`status` = '1' and tt.task_status < 20 and tt.task_type in (2) - and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId} + and tt.buyer_company_id=#{buyerCompanyId} + + + and tt.seller_company_id=#{sellerCompanyId} and tt.task_type=#{taskTypeId} From 6391be0117e64f4b3a885d76ca383fea1e39ab45 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 22 Jan 2025 13:53:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"=E4=BB=A3=E5=8A=9E=E4=BC=98?= =?UTF-8?q?=E5=8C=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e4f42a6456fccc8365f35d43a93243e7c4dbef85. --- .../java/com/bonus/material/basic/domain/ToDoBean.java | 3 --- .../bonus/material/basic/service/impl/ToDoServiceImpl.java | 7 +------ .../main/resources/mapper/material/basic/ToDoMapper.xml | 5 +---- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java index db637c6..3ed10ae 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java @@ -18,9 +18,6 @@ import java.util.Date; public class ToDoBean extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "true:出租方 false:承租方") - private boolean flag; - /** 任务ID */ @ApiModelProperty(value = "任务ID") private Long taskId; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java index dd63472..b91f930 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java @@ -25,12 +25,7 @@ public class ToDoServiceImpl implements ToDoService { @Override public List getToDoList(ToDoBean bean) { - //true:出租方 false:承租方 - if (bean.isFlag()) { - bean.setSellerCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); - } else { - bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); - } + bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); return toDoMapper.getToDoList(bean); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml index 84f026e..7aa5a69 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml @@ -24,10 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.`status` = '1' and tt.task_status < 20 and tt.task_type in (2) - and tt.buyer_company_id=#{buyerCompanyId} - - - and tt.seller_company_id=#{sellerCompanyId} + and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId} and tt.task_type=#{taskTypeId} From dc217d8ac42b72d2eb976e33197c50ce8c409612 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 22 Jan 2025 15:03:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/basic/domain/ToDoBean.java | 3 +++ .../material/basic/service/impl/ToDoServiceImpl.java | 2 +- .../order/service/impl/OrderServiceImpl.java | 12 +++++++++++- .../java/com/bonus/material/task/domain/TmTask.java | 3 +++ .../resources/mapper/material/basic/ToDoMapper.xml | 4 ++-- .../resources/mapper/material/task/TmTaskMapper.xml | 5 ++++- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java index 3ed10ae..7914c46 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java @@ -72,4 +72,7 @@ public class ToDoBean extends BaseEntity { @ApiModelProperty(value = "出租方公司名称") private String sellerCompanyName; + @ApiModelProperty(value = "待办通知公司id") + private Long noticeCompanyId; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java index b91f930..4cf677c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java @@ -25,7 +25,7 @@ public class ToDoServiceImpl implements ToDoService { @Override public List getToDoList(ToDoBean bean) { - bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); + bean.setNoticeCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return toDoMapper.getToDoList(bean); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 36ab906..b50644c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -124,6 +124,7 @@ public class OrderServiceImpl implements OrderService { DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(Long.valueOf(orderDetailDtos.get(0).getMaId())); tmTask.setSellerCompanyId(Long.valueOf(devInfoVo.getCompanyId())); } + tmTask.setNoticeCompanyId(tmTask.getSellerCompanyId()); tmTaskMapper.insertSelective(tmTask); } return j; @@ -275,12 +276,21 @@ public class OrderServiceImpl implements OrderService { String userName = SecurityUtils.getLoginUser().getUsername(); Integer i = orderMapper.updateOrderStatus(orderInfoDto.getOrderId(), orderInfoDto.getMaIds(), orderInfoDto.getOrderStatus(), userName); if (!CollectionUtils.isEmpty(dtos)) { - OptionalInt minOrderStatus = dtos.stream().mapToInt(person -> Integer.parseInt(person.getOrderStatus())).min(); + OptionalInt minOrderStatus = dtos.stream().mapToInt(o -> Integer.parseInt(o.getOrderStatus())).min(); if (minOrderStatus.isPresent()) { TmTask tmTask = new TmTask(); tmTask.setTaskType(TmTaskTypeEnum.TM_TASK_ORDER.getTaskTypeId()); tmTask.setTaskStatus(minOrderStatus.getAsInt()); tmTask.setCode(dtos.get(0).getOrderCode()); + if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_PENDING_SHIPMENT.getStatus().toString()) || + orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_TERMINATED.getStatus().toString())) { + tmTask.setNoticeCompanyId(tmTask.getBuyerCompanyId()); + } else if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_RECEIVE.getStatus().toString()) || + orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString()) || + orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_UNDER_LEASE.getStatus().toString()) || + orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_REPAIRED.getStatus().toString())) { + tmTask.setNoticeCompanyId(tmTask.getSellerCompanyId()); + } tmTaskMapper.updateTaskStatus(tmTask); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/domain/TmTask.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/domain/TmTask.java index 4319031..c2ff3b9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/domain/TmTask.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/domain/TmTask.java @@ -52,6 +52,9 @@ public class TmTask extends BaseEntity implements Serializable { @ApiModelProperty(value = "出租方公司id") private Long sellerCompanyId; + @ApiModelProperty(value = "待办通知公司id") + private Long noticeCompanyId; + @ApiModelProperty(value = "关键字") private String keyWord; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml index 7aa5a69..66ffcdb 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml @@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE tt.`status` = '1' and tt.task_status < 20 and tt.task_type in (2) - - and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId} + + and tt.notice_company_id=#{noticeCompanyId} and tt.task_type=#{taskTypeId} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/task/TmTaskMapper.xml index 62ccd9c..e2c05c0 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -46,7 +46,7 @@ update tm_task set - task_status = #{taskStatus}, update_time = NOW() + task_status = #{taskStatus}, notice_company_id = #{noticeCompanyId}, update_time = NOW() where task_type = #{taskType} and code = #{code} @@ -80,6 +80,9 @@ seller_company_id, + + notice_company_id, +