1

src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageFcbgzMapper.xml

@@ -723,6 +723,9 @@
 	    <if test="jznd != null">
         and jznd=#{jznd,jdbcType=VARCHAR}
         </if>
+        <if test="lyxz != null">
+        and lyxz=#{lyxz,jdbcType=INTEGER}
+        </if>
 	) c on c.hwh=a.hwh and c.jznd=a.jznd
 	where 1=1 
 	<if test="sfjz==1">

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageFcbgzServiceImpl.java

@@ -178,7 +178,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 					list.add(f_day);
 				}
 				//查询这个月的合计数据
-				jznd_month_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, null, jznd, null, StorageFcbgzUtils.DATA_TYPE_1);
+				jznd_month_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, null, StorageFcbgzUtils.DATA_TYPE_1);
 				if (null != jznd_month_jz_sum_list && jznd_month_jz_sum_list.size() > 0) {
 					list.add(jznd_month_jz_sum_list.get(0));
 				}
@@ -191,7 +191,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 
 
 		/** 查[jznd]年的年合计数据  start  **/
-		List<StorageFcbgz> jznd_year_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, null, jznd, null, StorageFcbgzUtils.DATA_TYPE_2); //[jznd]年的合计
+		List<StorageFcbgz> jznd_year_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, null, StorageFcbgzUtils.DATA_TYPE_2); //[jznd]年的合计
 		if (null != jznd_year_jz_sum_list && jznd_year_jz_sum_list.size() > 0) {
 			year_jz_obj = jznd_year_jz_sum_list.get(0);
 			list.add(year_jz_obj);