aix
2024-07-02 fd57c81a19ade4753d052c7cc1bd48264bf29044
提防普查危害等级评定增加危害长度
4 files modified
15 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeUnitDangerController.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbDykeUnitDanger.java 7 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml 5 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeUnitDangerController.java
@@ -28,7 +28,7 @@
    private ITbDykeUnitDangerService tbDykeUnitDangerService;
    @ApiOperation(value = "堤防危害等级评定-添加或者修改", notes = "堤防危害等级评定-添加或者修改")
    @ApiOperation(value = "堤防危害等级评定-危害列表", notes = "堤防危害等级评定-危害列表")
    @GetMapping(value = "/listDykeUnitDanger")
    public R listDykeUnitDanger(@ApiIgnore TbDykeUnitDangerVO vo) {
        return R.data(tbDykeUnitDangerService.listDykeUnitDanger(vo));
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbDykeUnitDanger.java
@@ -57,5 +57,12 @@
    @TableField(value = "\"danger_level\"")
    private Integer dangerLevel;
    /**
     * 危害长度
     */
    @ApiModelProperty(value = "危害长度")
    @TableField(value = "\"danger_length\"")
    private Integer dangerLength;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
@@ -4,7 +4,10 @@
    <select id="listDykeUnitDanger" resultType="cn.gistack.sm.sjztmd.vo.TbDykeUnitDangerVO">
        select tdi.*,ifnull(tdud."danger_level",0) dangerLevel,tdud."id" from (
            select "dyke_guid" dykeGuid,"unit",count(*) dangerNum,wm_concat(distinct "signs_of_termite_activity") hdjxs from sjzt_md."tb_dyke_investigation"
            select
                "dyke_guid" dykeGuid,"unit",count(*) dangerNum,wm_concat(distinct "signs_of_termite_activity") hdjxs,
                sum("danger_length") as dangerLength
            from sjzt_md."tb_dyke_investigation"
            where "hazard_rating" = '有危害'
            <if test="params.dykeGuid != null and params.dykeGuid != ''">
                and "dyke_guid" = #{params.dykeGuid}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java
@@ -16,5 +16,6 @@
    private String hdjxs;//活动迹象
    private String id;//危害等级评定id
    private Integer dangerLevel;//危害等级评定
    private Double dangerLength;//危害长度
}