yxm
2024-07-13 f764a496e48c1b9f407a27a7591e88c760dc049a
项目进度上报点击图标上报逻辑优化
3 files modified
17 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml 12 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java
@@ -37,4 +37,6 @@
    List<Map<String, Object>> getUserByIds(@Param("ids") List<Long> ids);
    List<SgProgressReportVO> queryPageListAll(@Param("page") IPage<SgProgressReportVO> page, @Param("dto") ProjectSearchDTO searchDTO);
    Long selectProframId(Long deviceId);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -175,4 +175,7 @@
            </foreach>
        </if>
    </select>
    <select id="selectProframId" resultType="java.lang.Long">
        select program_id from ywxt.sg_device where id = #{deviceId}
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml
@@ -8,7 +8,17 @@
        att."p_ad_code" pcode,
        att."p_ad_name" pname,
        att."ad_grad" adGrad,
        ROUND(IFNULL(b.lengthSum, 0) / 1000, 3) AS lengthSum,
        ROUND(IFNULL(( SELECT
            sum( CASE WHEN trd."dyke_length" THEN trd."dyke_length" ELSE 0 END )
        FROM
            SJZT_MD."tb_res_dyke" trd
            LEFT JOIN ywxt."att_ad_base" county ON county."ad_code" = trd."ad_code"
            LEFT JOIN ywxt."att_ad_base" city ON city."ad_code" = county."p_ad_code"
            LEFT JOIN ywxt."att_ad_base" province ON province."ad_code" = city."p_ad_code"
        WHERE
            county."ad_code" = att."guid"
            OR city."ad_code" = att."guid"
            OR province."ad_code" = att."guid"), 0) / 1000, 3) AS lengthSum,
        ROUND(IFNULL(b.levelOneLengthOne, 0) / 1000, 3) AS levelOneLengthOne,
        ROUND(IFNULL(b.levelOneLengthTwo, 0) / 1000, 3) AS levelOneLengthTwo,
        ROUND(IFNULL(b.levelOneLengthThree, 0) / 1000, 3) AS levelOneLengthThree,