周龄、饲养天数修改为范围填写

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/constants/GeneStatusEnum.java

@@ -1,5 +1,7 @@
 package com.github.jfcloud.gene.constants;
 
+import cn.hutool.core.lang.Pair;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -10,6 +12,7 @@ public enum GeneStatusEnum {
     DRAFT("0", "待提交"),
     REJECTED("-1", "驳回"),
     GENE_EDITING("20", "基因编辑部门负责人审核"),
+    DEPART_LEADER("25", "部门负责人审核"),
     PROJECT_LEADER("40", "项目负责人审核"),
     PROJECT_MANAGEMENT("60", "项目管理部审核"),
     COMPLETED("100", "已完成");
@@ -35,6 +38,10 @@ public enum GeneStatusEnum {
         return description;
     }
 
+    public Pair<String, String> toPair() {
+        return new Pair<>(status, description);
+    }
+
     public static GeneStatusEnum getByStatus(String status) {
         for (GeneStatusEnum e : values()) {
             if (e.getStatus().equals(status)) {
@@ -43,4 +50,29 @@ public enum GeneStatusEnum {
         }
         return null;
     }
+
+    /**
+     * 基因定制流程状态列表
+     */
+    public static List<Pair<String, String>> getGeneStatusList() {
+        return Arrays.asList(DRAFT.toPair(),
+                REJECTED.toPair(),
+                GENE_EDITING.toPair(),
+                PROJECT_LEADER.toPair(),
+                PROJECT_MANAGEMENT.toPair(),
+                COMPLETED.toPair()
+        );
+    }
+
+    /**
+     * 样本送检流程状态列表
+     */
+    public static List<Pair<String, String>> getSampleStatusList() {
+        return Arrays.asList(DRAFT.toPair(),
+                REJECTED.toPair(),
+                DEPART_LEADER.toPair(),
+                PROJECT_MANAGEMENT.toPair(),
+                COMPLETED.toPair()
+        );
+    }
 }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/controller/FlowController.java

@@ -2,6 +2,7 @@ package com.github.jfcloud.gene.flow.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,7 +25,6 @@ import com.github.jfcloud.gene.flow.vo.FlowPageVo;
 import com.github.jfcloud.gene.flow.vo.SynProjectVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javafx.util.Pair;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,8 +33,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Tag(name = "基因定制流程")
 @RestController
@@ -61,11 +59,7 @@ public class FlowController {
     @Operation(summary = "状态列表")
     @GetMapping("/statusList")
     public R<List<Pair<String, String>>> statusList() {
-        List<Pair<String, String>> pairs = Stream.of(GeneStatusEnum.values())
-                .filter(e -> GeneStatusEnum.REJECTED != e)
-                .map(x -> new Pair<>(x.getStatus(), x.getDescription()))
-                .collect(Collectors.toList());
-        return R.ok(pairs);
+        return R.ok(GeneStatusEnum.getGeneStatusList());
     }
 
     @WebApiLog

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/entity/AnimalDemand.java

@@ -29,7 +29,7 @@ public class AnimalDemand extends BaseEntity implements Serializable {
     /**
      * 周龄
      */
-    private Integer ageWeeks;
+    private String ageWeeks;
     /**
      * 数量
      */

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/entity/CageDemand.java

@@ -33,7 +33,7 @@ public class CageDemand extends BaseEntity implements Serializable {
     /**
      * 饲养天数
      */
-    private Integer breedingDays;
+    private String breedingDays;
     /**
      * 特殊饲料饲养
      */

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/vo/AnimalDemandVo.java

@@ -16,7 +16,7 @@ public class AnimalDemandVo {
      * 周龄
      */
     @Schema(description = "周龄")
-    private Integer ageWeeks;
+    private String ageWeeks;
     /**
      * 数量
      */

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/vo/CageDemandVo.java

@@ -21,7 +21,7 @@ public class CageDemandVo {
      * 饲养天数
      */
     @Schema(description = "饲养天数")
-    private Integer breedingDays;
+    private String breedingDays;
     /**
      * 特殊饲料饲养
      */

jfcloud-gene-biz/src/main/resources/sql/ddl-20250306.sql

@@ -0,0 +1,5 @@
+ALTER TABLE jfcloud_gene.flow_info MODIFY COLUMN project_name varchar(500) NOT NULL COMMENT '项目名称';
+ALTER TABLE jfcloud_gene.strain_purification_info MODIFY COLUMN strain_name varchar(500) NOT NULL COMMENT '品系名称';
+
+ALTER TABLE jfcloud_gene.animal_demand MODIFY COLUMN age_weeks VARCHAR(10) NOT NULL COMMENT '周龄';
+ALTER TABLE jfcloud_gene.cage_demand MODIFY COLUMN breeding_days varchar(50) NOT NULL COMMENT '饲养天数';

jfcloud-gene-biz/src/main/resources/sql/init.sql

@@ -8,7 +8,7 @@ CREATE TABLE `system_properties`
 CREATE TABLE flow_info
 (
     id                   BIGINT PRIMARY KEY COMMENT '主键',
-    project_name         VARCHAR(255) NOT NULL COMMENT '项目名称',
+    project_name         VARCHAR(500) NOT NULL COMMENT '项目名称',
     target               VARCHAR(30)  NOT NULL COMMENT '品系定制custom，品系净化扩繁purification',
     status               VARCHAR(5)   NOT NULL COMMENT '状态',
     contract_no          VARCHAR(255) NULL COMMENT '合同编号',
@@ -121,7 +121,7 @@ CREATE TABLE strain_purification_info
 (
     id                            BIGINT PRIMARY KEY COMMENT '主键',
     flow_id                       BIGINT COMMENT '流程主键',
-    strain_name                   VARCHAR(50)  NOT NULL COMMENT '品系名称',
+    strain_name                   VARCHAR(500)  NOT NULL COMMENT '品系名称',
     breeding_location             VARCHAR(255) NOT NULL COMMENT '动物饲养地',
     source                        VARCHAR(100) NOT NULL COMMENT '获得来源',
     source_link                   TEXT COMMENT '引种来源官方网站链接',