hbwri/skjcmanager.git

			@@ -22,7 +22,7 @@
			LEFT JOIN BLADE_USER U ON U.ID = SF.CREATE_USER
			WHERE SF.IS_DELETED = 0
			<if test="vo.createUser != null and vo.createUser !=''">
			SF.CREATE_USER = #{vo.createUser}
			AND SF.CREATE_USER = #{vo.createUser}
			</if>
			ORDER BY SF.CREATE_TIME DESC
			</select>

			@@ -6,12 +6,14 @@
			SELECT MM.*,
			aab1."ad_name" cityName,
			aab2."ad_name" countyName,
			aab3."ad_name" townName
			aab3."ad_name" townName,
			BDB.DICT_VALUE materialTypeName
			FROM SM_MATERIALS_MANAGE MM
			LEFT JOIN SJZT_MD."att_ad_base" aab1 ON aab1."guid" = MM.city
			LEFT JOIN SJZT_MD."att_ad_base" aab2 ON aab2."guid" = MM.county
			LEFT JOIN SJZT_MD."att_ad_base" aab3 ON aab3."guid" = MM.town
			WHERE MM.IS_DELETED = 0
			LEFT JOIN BLADE_DICT_BIZ BDB ON MM.MATERIALS_TYPE = BDB.DICT_KEY
			WHERE MM.IS_DELETED = 0 AND BDB.CODE='MATERIALS_TYPE'
			<if test="vo.resName !=null and vo.resName !=''">
			AND MM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%')
			</if>

			@@ -20,4 +20,9 @@
			* 镇名
			*/
			private String townName;

			/**
			* 物资类型名
			*/
			private String materialTypeName;
			}

	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/mapper/FeedbackMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml	6 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/MaterialsManageVO.java	5 ●●●●● patch \| view \| raw \| blame \| history