收费统计打印导出调整

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

@@ -27,12 +27,12 @@
         <SPAN style="font-size:25px" id="headName">统计报表（日）</SPAN>
         <br/><br/>
       </div>
-      <div style="text-align:center; font-size:15px;he">
+      <div style="text-align:center; font-size:15px;">
         <table id="dp" width="100%" style="border-collapse:collapse;border:none;">
           <tr height="80">
-            <td style="border:solid #000 1px;text-align: left;" colspan="3">单位：广西东兴北投口岸投资有限公司</td>
-            <td style="border:solid #000 1px;text-align: center;" colspan="5">金额单位：元</td>
-            <td style="border:solid #000 1px;text-align: right;" colspan="3"><div  id="time" align="right"></div></td>
+            <td id="company" style="border:solid #000 1px;text-align: left;" colspan="3">单位：广西东兴北投口岸投资有限公司</td>
+            <td id="unit" style="border:solid #000 1px;text-align: center;" colspan="7">金额单位：元</td>
+            <td id="td_time" style="border:solid #000 1px;text-align: right;" colspan="4"><div  id="time" align="right"></div></td>
           </tr>
           <tr height="80">
             <td style="border:solid #000 1px; " rowspan="2">日期</td>
@@ -43,6 +43,9 @@
             <td style="border:solid #000 1px; " rowspan="2">税率</td>
             <td style="border:solid #000 1px; " rowspan="2">税款</td>
             <td style="border:solid #000 1px; " rowspan="2">不含税金额</td>
+            <td id="person1" style="border:solid #000 1px; " rowspan="2">开单员</td>
+            <td id="person2" style="border:solid #000 1px; " rowspan="2">复核员</td>
+            <td id="person3" style="border:solid #000 1px; " rowspan="2">统计稽查员</td>
           </tr>
           <tr height="80">
             <td style="border:solid #000 1px; " >微信</td>
@@ -85,11 +88,23 @@
     isMonth = isMonth != '' ? isMonth : null;
     if(isMonth != null){
       $("#headName").html("统计报表（月）");
+      $("#person1").remove();
+      $("#person2").remove();
+      $("#person3").remove();
+      $("#company").attr('colspan', 3);
+      $("#unit").attr('colspan', 5);
+      $("#td_time").attr('colspan', 3);
     }
     var isYear = getUrlParam('isYear');
     isYear = isYear != '' ? isYear : null;
     if(isYear != null){
       $("#headName").html("统计报表（年）");
+      $("#person1").remove();
+      $("#person2").remove();
+      $("#person3").remove()
+      $("#company").attr('colspan', 3);
+      $("#unit").attr('colspan', 5);
+      $("#td_time").attr('colspan', 3);
     }
 
 
@@ -136,8 +151,17 @@
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxMoney'] +
                   "</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>"
+                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['noTaxMoney']
           )
+          if(isMonth==null && isYear==null){
+            html.push(
+                    "</td><td style=\"border:solid #000 1px; \">" + list[i]['kaiDanPerson'] +
+                    "</td><td style=\"border:solid #000 1px; \">" + list[i]['diaoDuPerson'] +
+                    "</td><td style=\"border:solid #000 1px; \">" + list[i]['jiChaPerson'] + "</td></tr>"
+            )
+          }else{
+            html.push("</td></tr>")
+          }
         }
         var totalMoney = data.data.totalMoney;
         var totalTaxes = data.data.totalTaxes;
@@ -157,8 +181,17 @@
                 "</td><td style=\"border:solid #000 1px; \">" + totalMoney +
                 "</td><td style=\"border:solid #000 1px; \">" +
                 "</td><td style=\"border:solid #000 1px; \">" + totalTaxes +
-                "</td><td style=\"border:solid #000 1px; \">" + totalNoTaxMoney + "</td></tr>"
+                "</td><td style=\"border:solid #000 1px; \">" + totalNoTaxMoney
         )
+        if(isMonth==null && isYear==null){
+          html.push(
+                  "</td><td style=\"border:solid #000 1px; \">" +
+                  "</td><td style=\"border:solid #000 1px; \">" +
+                  "</td><td style=\"border:solid #000 1px; \">" + "</td></tr>"
+          )
+        }else{
+          html.push("</td></tr>")
+        }
         $("#dp").append(html.join(''));
 
         $("#time").html("期间：" + data.data.time);

sp-admin/sa-view/tb-fee-statistics/detailPrint.html

@@ -32,7 +32,7 @@
           <tr height="80">
             <td style="border:solid #000 1px;text-align: left;" colspan="5">单位：广西东兴北投口岸投资有限公司</td>
             <td style="border:solid #000 1px;text-align: center;" colspan="8">金额单位：元</td>
-            <td style="border:solid #000 1px;text-align: right;" colspan="3"><div  id="time" align="right"></div></td>
+            <td style="border:solid #000 1px;text-align: right;" colspan="6"><div  id="time" align="right"></div></td>
           </tr>
           <tr height="80">
             <td style="border:solid #000 1px; ">序号</td>
@@ -51,6 +51,9 @@
             <td style="border:solid #000 1px; ">业务单号</td>
             <td style="border:solid #000 1px; ">企业名称</td>
             <td style="border:solid #000 1px; ">付款时间</td>
+            <td style="border:solid #000 1px; ">开单员</td>
+            <td style="border:solid #000 1px; ">复核员</td>
+            <td style="border:solid #000 1px; ">统计稽查员</td>
           </tr>
         </table>
 
@@ -128,7 +131,11 @@
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['payType'] +
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['businessNo'] +
                   "</td><td style=\"border:solid #000 1px; \">" + list[i]['pickCustomerName'] +
-                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['payTime'] + "</td></tr>"
+                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['payTime'] +
+                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['kaiDanPerson'] +
+                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['diaoDuPerson'] +
+                  "</td><td style=\"border:solid #000 1px; \">" + list[i]['jiChaPerson'] + "</td></tr>"
+
           )
         }
         var allDayFee = data.data.allDayFee;
@@ -150,6 +157,9 @@
                 "</td><td style=\"border:solid #000 1px; \">" +
                 "</td><td style=\"border:solid #000 1px; \">" +
                 "</td><td style=\"border:solid #000 1px; \">" +
+                "</td><td style=\"border:solid #000 1px; \">" +
+                "</td><td style=\"border:solid #000 1px; \">" +
+                "</td><td style=\"border:solid #000 1px; \">" +
                 "</td><td style=\"border:solid #000 1px; \"></td></tr>"
         )
         $("#dp").append(html.join(''));

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -373,7 +373,10 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
                     .setSettle("已结算").setTaxRate(feeDetails.getTaxRate().multiply(new BigDecimal(100)))
                     .setTaxPrice(feeDetails.getTaxPrice()).setNoTaxPrice(feeDetails.getNoTaxPrice()).setPayTime(feeDetails.getPayTime())
                     .setPickCustomerName(feeDetails.getPickCustomerName())
-                    .setTransactionId(feeDetails.getTransactionId());
+                    .setTransactionId(feeDetails.getTransactionId())
+                    .setKaiDanPerson(feeDetails.getKaiDanPerson())
+                    .setJiChaPerson(feeDetails.getJiChaPerson())
+                    .setDiaoDuPerson(feeDetails.getDiaoDuPerson());
             if(!StrUtil.isEmpty(feeDetails.getBusinessId())){
                 detailDTO.setBusinessNo(feeDetails.getBusinessNo());
             }else {
@@ -501,7 +504,10 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
                     .setWeight(feeDetails.getWeight()).setNum(feeDetails.getNum()).setUnitPrice(feeDetails.getUnitPrice())
                     .setSettle("已结算").setTaxRate(feeDetails.getTaxRate().multiply(new BigDecimal(100)))
                     .setTaxPrice(feeDetails.getTaxPrice()).setNoTaxPrice(feeDetails.getNoTaxPrice()).setPayTime(feeDetails.getPayTime())
-                    .setPickCustomerName(feeDetails.getPickCustomerName());
+                    .setPickCustomerName(feeDetails.getPickCustomerName())
+                    .setKaiDanPerson(feeDetails.getKaiDanPerson()!=null?feeDetails.getKaiDanPerson():"")
+                    .setJiChaPerson(feeDetails.getJiChaPerson()!=null?feeDetails.getJiChaPerson():"")
+                    .setDiaoDuPerson(feeDetails.getDiaoDuPerson()!=null?feeDetails.getDiaoDuPerson():"");
             if(!StrUtil.isEmpty(feeDetails.getBusinessId())){
                 detailDTO.setBusinessNo(feeDetails.getBusinessNo());
             }else {

sp-server/src/main/java/com/pj/project/tb_fee_details/dto/ExportFeeDetailDTO.java

@@ -42,6 +42,19 @@ public class ExportFeeDetailDTO {
     private String pickCustomerName;
     private String transactionId;
 
+    /**
+     * 开单员
+     */
+    private String kaiDanPerson;
+    /**
+     * 统计稽查员
+     */
+    private String jiChaPerson;
+    /**
+     * 复核员
+     */
+    private String diaoDuPerson;
+
 
 
 

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

@@ -482,7 +482,10 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
                     .setTaxRate(stats.getTaxRate())
                     .setTaxes(stats.getTaxes())
                     .setNoTaxMoney(stats.getNoTaxMoney())
-                    .setWxPrice(stats.getTaxMoney());
+                    .setWxPrice(stats.getTaxMoney())
+                    .setKaiDanPerson(stats.getKaiDanPerson()!=null?stats.getKaiDanPerson():"")
+                    .setJiChaPerson(stats.getJiChaPerson()!=null?stats.getJiChaPerson():"")
+                    .setDiaoDuPerson(stats.getDiaoDuPerson()!=null?stats.getDiaoDuPerson():"");
             if(StrUtil.isNotEmpty(isMonth)){
                 dayStatsDTO.setDayTime(stats.getMonth());
             }
@@ -552,7 +555,10 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
                     .setTaxRate(stats.getTaxRate().multiply(BigDecimal.valueOf(100)))
                     .setTaxes(stats.getTaxes())
                     .setNoTaxMoney(stats.getNoTaxMoney())
-                    .setWxPrice(stats.getTaxMoney());
+                    .setWxPrice(stats.getTaxMoney())
+                    .setKaiDanPerson(stats.getKaiDanPerson())
+                    .setJiChaPerson(stats.getJiChaPerson())
+                    .setDiaoDuPerson(stats.getDiaoDuPerson());
             if(StrUtil.isNotEmpty(isMonth)){
                 dayStatsDTO.setDayTime(stats.getMonth());
             }
@@ -593,8 +599,11 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
         if (!saveFIle.exists()) {
             saveFIle.mkdirs();
         }
-
-        ClassPathResource classPathResource = new ClassPathResource("static/stats.xlsx");
+        String template = "static/stats.xlsx";
+        if(StrUtil.isNotEmpty(isMonth) || StrUtil.isNotEmpty(isYear)){
+            template = "static/stats_year.xlsx";
+        }
+        ClassPathResource classPathResource = new ClassPathResource(template);
         InputStream tempInputStream =classPathResource.getInputStream();
         ExcelWriter excelWriter = EasyExcel.write(savePath + fileName, ExportFeeDetailDTO.class)
                 .withTemplate(tempInputStream).build();

sp-server/src/main/java/com/pj/project/tb_fee_statistics/dto/ExportDayStatsDTO.java

@@ -63,4 +63,17 @@ public class ExportDayStatsDTO {
 
     private BigDecimal yuePrice = new BigDecimal(0);
 
+    /**
+     * 开单员
+     */
+    private String kaiDanPerson;
+    /**
+     * 统计稽查员
+     */
+    private String jiChaPerson;
+    /**
+     * 复核员
+     */
+    private String diaoDuPerson;
+
 }