From a9ca59b7330a190acf473d0a97336fec069eb2e1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 25 Dec 2024 12:08:57 +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 --- .../common/biz/enums/TmTaskTypeEnum.java | 13 +--- .../basic/controller/ToDoController.java | 41 ++++++++++ .../bonus/material/basic/domain/ToDoBean.java | 76 +++++++++++++++++++ .../material/basic/mapper/ToDoMapper.java | 22 ++++++ .../material/basic/service/ToDoService.java | 23 ++++++ .../basic/service/impl/ToDoServiceImpl.java | 41 ++++++++++ .../mapper/material/basic/ToDoMapper.xml | 54 +++++++++++++ 7 files changed, 259 insertions(+), 11 deletions(-) create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/ToDoController.java create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/ToDoMapper.java create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/ToDoService.java create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java create mode 100644 bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java index b45d22a..6f26dab 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java @@ -4,17 +4,8 @@ import lombok.Getter; @Getter public enum TmTaskTypeEnum { - - TM_TASK_PURCHASE(0, "新购"), - TM_TASK_PURCHASE_PART(1, "新购配件任务"), - TM_TASK_LEASE(2, "领料任务"), - TM_TASK_BACK(3, "退料任务"), - TM_TASK_REPAIR(4, "维修任务"), - TM_TASK_REPAIR_STORAGE(5, "修试后入库任务"), - TM_TASK_SCRAP(6, "报废任务"), - TM_TASK_SETTLEMENT(7, "结算任务"), - TM_TASK_CHECK(8, "检验任务"), - TM_TASK_FACTORY_MANAGEMENT(9, "物资厂家管理任务"), + TM_TASK_DEV(1, "商城装备维护任务"), + TM_TASK_ORDER(2, "商城订单任务"), TM_TASK_AGREEMENT_MANAGEMENT(10, "新增协议任务"), TM_TASK_ADD_DEVICE_TASK(17, "新增商城物资任务"), TM_TASK_ADD_REQUIREMENT_TASK(18, "新增商城需求任务"), diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/ToDoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/ToDoController.java new file mode 100644 index 0000000..69ed1b0 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/ToDoController.java @@ -0,0 +1,41 @@ +package com.bonus.material.basic.controller; + +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.material.basic.domain.ToDoBean; +import com.bonus.material.basic.service.ToDoService; +import com.bonus.material.common.annotation.PreventRepeatSubmit; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@Api(tags = " 代办事项") +@RestController +@RequestMapping("/todo") +public class ToDoController extends BaseController { + @Autowired + private ToDoService toDoService; + + /** + * 代办事项列表 + */ + @ApiOperation(value = "代办事项列表") + @GetMapping("/getToDoList") + public TableDataInfo getToDoList(ToDoBean bean) + { + startPage(); + List list = toDoService.getToDoList(bean); + return getDataTable(list); + } + + @ApiOperation(value = "代办事件下拉") + @PreventRepeatSubmit + @PostMapping("/getTaskType") + public AjaxResult getTaskType(ToDoBean bean){ + return toDoService.getTaskType(bean); + } + +} 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 new file mode 100644 index 0000000..06f8d90 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java @@ -0,0 +1,76 @@ +package com.bonus.material.basic.domain; + + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 代办事项 + * @Author 阮世耀 + * @Create 2023/12/13 15:45 + * @Version 1.0 + */ +@Data +public class ToDoBean extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 任务ID */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + + /** 任务单号 */ + @Excel(name = "任务单号") + @ApiModelProperty(value = "任务单号") + private String taskCode; + + /** + * 代办事件id + */ + private String taskTypeId; + + /** 代办任务 */ + @Excel(name = "代办任务") + @ApiModelProperty(value = "代办任务") + private String taskType; + + /** 代办事件 */ + @Excel(name = "代办事件") + @ApiModelProperty(value = "代办事件") + private String taskEvent; + + /** 任务创建人id */ + @ApiModelProperty(value = "任务创建人") + private String createBy; + + /** + * 创建人姓名 + */ + private String createName; + + /** 创建时间 */ + @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "关键字") + private String keyWord; + + /** 备注 */ + @Excel(name = "备注") + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 开始时间 + */ + private String startTime; + /** + * 结束时间 + */ + private String endTime; + +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/ToDoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/ToDoMapper.java new file mode 100644 index 0000000..d5ebffa --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/ToDoMapper.java @@ -0,0 +1,22 @@ +package com.bonus.material.basic.mapper; + +import com.bonus.material.basic.domain.ToDoBean; +import org.apache.ibatis.annotations.Mapper; +import java.util.List; + +@Mapper +public interface ToDoMapper { + /** + * 代办事项列表 + * @param bean + * @return + */ + List getToDoList(ToDoBean bean); + + /** + * 获取TaskType + * @param bean + * @return ToDoBean + */ + List getTaskType(ToDoBean bean); +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/ToDoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/ToDoService.java new file mode 100644 index 0000000..eb3e511 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/ToDoService.java @@ -0,0 +1,23 @@ +package com.bonus.material.basic.service; + +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.basic.domain.ToDoBean; +import java.util.List; + + +public interface ToDoService { + /** + * 代办事项列表 + * @param bean + * @return + */ + List getToDoList(ToDoBean bean); + + /** + * 代办事件下拉 + * @param bean + * @return + */ + AjaxResult getTaskType(ToDoBean bean); + +} 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 new file mode 100644 index 0000000..62bb848 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java @@ -0,0 +1,41 @@ +package com.bonus.material.basic.service.impl; + +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.basic.domain.ToDoBean; +import com.bonus.material.basic.mapper.ToDoMapper; +import com.bonus.material.basic.service.ToDoService; +import com.bonus.system.api.RemoteUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class ToDoServiceImpl implements ToDoService { + + @Resource + private ToDoMapper toDoMapper; + + @Resource + private RemoteUserService remoteUserService; + + @Override + public List getToDoList(ToDoBean bean) { + return toDoMapper.getToDoList(bean); + } + + @Override + public AjaxResult getTaskType(ToDoBean bean) { + List list =new ArrayList<>(); + try { + list = toDoMapper.getTaskType(bean); + } catch (Exception e) { + log.error("代办事件-查询失败", e); + } + return AjaxResult.success(list); + } + +} 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 new file mode 100644 index 0000000..2bc578d --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + \ No newline at end of file