From 416fc2bf6c8a66487732977e095b5da548224313 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 25 Dec 2024 13:42:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderServiceImpl.java | 14 ++++++++++++++ .../com/bonus/material/task/domain/TmTask.java | 2 +- .../resources/mapper/material/basic/ToDoMapper.xml | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) 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 0a1c6bb..a5b0e1f 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 @@ -2,6 +2,7 @@ package com.bonus.material.order.service.impl; import com.bonus.common.biz.enums.MaStatusEnum; import com.bonus.common.biz.enums.OrderStatusEnum; +import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.security.utils.SecurityUtils; @@ -16,6 +17,8 @@ import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; import com.bonus.material.order.mapper.OrderMapper; import com.bonus.material.order.service.OrderService; +import com.bonus.material.task.domain.TmTask; +import com.bonus.material.task.mapper.TmTaskMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -36,6 +39,9 @@ public class OrderServiceImpl implements OrderService { @Resource private OrderMapper orderMapper; + @Resource + private TmTaskMapper tmTaskMapper; + @Resource private LeaseRepairRecordMapper leaseRepairRecordMapper; @@ -87,6 +93,14 @@ public class OrderServiceImpl implements OrderService { orderMapper.insertOrderDetail(orderDetailDto); } } + TmTask tmTask = new TmTask(); + tmTask.setTaskType(TmTaskTypeEnum.TM_TASK_ORDER.getTaskTypeId()); + tmTask.setTaskStatus(OrderStatusEnum.TO_ORDER_PLACED.getStatus()); + tmTask.setCode(code); + tmTask.setCreateBy(SecurityUtils.getLoginUser().getUsername()); + tmTask.setCreateTime(DateUtils.getNowDate()); + tmTask.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + tmTaskMapper.insertSelective(tmTask); } return j; } 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 49cf46d..a0cac4a 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 @@ -141,7 +141,7 @@ public class TmTask implements Serializable { * 数据所属组织 */ @ApiModelProperty(value = "数据所属组织") - private Integer companyId; + private Long companyId; @ApiModelProperty(value = "协议id") private Integer agreementId; 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 2bc578d..6425beb 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 @@ -11,14 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.task_type as taskTypeId, sd2.dict_label as taskType, sd3.dict_label as taskEvent, - us.user_name as createName, + tt.create_by as createName, tt.create_by as createBy, tt.create_time as createTime FROM tm_task tt LEFT JOIN sys_dict_data sd2 on sd2.dict_value=tt.task_type LEFT JOIN sys_dict_data sd3 on sd3.dict_value=tt.task_status - LEFT JOIN sys_user us on us.user_id=tt.create_by + -- LEFT JOIN sys_user us on us.user_id=tt.create_by WHERE tt.`status` = '1' and sd2.dict_type in ('tm_task_type')