Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-12-28 3e2ae8bd7aefb12f5521e49c3bb5c773ef525cae

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/PlantLayoutTypeEnum.java

@@ -32,28 +32,28 @@
    *     }
    */

   FANG_HONG(1,"坝后式"),
   FANG_HONG("1","坝后式"),

   GUAN_GAI(2,"坝内式"),
   GUAN_GAI("2","坝内式"),

   GONG_SHUI(3,"地下式"),
   GONG_SHUI("3","地下式"),

   FA_DIAN(4,"河床式"),
   FA_DIAN("4","河床式"),

   HANG_YUN(5,"引水式"),
   QI_TA(10,"其他"),
   HANG_YUN("5","引水式"),
   QI_TA("10","其他"),

   NULL_ABLE(-1,"");
   NULL_ABLE("-1","");

   int key;
   String key;

   String label;
   PlantLayoutTypeEnum(int key,String label) {
   PlantLayoutTypeEnum(String key,String label) {
      this.key = key;
      this.label = label;
   }

   public static PlantLayoutTypeEnum find(int key) {
   public static PlantLayoutTypeEnum find(String key) {
      return Arrays.stream(values()).filter(resFucEnum -> resFucEnum.key == key).findAny().orElse(NULL_ABLE);
   }