hbwri/skjcmanager.git

			@@ -31,7 +31,7 @@

			</select>
			<select id="queryStepList" resultType="cn.gistack.sm.sg.DO.SgGxStepDO">
			select * from YWXT.SG_GX_STEP step inner join YWXT.SG_GX sg on sg.id=step.gx_info_id
			select step.* from YWXT.SG_GX_STEP step inner join YWXT.SG_GX sg on sg.id=step.gx_info_id
			left join YWXT.SG_DEVICE sd on sd.device_type=sg.gx_type
			where sd.id= #{deviceId}
			</select>

			@@ -14,10 +14,13 @@
			left join YWXT."BLADE_DICT_BIZ" as dict on de.device_type=dict.DICT_KEY and dict.CODE='SG_DEVICE_TYPE'
			where 1=1
			<if test="dto.projectName != null and dto.projectName != ''">
			and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName},'%'))
			and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName}),'%')
			</if>
			<if test="dto.deviceName != null and dto.deviceName != ''">
			and de.device_name like CONCAT(CONCAT('%', #{dto.deviceName}), '%')
			</if>
			<if test="dto.status != null ">
			and report.status = #{dto.status}
			</if>
			</select>
			<select id="queryById" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
			@@ -84,7 +87,7 @@
			left join YWXT."BLADE_DICT_BIZ" as dict on de.device_type=dict.DICT_KEY and dict.CODE='SG_DEVICE_TYPE'
			where 1=1
			<if test="dto.projectName != null and dto.projectName != ''">
			and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName},'%'))
			and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName}),'%')
			</if>
			<if test="dto.deviceName != null and dto.deviceName != ''">
			and de.device_name like CONCAT(CONCAT('%', #{dto.deviceName}), '%')

	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml	7 ●●●●● patch \| view \| raw \| blame \| history