商户

src/main/java/com/ssj/dao/weixin/library/dao/impl/ILibJoinConsumeQueryDaoImpl.java

@@ -56,7 +56,16 @@ public class ILibJoinConsumeQueryDaoImpl   implements ILibJoinConsumeQueryDao {
 			selSql.append("  t.to_merchant_id=? AND t.type=4 OR ");	queryParams.add(params.get("merchantId"));
 			selSql.append("  t.from_merchant_id=? AND t.type=2 OR ");	queryParams.add(params.get("merchantId"));
 			selSql.append("  t.from_merchant_id=? AND t.type=3 OR ");	queryParams.add(params.get("merchantId"));
-			selSql.append("  t.from_merchant_id=? AND t.type=5 ");	queryParams.add(params.get("merchantId"));
+			selSql.append("  t.from_merchant_id=? AND t.type=5 OR ");	queryParams.add(params.get("merchantId"));
+			
+			selSql.append("  t.to_merchant_id=? AND t.type=6 OR ");	queryParams.add(params.get("merchantId"));
+			selSql.append("  t.to_merchant_id=? AND t.type=9 OR ");	queryParams.add(params.get("merchantId"));
+			
+			selSql.append("  t.from_merchant_id=? AND t.type=7 OR");	queryParams.add(params.get("merchantId"));
+			selSql.append("  t.from_merchant_id=? AND t.type=8 OR");	queryParams.add(params.get("merchantId"));
+			selSql.append("  t.from_merchant_id=? AND t.type=10 OR");	queryParams.add(params.get("merchantId"));
+			selSql.append("  t.from_merchant_id=? AND t.type=11 ");	queryParams.add(params.get("merchantId"));
+			
 			selSql.append(" )  ");
 		}
 		selSql.append(" ORDER BY t.create_time DESC  ");

src/main/java/com/ssj/sys/controller/FinanceReportController.java

@@ -631,6 +631,8 @@ public class FinanceReportController extends BaseController {
             					new BigDecimal(map.get("price").toString()).doubleValue()*
             					0.4  
             					: 0);
+            		}else {
+            			map.put("price", "0");
             		}
             	}
             	
@@ -642,6 +644,8 @@ public class FinanceReportController extends BaseController {
             					new BigDecimal(map.get("count_2").toString()).intValue()
             					*0.4 
             					: 0);
+            		}else {
+            			map.put("price_1", "0");
             		}
             	}
             	
@@ -658,15 +662,15 @@ public class FinanceReportController extends BaseController {
             myColumns3.add(new ExcelColumn("服务包名称", "sign_type", 20));
             
             myColumns3.add(new ExcelColumn("服务包/月金额", "price", 20));
-            myColumns3.add(new ExcelColumn("总有效服务数", "sum_1", 20));
-            myColumns3.add(new ExcelColumn("总结束服务数", "sum_2", 20));
+//            myColumns3.add(new ExcelColumn("总有效服务数", "sum_1", 20));
+//            myColumns3.add(new ExcelColumn("总结束服务数", "sum_2", 20));
             myColumns3.add(new ExcelColumn("服务包/结算月份", "count_1_m", 20));
             
             myColumns3.add(new ExcelColumn("服务包应结算金额", "sum_price_1", 20));
             
             myColumns3.add(new ExcelColumn("加油包/月金额", "price_1", 20));
-            myColumns3.add(new ExcelColumn("加油包/有效服务数", "sum_3", 20));
-            myColumns3.add(new ExcelColumn("加油包/结束服务数", "sum_4", 20));
+//            myColumns3.add(new ExcelColumn("加油包/有效服务数", "sum_3", 20));
+//            myColumns3.add(new ExcelColumn("加油包/结束服务数", "sum_4", 20));
             myColumns3.add(new ExcelColumn("加油包/结算月份", "count_2_m", 20));
             myColumns3.add(new ExcelColumn("加油包/结算数量", "count_2", 20));
             

src/main/resources/templates/sys/finance/allList4.html

@@ -61,6 +61,7 @@
 		    	<th>硬件数量</th>
 		    	<th>收入合计</th>
 		    	<th>成本合计</th>
+		    	<th>系统自检</th>
 		    </tr>
 		</thead>
 		<tbody>
@@ -78,6 +79,7 @@
 					<td th:text="${item.get('derver_count')}"></td>
 					<td th:text="${item.get('unit_price_count')}"></td>
 					<td th:text="${item.get('cost_count')}"></td>
+					<td th:text="${item.get('filter_count')}"></td>
 			</tr>
 		</tbody>
 	</table>

src/main/resources/templates/sys/finance/allList6.html

@@ -67,15 +67,15 @@
 		    	<th>服务包名称</th>
 		    	
 		    	<th>服务包/月金额</th>
-		    	<th>总有效服务数</th>
-		    	<th>总结束服务数</th>
+<!-- 		    	<th>总有效服务数</th> -->
+<!-- 		    	<th>总结束服务数</th> -->
 		    	<th>结算月份</th>
 		    	<th>服务包结算金额</th>
 		    	
 
 		    	<th style="color: red">加油包/月金额</th>
-		    	<th style="color: red">加油包/有效服务数</th>
-		    	<th style="color: red">加油包/结束服务数</th>
+<!-- 		    	<th style="color: red">加油包/有效服务数</th> -->
+<!-- 		    	<th style="color: red">加油包/结束服务数</th> -->
 		    	<th style="color: red">加油包/结算月份</th>
 		    	<th style="color: red">加油包/结算数</th>
 		    	<th style="color: red">加油包结算金额</th>
@@ -97,15 +97,15 @@
 					   <span th:case="2" >服务包2</span>
 					   <span th:case="3" >服务包3</span>
 					</td>
-					<td th:text="${item.get('price')}"></td>
-					<td th:text="${item.get('sum_1')}"></td>
-					<td th:text="${item.get('sum_2')}"></td>
+					<td th:text="${item.get('count_1')>0 ? item.get('price') : '0' }"></td>
+<!-- 					<td th:text="${item.get('sum_1')}"></td> -->
+<!-- 					<td th:text="${item.get('sum_2')}"></td> -->
 					<td th:text="${item.get('count_1')>0 ? item.get('balance_month') : ''   }"></td>
 					<td th:text="${item.get('sum_price_1')}"></td>
 	
-					<td th:text="700"></td>
-					<td th:text="${item.get('sum_3')}"></td>
-					<td th:text="${item.get('sum_4')}"></td>
+					<td th:text="${item.get('count_2')>0 ? '700' : '0' }"></td>
+<!-- 					<td th:text="${item.get('sum_3')}"></td> -->
+<!-- 					<td th:text="${item.get('sum_4')}"></td> -->
 					<td th:text="${item.get('count_2')>0 ? item.get('balance_month') : ''   }"></td>
 					<td th:text="${item.get('count_2')>0 ? item.get('count_2') : ''   }"></td>
 					<td th:text="${item.get('sum_price_2')}"></td>