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

gonglilong

2024-09-14 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml

@@ -66,14 +66,30 @@
                #{id}
            </foreach>)
        </if>
        <if test="dto.projectSort == null or dto.projectSort ==0">
            ORDER BY info.status desc ,info.project_progress desc
        <if test="dto.deptId != null and dto.deptId !=''">
            and (info.control_unit = #{dto.deptId} or info.construction_unit = #{dto.deptId})
        </if>
        <if test="dto.projectSort ==1">
            ORDER BY info.project_progress desc
       <if test="dto.projectSort == null">
            ORDER BY info.status desc ,info.project_progress desc NULLS LAST
        </if>
        <if test="dto.projectSort != null and dto.projectSort ==2">
            ORDER BY info.sk_id asc
        <!--
       <if test="dto.projectSort ==1">
           ORDER BY info.project_progress desc NULLS LAST
       </if>
       <if test="dto.projectSort != null and dto.projectSort ==2">
           ORDER BY info.sk_id asc
       </if>-->
        <if test="dto.projectSort != null and dto.projectSort ==3">
            ORDER BY info.surface_progress desc NULLS LAST
        </if>
        <if test="dto.projectSort != null and dto.projectSort ==4">
            ORDER BY info.video_progress desc NULLS LAST
        </if>
        <if test="dto.projectSort != null and dto.projectSort ==5">
            ORDER BY info.trans_progress desc NULLS LAST
        </if>
        <if test="dto.projectSort != null and dto.projectSort ==6">
            ORDER BY info.seepage_progress desc NULLS LAST
        </if>
    </select>

@@ -167,6 +183,10 @@
     <if test="dto.buildStage != null and dto.buildStage != ''">
         and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
     </if>
     <if test="dto.deptId != null and dto.deptId !=''">
         and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
     </if>
        ORDER BY pro.project_progress desc NULLS LAST
    </select>
    <select id="getSgstatiss" resultType="cn.gistack.sm.sg.VO.SgStatisticsVO">
        SELECT
@@ -323,10 +343,11 @@
        select DISTINCT  "bas_guid"  from SJZT_DW."dim_res_info_a" where "bas_name" = #{code}
    </select>
    <select id="progressList1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
        select pro.id,
        select DISTINCT pro.id,
        pro.project_name,
        pro.lon_lat,
        pro.status
        pro.status,
        pro.project_progress
        from
        (SELECT
        pro.id,
@@ -337,7 +358,10 @@
        pro.build_stage,
        dria."county_cd" AS countyCode,
        att."guid" AS cityCode,
        ad."ad_code" AS provinceCode
        ad."ad_code" AS provinceCode,
        pro.project_progress,
        pro.control_unit,
        pro.construction_unit
        FROM
        ywxt.sg_project_info pro
        LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
@@ -361,6 +385,10 @@
        <if test="dto.buildStage != null and dto.buildStage != ''">
            and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
        </if>
        <if test="dto.deptId != null and dto.deptId !=''">
            and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
        </if>
        order by pro.project_progress desc NULLS LAST
    </select>
    <select id="queryStepByProject1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
    select
@@ -515,4 +543,15 @@
            </foreach>)
        </if>
    </select>
    <select id="getUserS" resultType="java.lang.String">

        SELECT
            user_id
        FROM
            "YWXT"."BLADE_USER_DEPT"
        WHERE
            dept_id = #{controlUnit}


    </select>
</mapper>