|
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
f.facs_subcategory,
|
|
|
<if test="(facsCategory != null and facsCategory != '') or (facsSubCategory != null and facsSubCategory != '')">
|
|
|
<if test="objCode == null or objCode == ''">
|
|
|
- fs.name as obj_name,
|
|
|
+ fs.name as sub_obj_name,
|
|
|
</if>
|
|
|
</if>
|
|
|
i.record_time,
|
|
@@ -79,8 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="areaCode != null and areaCode != '' and areaCode != '-1'">and i.area_code = #{areaCode}</if>
|
|
|
<if test="objType != null">and i.obj_type = #{objType}</if>
|
|
|
<if test="objCode != null and objCode != ''">and i.obj_code = #{objCode}</if>
|
|
|
- <if test="facsCategory != null and facsCategory != ''">and fa.facs_category = #{facsCategory}</if>
|
|
|
- <if test="facsSubCategory != null and facsSubCategory != ''">and fa.facs_subcategory = #{facsSubCategory}
|
|
|
+ <if test="facsCategory != null and facsCategory != ''">and f.facs_category = #{facsCategory}</if>
|
|
|
+ <if test="facsSubCategory != null and facsSubCategory != ''">and f.facs_subcategory = #{facsSubCategory}
|
|
|
</if>
|
|
|
<if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">
|
|
|
and i.`record_time` >= #{startRecTime} and i.`record_time` <= #{endRecTime}
|