商户

src/main/java/com/ssj/dao/sys/fx/dao/impl/FinanceQueryDaoImpl.java

@@ -414,7 +414,9 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          selSql.append(" SELECT tmp.* ");
          selSql.append(" ,((cons_count+deduct_count) * unit_price) AS unit_price_count ");
          selSql.append(" ,(cons_count+deduct_count) AS port_count ");
-         selSql.append(" ,((cons_count+deduct_count) * 20 + derver_count*10) AS cost_count ");
+//         2020.11.2修改内容
+//         selSql.append(" ,((cons_count+deduct_count) * 20 + derver_count*10) AS cost_count ");
+         selSql.append(" ,((cons_count+deduct_count) * 20 ) AS cost_count ");
          selSql.append(" ,? as balance_month ");
          queryParams.add(params.get("startMonth"));
          

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

@@ -535,7 +535,7 @@ public class FinanceReportController extends BaseController {
             myColumns3.add(new ExcelColumn("服务：签约单价", "unit_price", 20));
            
             myColumns3.add(new ExcelColumn("总消费塾币数量", "port_count", 20));
-            myColumns3.add(new ExcelColumn("硬件数量", "derver_count", 20));
+//            myColumns3.add(new ExcelColumn("硬件数量", "derver_count", 20));
             myColumns3.add(new ExcelColumn("收入合计", "unit_price_count", 20));
             myColumns3.add(new ExcelColumn("成本合计", "cost_count", 20));
             

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

@@ -58,10 +58,9 @@
 		    	<th>服务：签约单价</th>
 		    	
 		    	<th>总消费塾币数量</th>
-		    	<th>硬件数量</th>
+<!-- 		    	<th>硬件数量</th> -->
 		    	<th>收入合计</th>
 		    	<th>成本合计</th>
-		    	<th>系统自检</th>
 		    </tr>
 		</thead>
 		<tbody>
@@ -76,10 +75,9 @@
 					<td th:text="${item.get('unit_price')}"></td>
 					
 					<td th:text="${item.get('port_count')}"></td>
-					<td th:text="${item.get('derver_count')}"></td>
+<!-- 					<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>
@@ -108,11 +106,14 @@
 		<li style="line-height: 25px;color: red;">
 			<span style="font-size: 14px;">总消费塾币数量：“消耗塾币”+“最低消费塾币”</span>
 		</li>
+<!-- 		<li style="line-height: 25px;color: red;"> -->
+<!-- 			<span style="font-size: 14px;">硬件数量：商户所绑定的小塾硬件数量。</span> -->
+<!-- 		</li> -->
+<!-- 		<li style="line-height: 25px;color: red;"> -->
+<!-- 			<span style="font-size: 14px;">成本合计=总消费塾币数量*20元+硬件数量*10元。</span> -->
+<!-- 		</li> -->
 		<li style="line-height: 25px;color: red;">
-			<span style="font-size: 14px;">硬件数量：商户所绑定的小塾硬件数量。</span>
-		</li>
-		<li style="line-height: 25px;color: red;">
-			<span style="font-size: 14px;">成本合计=总消费塾币数量*20元+硬件数量*10元。</span>
+			<span style="font-size: 14px;">成本合计=总消费塾币数量*20元</span>
 		</li>
 	</ul>