فهرست منبع

feat: 精细化管理新增模板

lixuesong 1 سال پیش
والد
کامیت
ec93b7973d

+ 25 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsType.java

@@ -234,4 +234,29 @@ public final class UpmsType {
 			return null;
 		}
 	}
+
+	/**
+	 * 模板类型
+	 *
+	 * @author lixuesong
+	 * @date 2023/12/05
+	 */
+	@Getter
+	@AllArgsConstructor
+	public enum TemplateType {
+
+		TEMP1("模板1", "模板1"),
+		TEMP2("模板2", "模板2");
+
+		/**
+		 * 类型
+		 */
+		@EnumValue
+		private final String type;
+
+		/**
+		 * 描述
+		 */
+		private final String description;
+	}
 }

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

@@ -1,9 +1,11 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 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.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.entity.WmDeptTaskTypeTemplate;
 import com.qunzhixinxi.hnqz.admin.entity.WmTaskType;
 import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
@@ -98,6 +100,10 @@ public class WmDeptTaskTypeTemplateController {
 		if (existCount > 0) {
 			return R.failed("任务类型已存在");
 		}
+		if (!UpmsType.TemplateType.TEMP1.equals(wmDeptTaskTypeTemplate.getTemplate())) {
+			// 除模板1外, 其他模板科室数默认为1
+			wmDeptTaskTypeTemplate.setDetail(MapUtil.of("numberLimit", 1));
+		}
 		wmDeptTaskTypeTemplate.setCreateTime(LocalDateTime.now());
 		wmDeptTaskTypeTemplate.setCreateUser(SecurityUtils.getUser().getId());
 		wmDeptTaskTypeTemplate.setUpdateUser(null);
@@ -118,7 +124,14 @@ public class WmDeptTaskTypeTemplateController {
 		WmDeptTaskTypeTemplate update = new WmDeptTaskTypeTemplate();
 		update.setId(wmDeptTaskTypeTemplate.getId());
 		update.setTemplate(wmDeptTaskTypeTemplate.getTemplate());
-		update.setDetail(wmDeptTaskTypeTemplate.getDetail());
+
+		if (!UpmsType.TemplateType.TEMP1.equals(wmDeptTaskTypeTemplate.getTemplate())) {
+			// 除模板1外, 其他模板科室数默认为1
+			update.setDetail(MapUtil.of("numberLimit", 1));
+		} else {
+			update.setDetail(wmDeptTaskTypeTemplate.getDetail());
+		}
+
 		update.setUpdateTime(LocalDateTime.now());
 		update.setUpdateUser(SecurityUtils.getUser().getId());
 		wmDeptTaskTypeTemplateService.updateById(update);

+ 3 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmDeptTaskTypeTemplate.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +25,7 @@ import java.util.Map;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "wm_dept_task_type_template", autoResultMap = true)
 public class WmDeptTaskTypeTemplate extends Model<WmDeptTaskTypeTemplate> {
+	private static final long serialVersionUID = 592460712418561510L;
 
 	/**
 	 * 主键id
@@ -60,7 +62,7 @@ public class WmDeptTaskTypeTemplate extends Model<WmDeptTaskTypeTemplate> {
 	 * 模板
 	 */
 	@NotBlank(message = "模板不能为空", groups = {BaseEntity.Create.class, BaseEntity.Update.class})
-	private String template;
+	private UpmsType.TemplateType template;
 
 	/**
 	 * 规则详情