统计报表页尾合计

sp-admin/sa-view/tb-fee-statistics/month-statistcs-list.html

@@ -51,7 +51,7 @@
 				<!-- ------------- 快捷按钮 ------------- -->
 				<div class="fast-btn">
 					<el-button size="mini" type="info" @click="sa.f5()">刷新</el-button>
-					<el-button type="warning"  @click="exportFn()">导出(月统计)</el-button>
+<!--					<el-button type="warning"  @click="exportFn()">导出(月统计)</el-button>-->
 					<el-button class="c-btn" type="success" icon="el-icon" @click="print()">打印(月报表)</el-button>
 
 				</div>
@@ -200,6 +200,18 @@
 						this.tableSum.noTaxMoneySum = Number(noTaxMoneySum).toFixed(2);
 
 					},
+					getTotalMoney(){
+						if ( this.selectMonth != null && this.selectMonth.length != 0) {
+							this.selectMonthRange.beginMonth = this.selectMonth[0];
+							this.selectMonthRange.endMonth = this.selectMonth[1];
+						}
+						sa.ajax('/TbFeeStatistics/getSum?beginMonth='+this.selectMonthRange.beginMonth+"&endMonth="+this.selectMonthRange.endMonth,
+								sa.removeNull(this.p), function(res) {
+									this.tableSum.taxMoneySum = res.data.taxMoneySum;
+									this.tableSum.taxesSum = res.data.taxesSum;
+									this.tableSum.noTaxMoneySum = res.data.noTaxMoneySum;
+								}.bind(this));
+					},
 					print: function() {
 						if ( this.selectMonth != null && this.selectMonth.length != 0) {
 							this.selectMonthRange.beginMonth = this.selectMonth[0];
@@ -276,8 +288,9 @@
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数 
 							sa.f5TableHeight();		// 刷新表格高度
-							this.calcuSum();
+
 						}.bind(this));
+						this.getTotalMoney();
 					},
 					// 查看
 					get: function(data) {

sp-admin/sa-view/tb-fee-statistics/tb-fee-details-list.html

@@ -323,7 +323,10 @@
 						}
 						sa.ajax('/TbFeeDetails/getTotalMoney?beginTime='+this.selectTimeRange.beginTime+'&endTime='+this.selectTimeRange.endTime,
 								sa.removeNull(this.p), function(res) {
-									this.totalPrice = res.data;
+									this.totalPrice = res.data.itemPriceSum;
+									this.tableSum.itemPriceSum = res.data.itemPriceSum;
+									this.tableSum.taxPriceSum = res.data.taxPriceSum;
+									this.tableSum.noTaxPriceSum = res.data.noTaxPriceSum;
 								}.bind(this));
 					},
 					kaiDanConfirm(){
@@ -516,7 +519,6 @@
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数 
 							sa.f5TableHeight();		// 刷新表格高度
-							this.calcuSum();
 						}.bind(this));
 						this.getTotalPrice();
 					},

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

@@ -20,13 +20,13 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<div class="c-item">
-						<label class="c-label">类型：</label>
-						<el-select v-model="p.type" placeholder="请选择" filterable>
-							<el-option label="停车费" value="4"></el-option>
-							<el-option label="业务费" value="1,2,3,5,6,7"></el-option>
-						</el-select>
-					</div>
+<!--					<div class="c-item">-->
+<!--						<label class="c-label">类型：</label>-->
+<!--						<el-select v-model="p.type" placeholder="请选择" filterable>-->
+<!--							<el-option label="停车费" value="4"></el-option>-->
+<!--							<el-option label="业务费" value="1,2,3,5,6,7"></el-option>-->
+<!--						</el-select>-->
+<!--					</div>-->
 					<div class="c-item">
 						<label class="c-label">收费项目：</label>
 						<el-select v-model="p.feeType" placeholder="请选择" filterable>
@@ -192,6 +192,18 @@
 						this.tableSum.noTaxMoneySum = Number(noTaxMoneySum).toFixed(2);
 
 					},
+					getTotalMoney(){
+						if ( this.selectDay != null && this.selectDay.length != 0) {
+							this.selectDayRange.beginDay = this.selectDay[0];
+							this.selectDayRange.endDay = this.selectDay[1];
+						}
+						sa.ajax('/TbFeeStatistics/getSum?beginDay='+this.selectDayRange.beginDay+"&endDay="+this.selectDayRange.endDay,
+								sa.removeNull(this.p), function(res) {
+									this.tableSum.taxMoneySum = res.data.taxMoneySum;
+									this.tableSum.taxesSum = res.data.taxesSum;
+									this.tableSum.noTaxMoneySum = res.data.noTaxMoneySum;
+								}.bind(this));
+					},
 					print: function() {
 						if ( this.selectDay != null && this.selectDay.length != 0) {
 							this.selectDayRange.beginDay = this.selectDay[0];
@@ -249,15 +261,14 @@
 							this.selectDayRange.beginDay = this.selectDay[0];
 							this.selectDayRange.endDay = this.selectDay[1];
 						}
-						console.log(this.selectDayRange.beginDay);
-						console.log(this.selectDayRange.endDay);
 						sa.ajax('/TbFeeStatistics/getList?beginDay='+this.selectDayRange.beginDay+"&endDay="+this.selectDayRange.endDay,
 								sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数 
 							sa.f5TableHeight();		// 刷新表格高度
-							this.calcuSum();
+
 						}.bind(this));
+						this.getTotalMoney();
 					},
 					// 查看
 					get: function(data) {

sp-admin/sa-view/tb-fee-statistics/year-statistcs-list.html

@@ -168,6 +168,13 @@
 						this.tableSum.noTaxMoneySum = Number(noTaxMoneySum).toFixed(2);
 
 					},
+					getTotalMoney(){
+						sa.ajax('/TbFeeStatistics/getSum', sa.removeNull(this.p), function(res) {
+									this.tableSum.taxMoneySum = res.data.taxMoneySum;
+									this.tableSum.taxesSum = res.data.taxesSum;
+									this.tableSum.noTaxMoneySum = res.data.noTaxMoneySum;
+								}.bind(this));
+					},
 					print: function() {
 						var year = this.p.year;
 						var feeType = this.p.feeType;
@@ -217,8 +224,8 @@
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数 
 							sa.f5TableHeight();		// 刷新表格高度
-							this.calcuSum();
 						}.bind(this));
+						this.getTotalMoney();
 					},
 					// 查看
 					get: function(data) {

sp-admin/sa-view/tb-partner/tb-business-item-list.html

@@ -21,14 +21,14 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<div class="c-item">
-						<label class="c-label">业务类型：</label>
-						<el-select v-model="p.businessType">
-							<el-option label="消杀业务" value="1"></el-option>
-							<el-option label="核酸业务" value="3"></el-option>
-							<el-option label="整车业务" value="2"></el-option>
-						</el-select>
-					</div>
+<!--					<div class="c-item">-->
+<!--						<label class="c-label">业务类型：</label>-->
+<!--						<el-select v-model="p.businessType">-->
+<!--							<el-option label="消杀业务" value="1"></el-option>-->
+<!--							<el-option label="核酸业务" value="3"></el-option>-->
+<!--							<el-option label="整车业务" value="2"></el-option>-->
+<!--						</el-select>-->
+<!--					</div>-->
 					<sa-item type="text" name="项目名称" v-model="p.itemName"></sa-item>
 					<sa-item type="text" name="越南车" v-model="p.cardNo"></sa-item>
 					<sa-item type="text" name="中国车" v-model="p.chinaCarNo"></sa-item>

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectService.java

@@ -13,16 +13,13 @@ import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.current.config.MyConfig;
-import com.pj.project.tb_business.TbBusiness;
-import com.pj.project.tb_business.TbBusinessMapper;
-import com.pj.project.tb_fee_details.ExportFeeDetailDTO;
+import com.pj.project.tb_fee_details.dto.ExportFeeDetailDTO;
 import com.pj.project4sp.uploadfile.UploadUtil;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 
-import com.pj.utils.sg.*;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.pj.project.tb_fee_details.dto.DetailSumDTO;
 import com.pj.project.tb_fee_details.statics.FeeTypeStatics;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,8 +127,8 @@ public class TbFeeDetailsController {
     @RequestMapping("getTotalMoney")
     public AjaxJson getTotalMoney() {
         SoMap so = SoMap.getRequestSoMap();
-        BigDecimal totalPirce = tbFeeDetailsService.getTotalMoney(so);
-        return AjaxJson.getSuccessData(totalPirce);
+        DetailSumDTO detailSum = tbFeeDetailsService.getTotalMoney(so);
+        return AjaxJson.getSuccessData(detailSum);
     }
 
 

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pj.project.tb_fee_details.dto.DetailSumDTO;
 import com.pj.project.tb_fee_details.statics.FeeTypeStatics;
 import com.pj.project.tb_fee_statistics.TbFeeStatistics;
 import org.apache.ibatis.annotations.Mapper;
@@ -61,7 +62,7 @@ public interface TbFeeDetailsMapper extends BaseMapper<TbFeeDetails> {
 
 	List<FeeTypeStatics> itemTypeStatics(@Param("startDay") String startDay,@Param("endDay") String endDay);
 
-    BigDecimal getTotalMoney(SoMap so);
+    DetailSumDTO getTotalMoney(SoMap so);
 
     List<TbFeeStatistics> getDayStatistics(@Param("toDay") String toDay);
 }

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

@@ -121,8 +121,8 @@
 		 GROUP BY item_type_name order by price;
 	</select>
 
-    <select id="getTotalMoney" resultType="BigDecimal">
-        SELECT SUM(item_price) as total_price
+    <select id="getTotalMoney" resultType="com.pj.project.tb_fee_details.dto.DetailSumDTO">
+        SELECT SUM(item_price) as item_price_sum, SUM(tax_price) as tax_price_sum, SUM(no_tax_price) as no_tax_price_sum
         FROM tb_fee_details
         <where>
             <if test=' this.has("carNo") '> and car_no like concat('%',#{carNo},'%') </if>

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

@@ -3,7 +3,6 @@ package com.pj.project.tb_fee_details;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -28,6 +27,9 @@ import com.pj.project.tb_business.TbBusinessService;
 import com.pj.project.tb_business_car.TbBusinessCar;
 import com.pj.project.tb_business_car.TbBusinessCarService;
 import com.pj.project.tb_business_item.TbBusinessItem;
+import com.pj.project.tb_fee_details.dto.DetailSumDTO;
+import com.pj.project.tb_fee_details.dto.ExportFeeDetailDTO;
+import com.pj.project.tb_fee_details.dto.PrintFeeDetailDTO;
 import com.pj.project.tb_fee_details.statics.FeeTypeStatics;
 import com.pj.project.tb_fee_statistics.TbFeeStatistics;
 import com.pj.project.tb_fee_statistics.TbFeeStatisticsService;
@@ -43,10 +45,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import com.pj.utils.sg.*;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -677,7 +677,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         }
     }
 
-    public BigDecimal getTotalMoney(SoMap so) {
+    public DetailSumDTO getTotalMoney(SoMap so) {
 
         return tbFeeDetailsMapper.getTotalMoney(so);
     }

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

@@ -0,0 +1,21 @@
+package com.pj.project.tb_fee_details.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+
+ * @Auther: lzm
+ * @Date: 2022/06/30/17:23
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DetailSumDTO {
+    private BigDecimal itemPriceSum = new BigDecimal(0);
+    private BigDecimal taxPriceSum = new BigDecimal(0);
+    private BigDecimal noTaxPriceSum = new BigDecimal(0);
+}

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

@@ -1,4 +1,4 @@
-package com.pj.project.tb_fee_details;
+package com.pj.project.tb_fee_details.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

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

@@ -1,4 +1,4 @@
-package com.pj.project.tb_fee_details;
+package com.pj.project.tb_fee_details.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,11 +9,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created with IntelliJ IDEA.
- *
+
  * @Auther: lzm
  * @Date: 2022/06/15/9:09
- * @Description:
  */
 @Data
 @Accessors(chain = true)

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

@@ -112,6 +112,13 @@ public class TbFeeStatisticsController {
         return AjaxJson.getSuccessData(tbFeeStatisticsService.prePrint(so));
     }
 
+    /** 准备打印的数据 */
+    @RequestMapping("getSum")
+    public AjaxJson getSum(){
+        SoMap so = SoMap.getRequestSoMap();
+        return AjaxJson.getSuccessData(tbFeeStatisticsService.getSum(so));
+    }
+
 
     @RequestMapping("calcuAgain")
     public AjaxJson calcuAgain() {

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

@@ -3,6 +3,7 @@ package com.pj.project.tb_fee_statistics;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pj.project.tb_fee_statistics.dto.StatsSumDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.pj.utils.so.*;
@@ -59,4 +60,6 @@ public interface TbFeeStatisticsMapper  extends BaseMapper<TbFeeStatistics> {
 
 
     TbFeeStatistics getByDayAndFeeType(@Param("day") String day, @Param("feeType")Integer feeType);
+
+    StatsSumDTO getSum(SoMap so);
 }

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

@@ -137,8 +137,23 @@
         <include refid="select_sql"></include>
         where day_time = #{day} and fee_type = #{feeType}
     </select>
-	
-	
+
+    <select id="getSum" resultType="com.pj.project.tb_fee_statistics.dto.StatsSumDTO">
+        SELECT sum(num) as num, sum(tax_money) as tax_money_sum, sum(taxes) as taxes_sum, sum(no_tax_money) as no_tax_money_sum
+        FROM tb_fee_statistics
+        <where>
+            <if test=' this.has("feeType") '> and fee_type = #{feeType} </if>
+            <if test=' this.has("beginDay") and this.has("endDay") '>
+                and day_time >= #{beginDay}
+                and day_time  &lt;= #{endDay}
+            </if>
+            <if test=' this.has("beginMonth") and this.has("endMonth") '>
+                and month >= #{beginMonth}
+                and month  &lt;= #{endMonth}
+            </if>
+            <if test=' this.has("year") '> and year = #{year} </if>
+        </where>
+    </select>
 	
 	
 

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

@@ -5,7 +5,6 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.Month;
 import cn.hutool.core.util.StrUtil;
@@ -26,9 +25,13 @@ import com.pj.project.tb_business.TbBusinessService;
 import com.pj.project.tb_business_car.TbBusinessCar;
 import com.pj.project.tb_business_car.TbBusinessCarService;
 import com.pj.project.tb_business_item.TbBusinessItem;
-import com.pj.project.tb_fee_details.ExportFeeDetailDTO;
+import com.pj.project.tb_fee_details.dto.ExportFeeDetailDTO;
 import com.pj.project.tb_fee_details.TbFeeDetails;
 import com.pj.project.tb_fee_details.TbFeeDetailsService;
+import com.pj.project.tb_fee_statistics.dto.ExportDayStatsDTO;
+import com.pj.project.tb_fee_statistics.dto.ExportMonthDataDTO;
+import com.pj.project.tb_fee_statistics.dto.PrintDayStatsDTO;
+import com.pj.project.tb_fee_statistics.dto.StatsSumDTO;
 import com.pj.project.tb_goods.TbGoods;
 import com.pj.project.tb_goods.TbGoodsService;
 import com.pj.project.tb_item_type.TbItemTypeService;
@@ -499,4 +502,8 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
         return printData;
     }
 
+    public StatsSumDTO getSum(SoMap so){
+        return tbFeeStatisticsMapper.getSum(so);
+    }
+
 }

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

@@ -1,4 +1,4 @@
-package com.pj.project.tb_fee_statistics;
+package com.pj.project.tb_fee_statistics.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,4 +1,4 @@
-package com.pj.project.tb_fee_statistics;
+package com.pj.project.tb_fee_statistics.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,4 +1,4 @@
-package com.pj.project.tb_fee_statistics;
+package com.pj.project.tb_fee_statistics.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -0,0 +1,25 @@
+package com.pj.project.tb_fee_statistics.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+
+ * @Auther: lzm
+ * @Date: 2022/06/30/17:28
+
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class StatsSumDTO {
+
+    private Integer num = 0;
+    private BigDecimal taxMoneySum = new BigDecimal(0);
+    private BigDecimal taxesSum = new BigDecimal(0);
+    private BigDecimal noTaxMoneySum = new BigDecimal(0);
+
+}