堤防水库危害统计sql逻辑修改v0.2

yxm

2024-07-05 a23a0403f1666740d2fb36c98f4495b796489703

堤防水库危害统计sql逻辑修改v0.2

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResAndDykeController.java

@@ -26,8 +26,8 @@
    private ITbResAndDykeAllService tbProjectAllService;

    @GetMapping("/getStatistics")
    public R getStatistics(String code){
        List<ResAndDykeAll> list = tbProjectAllService.getStatisticsTable(code);
    public R getStatistics(String code,String year){
        List<ResAndDykeAll> list = tbProjectAllService.getStatisticsTable(code,year);
        return R.data(list);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.java

@@ -9,5 +9,5 @@

@Mapper
public interface TbResAndDykeAllMapper extends BaseMapper<TbProject> {
    List<ResAndDykeAll> getStatisticsTable(String code);
    List<ResAndDykeAll> getStatisticsTable(String code,String year);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml

@@ -57,7 +57,7 @@
        g."guid" AS provinceCode
        FROM
        "SJZT_MD"."att_res_base" a
        LEFT JOIN ( SELECT * FROM "SJZT_MD"."tb_res_general_investigation_state" WHERE "danger_level" <![CDATA[<>]]> '0' AND "check_state" = '3' ) c ON a."guid" = c."res_guid"
        LEFT JOIN ( SELECT * FROM "SJZT_MD"."tb_res_general_investigation_state" WHERE "danger_level" <![CDATA[<>]]> '0' AND "check_state" = '3' and "tb_year" = #{year} ) c ON a."guid" = c."res_guid"
        LEFT JOIN YWXT."att_ad_base" d ON d."ad_code" = a."interior_ad_guid"
        LEFT JOIN YWXT."att_ad_base" e ON d."p_ad_code" = e."ad_code"
        LEFT JOIN YWXT."att_ad_base" f ON e."p_ad_code" = f."ad_code"
@@ -113,7 +113,7 @@
        LEFT JOIN SJZT_MD."tb_dyke_investigation_state" b ON a."dyke_id" = b."dyke_guid"
        WHERE
        a."danger_level" <![CDATA[<>]]> '0'
        AND b."check_state" = '3'
        AND b."check_state" = '3' and b."tb_year" = #{year}
        ) c ON a."guid" = c."dyke_id"
        LEFT JOIN YWXT."att_ad_base" d ON d."ad_code" = a."ad_code"
        LEFT JOIN YWXT."att_ad_base" e ON d."p_ad_code" = e."ad_code"

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

@@ -10,5 +10,5 @@

public interface ITbResAndDykeAllService extends IService<TbProject> {

    List<ResAndDykeAll> getStatisticsTable(String code);
    List<ResAndDykeAll> getStatisticsTable(String code,String year);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResAndDykeAllServiceImpl.java

@@ -22,7 +22,7 @@
    private TbResAndDykeAllMapper tbResAndDykeAllMapper;

    @Override
    public List<ResAndDykeAll> getStatisticsTable(String code) {
        return tbResAndDykeAllMapper.getStatisticsTable(code) ;
    public List<ResAndDykeAll> getStatisticsTable(String code,String year) {
        return tbResAndDykeAllMapper.getStatisticsTable(code,year) ;
    }
}