Bläddra i källkod

税率显示调整

lzm 3 år sedan
förälder
incheckning
8f71cc01cf

+ 4 - 4
sp-admin/sa-view/tb-fee-statistics/dayStatsPrint.html

@@ -24,7 +24,7 @@
     <legend>打印区</legend>
     <div id="myPrintArea" style="height: 1500;">
       <div align="center">
-        <SPAN style="TEXT-DECORATION: underline;font-size:25px" id="headName">日报表</SPAN>
+        <SPAN style="font-size:25px" id="headName">统计报表(日)</SPAN>
         <br/><br/>
       </div>
       <div style="text-align:center; font-size:15px;he">
@@ -84,12 +84,12 @@
     var isMonth = getUrlParam('isMonth');
     isMonth = isMonth != '' ? isMonth : null;
     if(isMonth != null){
-      $("#headName").html("月报表");
+      $("#headName").html("统计报表(月)");
     }
     var isYear = getUrlParam('isYear');
     isYear = isYear != '' ? isYear : null;
     if(isYear != null){
-      $("#headName").html("年报表");
+      $("#headName").html("统计报表(年)");
     }
 
 
@@ -134,7 +134,7 @@
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['yuePrice'] +
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['num'] +
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxMoney'] +
-                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxRate'] +
+                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxRate']*100 +
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxes'] +
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['noTaxMoney'] + "</td></tr>"
           )

+ 1 - 1
sp-server/src/main/java/com/pj/project/tb_fee_statistics/TbFeeStatisticsService.java

@@ -549,7 +549,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
             dayStatsDTO.setDayTime(stats.getDay())
                     .setFeeType(feeType).setNum(stats.getNum())
                     .setTaxMoney(stats.getTaxMoney())
-                    .setTaxRate(stats.getTaxRate())
+                    .setTaxRate(stats.getTaxRate().multiply(BigDecimal.valueOf(100)))
                     .setTaxes(stats.getTaxes())
                     .setNoTaxMoney(stats.getNoTaxMoney())
                     .setWxPrice(stats.getTaxMoney());