Index: ssts-web/src/main/resources/local-mybatis-config.xml
===================================================================
diff -u -r24632 -r24661
--- ssts-web/src/main/resources/local-mybatis-config.xml	(.../local-mybatis-config.xml)	(revision 24632)
+++ ssts-web/src/main/resources/local-mybatis-config.xml	(.../local-mybatis-config.xml)	(revision 24661)
@@ -5,7 +5,12 @@
 <configuration>
 	<properties resource="jdbc.properties">
 	</properties>
+	<settings>
+        <!-- 打印查询语句 -->
+        <setting name="logImpl" value="STDOUT_LOGGING" />
+    </settings>
 	<typeAliases>
+		<typeAlias alias="dxpo_InvoicePlan" type="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan" />
 		<typeAlias alias="dxpo_WashAndDisinfectRecord" type="com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord" />
 		<typeAlias alias="dxpo_Invoice" type="com.forgon.disinfectsystem.entity.invoicemanager.Invoice" />
 		<typeAlias alias="dxpo_PackingRecord" type="com.forgon.disinfectsystem.entity.packing.PackingRecord" />
Index: ssts-web/src/main/resources/mybatis/mappers/common.xml
===================================================================
diff -u -r24357 -r24661
--- ssts-web/src/main/resources/mybatis/mappers/common.xml	(.../common.xml)	(revision 24357)
+++ ssts-web/src/main/resources/mybatis/mappers/common.xml	(.../common.xml)	(revision 24661)
@@ -5,21 +5,70 @@
 <mapper
 	namespace="com.forgon">
 
-	<sql id="gridCommonSql">
-		<where>
-		<foreach item="item" collection="whereItems">
-			<choose>
+	<sql id="gridCommonSql_field">
+		<choose>
 				<when test="item.operator == 'between'">
-				AND (${item.db} BETWEEN #{item.min} AND #{item.max})
+				 (${item.columnLabel} BETWEEN #{item.min} AND #{item.max})
 				</when>
 				<when test="item.operator == 'like'">
-				AND (${item.dbField} LIKE concat('%',#{item.filter.value},'%'))
+				 (${item.columnLabel} LIKE concat('%',#{item.value},'%'))
 				</when>
 				<otherwise>
+				 (${item.columnLabel} ${item.operator} #{item.value})
 				</otherwise>
+		</choose>
+	</sql>
+	
+	<sql id="gridCommonSql_field_l2">
+		<choose>
+				<when test="item_l2.operator == 'between'">
+				 (${item_l2.columnLabel} BETWEEN #{item_l2.min} AND #{item_l2.max})
+				</when>
+				<when test="item_l2.operator == 'like'">
+				 (${item_l2.columnLabel} LIKE concat('%',#{item_l2.value},'%'))
+				</when>
+				<otherwise>
+				 (${item_l2.columnLabel} ${item_l2.operator} #{item_l2.value})
+				</otherwise>
+		</choose>
+	</sql>
+	<sql id="gridCommonSql_items_l2">
+		<foreach item="item_l2" index="index_l2" collection="item.filters" open="("  close=")">
+			<if test="index_l2>0">
+		    ${item.logicalOperator}
+		    </if>
+			<include refid="com.forgon.gridCommonSql_field_l2"></include>
+		</foreach>
+	</sql>
+	<!-- <sql id="gridCommonSql_items_l2">
+		<foreach item="item" index="index" collection="item.filters" open="("  close=")">
+			<if test="index>0">
+		    ${item.parent.logicalOperator}
+		    </if>
+			<include refid="com.forgon.gridCommonSql_field"></include>
+		</foreach>
+	</sql> -->
+	
+	<sql id="gridCommonSql_where">
+		<foreach item="item" index="index" collection="filters" open="(" close=")">
+			<if test="index>0">
+		    ${logicalOperator}
+		    </if>
+			<choose>
+				<when test="item.filters != null and item.filters.size>0">
+				<include refid="com.forgon.gridCommonSql_items_l2"></include>
+				</when>
+				<otherwise>
+				<include refid="com.forgon.gridCommonSql_field"></include>
+				</otherwise>
 			</choose>
 		</foreach>
-	</where>
+	</sql>
+	
+	<sql id="gridCommonSql">
+		<where>
+			<include refid="com.forgon.gridCommonSql_where"></include>
+		</where>
 	${orderBySql}
 	</sql>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/mybatis/mappers/test/test.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/mybatis/mappers/test/test.xml	(revision 0)
+++ ssts-web/src/main/resources/mybatis/mappers/test/test.xml	(revision 24661)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper
+	namespace="com.forgon.disinfectsystem.test">
+
+	<resultMap id="TestResult" type="dxpo_InvoicePlan">
+		<id property="id" column="id" />
+	</resultMap>
+	<select id="findTestList" parameterType="map" resultMap="TestResult">
+	SELECT *
+	FROM InvoicePlan
+	<where>
+		${whereSql}
+	</where>
+	</select>
+	
+	<!--  <sql id="commonSql_field">
+		<where>
+		<choose>
+				<when test="item.operator == 'between'">
+				and (${item.columnLabel} BETWEEN #{item.min} AND #{item.max})
+				</when>
+				<when test="item.operator == 'like'">
+				AND (${item.columnLabel} LIKE concat('%',#{item.value},'%'))
+				</when>
+				<otherwise>
+				AND (${item.columnLabel} ${item.operator} #{item.value})
+				</otherwise>
+		</choose>
+	</where>
+	</sql>
+	
+	<sql id="commonSql_fields">
+		<where>
+		<foreach item="item" collection="${item.filters}" open="(" separator=" AND " close=")">
+			<choose>
+				<when test="item.filters != null and item.filters.size>0">
+				<include refid="commonSql_fields"></include>
+				</when>
+				<otherwise>
+				<include refid="commonSql_field"></include>
+				</otherwise>
+			</choose>
+		</foreach>
+	</where>
+	</sql>-->
+	
+	<select id="findTestList2" parameterType="map" resultMap="TestResult">
+	SELECT *
+	FROM InvoicePlan
+	<where>
+		<include refid="com.forgon.gridCommonSql_where"></include>
+	</where>
+	${orderBySql}
+	</select> 
+</mapper>
\ No newline at end of file