代码提交

resources/mybatis/index/IndexHomeDetailsMapper.xml

@@ -272,6 +272,9 @@
 						<if test="maType != null and maType != ''">
 							and mat2.`NAME` like concat ('%',#{maType},'%')
 						</if>
+						<if test="isCount != null and isCount != ''">
+							and rs.isCount = #{isCount}
+						</if>
 					</where>
 					GROUP BY rs.typeId
 	</select>
@@ -1457,7 +1460,7 @@
 			and tpd.`NAME` like concat('%', #{maName}, '%')
 		</if>
 	</select>
-	<select id="getNewlyStored">
+	<select id="getNewlyStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
 		select mt2.NAME as maType,
 		       mt.NAME as maName,
 		       wir.CODE as maCode,
@@ -1468,7 +1471,7 @@
 		left join mm_type mt2 on mt.PARENT_ID = mt2.ID
 		where wir.TYPE = #{type}
 	</select>
-	<select id="getInventoryStored">
+	<select id="getInventoryStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
 		select mt2.NAME as maType,
 		       mt.NAME as maName,
 			   mt.UNIT as maUnit,