Lianxun_Java.git

			@@ -72,6 +72,7 @@
			<th class="text-center">应付金额</th>
			<td class="text-center">实付金额</td>
			<td class="text-center">操作员工</td>
			<td class="text-center">缴费时间</td>
			</tr>
			</thead>
			<tbody>
			@@ -83,6 +84,7 @@
			<td class="text-center">{{payFee.receivableAmount}}</td>
			<td class="text-center">{{payFee.receivedAmount}}</td>
			<td class="text-center">{{payFee.userName}}</td>
			<td class="text-center">{{payFee.createTime}}</td>

			</tr>
			</tbody>

			@@ -74,7 +74,7 @@
			function (json, res) {
			var _payFeeManageInfo = JSON.parse(json);
			vc.component.payFeeManageInfo.total = _payFeeManageInfo.total;
			vc.component.payFeeManageInfo.records = _payFeeManageInfo.records;
			vc.component.payFeeManageInfo.records = parseInt(_payFeeManageInfo.total/_rows +1);
			vc.component.payFeeManageInfo.payFees = _payFeeManageInfo.payFees;
			vc.emit('pagination', 'init', {
			total: vc.component.payFeeManageInfo.records,

			@@ -284,7 +284,7 @@
			param = params.getInteger(sqls[sqlIndex]);
			}
			//这里对 page 和 rows 特殊处理，目前没有想到其他的办法
			if (StringUtils.isNumeric(param.toString()) && "page,rows".contains(sqls[sqlIndex])) {
			if (StringUtils.isNumeric(param.toString()) && "page,rows,row".contains(sqls[sqlIndex])) {
			param = Integer.parseInt(param.toString());
			}
			currentParams.add(param);
			@@ -345,6 +345,7 @@
			for (String oSql : oSqls) {
			logger.debug("处理if 节点，当前处理的oSql=" + oSql + "总的oSqls = " + oSqls);
			if(StringUtil.isNullOrNone(oSql) \|\| !oSql.contains("<if")){
			newSql.append(oSql);
			continue;
			}
			if (!oSql.startsWith("<if")) {

	ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史