任务类型模板配置

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDeptTaskTypeTemplateController.java

@@ -1,14 +1,20 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.entity.WmDeptTaskTypeTemplate;
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskType;
 import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
 import com.qunzhixinxi.hnqz.admin.service.WmDeptTaskTypeTemplateService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,16 +41,26 @@ public class WmDeptTaskTypeTemplateController {
 
 	private final WmDeptTaskTypeTemplateService wmDeptTaskTypeTemplateService;
 
+	private final WmTaskTypeService wmTaskTypeService;
+
 	/**
 	 * 查询任务类型模板配置列表
 	 *
 	 * @return
 	 */
 	@GetMapping("/list")
-	public R<?> listDeptTaskTypeTemplate(@RequestParam(name = "deptId") Integer deptId) {
-		List<WmDeptTaskTypeTemplate> list = wmDeptTaskTypeTemplateService.list(Wrappers.<WmDeptTaskTypeTemplate>lambdaQuery()
+	public R<?> listDeptTaskTypeTemplate(Page<WmDeptTaskTypeTemplate> page, @RequestParam(name = "deptId") Integer deptId) {
+		IPage<WmDeptTaskTypeTemplate> resultPage = wmDeptTaskTypeTemplateService.page(page, Wrappers.<WmDeptTaskTypeTemplate>lambdaQuery()
 				.eq(WmDeptTaskTypeTemplate::getDeptId, deptId));
-		return R.ok(list);
+		if (CollUtil.isNotEmpty(resultPage.getRecords())) {
+			resultPage.getRecords().forEach(wmDeptTaskTypeTemplate -> {
+				WmTaskType taskType = wmTaskTypeService.getById(wmDeptTaskTypeTemplate.getTaskTypeId());
+				if (taskType != null) {
+					wmDeptTaskTypeTemplate.setTaskTypeName(taskType.getTaskTypeName());
+				}
+			});
+		}
+		return R.ok(resultPage);
 	}
 
 	/**
@@ -55,7 +71,14 @@ public class WmDeptTaskTypeTemplateController {
 	 */
 	@GetMapping("/{id}")
 	public R<WmDeptTaskTypeTemplate> getDeptTaskTypeTemplateById(@PathVariable("id") Integer id) {
-		return R.ok(wmDeptTaskTypeTemplateService.getById(id));
+		WmDeptTaskTypeTemplate taskTypeTemplate = wmDeptTaskTypeTemplateService.getById(id);
+		if (taskTypeTemplate != null) {
+			WmTaskType taskType = wmTaskTypeService.getById(taskTypeTemplate.getTaskTypeId());
+			if (taskType != null) {
+				taskTypeTemplate.setTaskTypeName(taskType.getTaskTypeName());
+			}
+		}
+		return R.ok(taskTypeTemplate);
 	}
 
 	/**
@@ -92,4 +115,17 @@ public class WmDeptTaskTypeTemplateController {
 
 		return R.ok();
 	}
+
+	/**
+	 * 根据id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping("/{id}")
+	public R<?> deleteDeptTaskTypeTemplate(@PathVariable("id") Integer id) {
+		wmDeptTaskTypeTemplateService.removeById(id);
+
+		return R.ok();
+	}
 }