bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

待办

This commit is contained in:
sxu 2024-12-25 13:42:04 +08:00
parent 6e26b144ff
commit 416fc2bf6c
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -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;
}

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/domain/TmTask.java
View File

@ -141,7 +141,7 @@ public class TmTask implements Serializable {
* 数据所属组织
*/
@ApiModelProperty(value = "数据所属组织")
private Integer companyId;
private Long companyId;
@ApiModelProperty(value = "协议id")
private Integer agreementId;

4
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml
View File

@ -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')