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

guoshilong

2023-12-28 3e2ae8bd7aefb12f5521e49c3bb5c773ef525cae

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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml

@@ -43,10 +43,10 @@
            AND rule.name LIKE CONCAT('%',#{vo.ruleName},'%')
        </if>
        <if test="vo.startTime !=null and vo.startTime !=''">
            AND DATE_FORMAT(qm.create_time,'%Y-%m-%d') &gt;= #{vo.startTime}
            AND qm.create_time &gt;= #{vo.startTime}
        </if>
        <if test="vo.endTime !=null and vo.endTime !=''">
            AND DATE_FORMAT(qm.create_time,'%Y-%m-%d') &lt;= #{vo.endTime}
            AND qm.create_time &lt;= #{vo.endTime}
        </if>
        <if test="vo.adCode != null and vo.adCode != '' ">
            and (aab."ad_code" = #{vo.adCode} or aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode})

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java

@@ -58,7 +58,7 @@
     */
    @ApiModelProperty(value = "厂房布置型式")
    @TableField(value = "\"plant_layout_type\"",fill = FieldFill.UPDATE)
    private Integer plantLayoutType;
    private String plantLayoutType;

    /**
     * 装机容量

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java

@@ -58,7 +58,7 @@
     */
    @ApiModelProperty(value = "正常溢洪道型式")
    @TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
    private Integer spillwayType;
    private String spillwayType;

    /**
     * 是否位于坝身
@@ -93,7 +93,7 @@
     */
    @ApiModelProperty(value = "工作闸门型式")
    @TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE)
    private Integer workingGateType;
    private String workingGateType;

    /**
     * 闸门数量
@@ -128,7 +128,7 @@
     */
    @ApiModelProperty(value = "启闭方式")
    @TableField(value = "\"oc_type\"",fill = FieldFill.UPDATE)
    private Integer ocType;
    private String ocType;

    /**
     * 启闭动力
@@ -142,7 +142,7 @@
     */
    @ApiModelProperty(value = "消能方式")
    @TableField(value = "\"dis_energy_type\"",fill = FieldFill.UPDATE)
    private Integer disEnergyType;
    private String disEnergyType;

    /**
     * 填报状态（0:填写中，1:审核中，2:审核通过）

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java

@@ -58,7 +58,7 @@
     */
    @ApiModelProperty(value = "非常溢洪道型式")
    @TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
    private Integer spillwayType;
    private String spillwayType;

    /**
     * 溢流段长

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java

@@ -149,7 +149,7 @@
     */
    @ApiModelProperty(value = "坝基防渗型式")
    @TableField(value="\"dam_body_type\"",fill = FieldFill.UPDATE)
    private Integer damBodyType;
    private String damBodyType;

    /**
     * 副坝座数

 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);
    }


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

@@ -33,30 +33,30 @@
     * }
     */

    ZC(1,"正槽式溢洪道"),
    ZC("1","正槽式溢洪道"),

    CC(2,"侧槽式溢洪道"),
    CC("2","侧槽式溢洪道"),

    JS(3,"井式溢洪道"),
    JS("3","井式溢洪道"),

    HX(4,"虹吸式溢洪道"),
    HX("4","虹吸式溢洪道"),

    YLB(5,"溢流坝段坝顶溢流"),
    YLB("5","溢流坝段坝顶溢流"),


    QI_TA(9,"其他"),
    QI_TA("9","其他"),

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

    Integer key;
    String key;

    String label;
    SpillwayTypeEnum(Integer key, String label) {
    SpillwayTypeEnum(String key, String label) {
        this.key = key;
        this.label = label;
    }

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


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

@@ -26,25 +26,25 @@
     * }]
     */

    MLS(1,"漫流式"),
    MLS("1","漫流式"),

    ZKS(2,"自溃式"),
    ZKS("2","自溃式"),

    BKYKS(3,"爆破引溃式"),
    BKYKS("3","爆破引溃式"),

    QI_TA(9,"其他"),
    QI_TA("9","其他"),

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

    Integer key;
    String key;

    String label;
    VerSpillwayTypeEnum(Integer key, String label) {
    VerSpillwayTypeEnum(String key, String label) {
        this.key = key;
        this.label = label;
    }

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