湖北水库项目
parent: bdcec3cf | patch | commit | show whitespace
shenyijian
2024-09-14 1982ca657ae879f9033899f9ed94628ed4b20a2c 
湖北水库：待办列表修复
1 files modified
4 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml 4 ●●●●● patch | view | raw | blame | history 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml


@@ -83,7 +83,7 @@


        DBMS_LOB.SUBSTR(report.video_urls) videoUrls,


        de.device_name,


        de.device_type,


       <!-- userR.approval_status, -->


        userR.approval_status,


        dict."DICT_VALUE" as typeName,


        si.control_unit,si.self_unit,dria."county_cd"


        FROM


@@ -99,7 +99,7 @@


            and  si.CONTROL_UNIT=#{dto.userUnit}


        </if>


        <if test="dto.roleUnit != null and dto.roleUnit != ''">


            and userR.role_id=#{dto.roleUnit}


            and userR.role_id=#{dto.roleUnit} and report.audit_person = #{dto.roleUnit}


        </if>


       <!-- AND userR.is_his = 0 -->


        <if test="dto.projectName != null and dto.projectName != ''">