经销商调拨 学校首页

blade-service-api/blade-school-api/src/main/java/org/springblade/school/entity/SalaryAverage.java

@@ -0,0 +1,38 @@
+package org.springblade.school.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 通济学校-首页工资人均工资图
+ *
+ * @author BladeX
+ * @since 2022-01-11
+ */
+@Data
+public class SalaryAverage implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 月
+	 */
+	@ApiModelProperty(value = "月")
+	private String moon;
+	/**
+	 * 部门
+	 */
+	@ApiModelProperty(value = "部门")
+	private String salaryType;
+	/**
+	 * 人数
+	 */
+	@ApiModelProperty(value = "学生人数")
+	private BigDecimal studentNumber;
+	/**
+	 * 实发工资
+	 */
+	@ApiModelProperty(value = "实发工资")
+	private BigDecimal fSalary;
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -54,6 +54,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -330,6 +331,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		//stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().subtract(deliveryItems.getActualQuantity()));//锁定数量 减
 		stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(deliveryItems.getActualQuantity()));//结余数量 减
 		stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().subtract(deliveryItems.getActualQuantity()));//可用数量 减
+		stockGoods.setOutAmount(stockGoods.getOutAmount().add(deliveryItems.getDeliveryAmount()));//出库金额加
 		if (tradeType.equals(OrderTypeEnum.IMPORT.getType())){
 			//判断出库发票重量和结余发票重量
 			if (stockGoods.getBalanceWeight().compareTo(deliveryItems.getInvoiceWeight()) < 0){
@@ -378,6 +380,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		//stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().add(deliveryItems.getActualQuantity()));//锁定数量 加
 		stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().add(deliveryItems.getActualQuantity()));//结余数量 加
 		stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().add(deliveryItems.getActualQuantity()));//可用数量 加
+		stockGoods.setOutAmount(stockGoods.getOutAmount().subtract(deliveryItems.getDeliveryAmount()));//出库金额减
 		if (tradeType.equals(OrderTypeEnum.IMPORT.getType())){
 			//判断出库发票重量和结余发票重量
 			if (stockGoods.getOutWeight().compareTo(deliveryItems.getInvoiceWeight()) < 0){
@@ -515,10 +518,11 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		//入库数量
 		stockGoods.setInDate(new Date());//入库日期
 		stockGoods.setInQuantity(deliveryItems.getActualQuantity());//入库数量
-		stockGoods.setOutQuantity(new BigDecimal(0.00));//出库数量
-		stockGoods.setLockingQuantity(new BigDecimal(0.00));//锁定数量
+		stockGoods.setOutQuantity(BigDecimal.ZERO);//出库数量
+		stockGoods.setLockingQuantity(BigDecimal.ZERO);//锁定数量
 		stockGoods.setBalanceQuantity(deliveryItems.getActualQuantity());//结余数量
-		stockGoods.setEnRouteQuantity(deliveryItems.getActualQuantity());//在途数量
+		stockGoods.setEnRouteQuantity(BigDecimal.ZERO);//在途数量
+		stockGoods.setInAmount(deliveryItems.getDeliveryAmount());//入库金额
 		stockGoods.setSurplusRouteQuantity(deliveryItems.getActualQuantity());//可用数量
 		//进口贸易 还需要追加码单重量 和 发票重量
 		if (tradeType.equals(OrderTypeEnum.IMPORT.getType())){
@@ -740,11 +744,15 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				stock.setOutQuantity(stock.getOutQuantity().add( deliveryItems.getActualQuantity()));//出库数量 加
 				stock.setSurplusRouteQuantity(stock.getSurplusRouteQuantity().subtract(deliveryItems.getActualQuantity()));//可用数量 减
 				stock.setBalanceQuantity(stock.getInQuantity().subtract(stock.getOutQuantity()));//结余数量 减
+				//出库金额加
+				stock.setOutAmount(stock.getOutAmount().add((stock.getInAmount().divide(stock.getInQuantity(), 5, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP).multiply(deliveryItems.getActualQuantity())));
 				R updateStock = stockGoodsClient.updateStock(stock);
 				if (!updateStock.isSuccess()){
 					throw new RuntimeException("更新库存总账失败");
 				}
 				//新仓库添加库存
+				//入库金额等于原仓库的入库金额除以入库数量
+				deliveryItems.setDeliveryAmount((stock.getInAmount().divide(stock.getInQuantity(), 5, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP).multiply(deliveryItems.getActualQuantity()));
 				StockGoodsVO serviceStock = this.getStock(tradeType, null, allotStorageId, deliveryItems);
 				if (serviceStock == null){
 					this.saveStock(tradeType,null,allotStorageId,deliveryItems);
@@ -752,6 +760,8 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 					serviceStock.setInQuantity(serviceStock.getInQuantity().add( deliveryItems.getActualQuantity()));//入库数量 加
 					serviceStock.setSurplusRouteQuantity(serviceStock.getSurplusRouteQuantity().add(deliveryItems.getActualQuantity()));//可用数量 加
 					serviceStock.setBalanceQuantity(serviceStock.getInQuantity().add(serviceStock.getOutQuantity()));//结余数量 加
+					//入库金额加
+					serviceStock.setInAmount(serviceStock.getInAmount().add((stock.getInAmount().divide(stock.getInQuantity(), 5, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP).multiply(deliveryItems.getActualQuantity())));
 					R stockMessage = stockGoodsClient.updateStock(serviceStock);
 					if (!stockMessage.isSuccess()){
 						throw new RuntimeException("更新库存总账失败");
@@ -767,27 +777,33 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				if (stock.getSurplusRouteQuantity().compareTo(deliveryItems.getActualQuantity()) <0){
 					throw new SecurityException("商品库存不足");
 				}
-				//新仓库减去库存
-				stock.setInQuantity(stock.getInQuantity().subtract( deliveryItems.getActualQuantity()));//入库数量 减
-				stock.setSurplusRouteQuantity(stock.getSurplusRouteQuantity().subtract(deliveryItems.getActualQuantity()));//可用数量 减
-				stock.setBalanceQuantity(stock.getInQuantity().subtract(stock.getOutQuantity()));//结余数量 减
-				R updateStock = stockGoodsClient.updateStock(stock);
-				if (!updateStock.isSuccess()){
-					throw new RuntimeException("更新库存总账失败");
-				}
 				//原仓库添加库存
 				StockGoodsVO serviceStock = this.getStock(tradeType, null, storageId, deliveryItems);
 				if (serviceStock == null){
-					this.saveStock(tradeType,null,storageId,deliveryItems);
+					throw new SecurityException("未找到原仓库库存信息");
 				}else {
 					serviceStock.setOutQuantity(serviceStock.getOutQuantity().subtract( deliveryItems.getActualQuantity()));//出库数量 减
 					serviceStock.setSurplusRouteQuantity(serviceStock.getSurplusRouteQuantity().add(deliveryItems.getActualQuantity()));//可用数量 加
 					serviceStock.setBalanceQuantity(serviceStock.getInQuantity().add(serviceStock.getOutQuantity()));//结余数量 加
+					//出库金额减
+					serviceStock.setOutAmount(serviceStock.getOutAmount().subtract((serviceStock.getInAmount().divide(serviceStock.getInQuantity(), 5, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP).multiply(deliveryItems.getActualQuantity())));
+
 					R stockMessage = stockGoodsClient.updateStock(serviceStock);
 					if (!stockMessage.isSuccess()){
 						throw new RuntimeException("更新库存总账失败");
 					}
 				}
+				//新仓库减去库存
+				stock.setInQuantity(stock.getInQuantity().subtract( deliveryItems.getActualQuantity()));//入库数量 减
+				stock.setSurplusRouteQuantity(stock.getSurplusRouteQuantity().subtract(deliveryItems.getActualQuantity()));//可用数量 减
+				stock.setBalanceQuantity(stock.getInQuantity().subtract(stock.getOutQuantity()));//结余数量 减
+				//入库金额减
+				stock.setInAmount(stock.getInAmount().subtract((serviceStock.getInAmount().divide(serviceStock.getInQuantity(), 5, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP).multiply(deliveryItems.getActualQuantity())));
+
+				R updateStock = stockGoodsClient.updateStock(stock);
+				if (!updateStock.isSuccess()){
+					throw new RuntimeException("更新库存总账失败");
+				}
 			}
 		}
 		return R.success("操作成功");

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -488,7 +488,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 				selectById.setSrcOrderNo(selectById.getSysNo());
 				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
-				if (corpMessage.isSuccess()) {
+				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 					R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(), order.getTradeType(), order.getBillType());
 					if (!clientBillNo.isSuccess()) {
 						TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -499,7 +499,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						selectById.setOrgOrderNo((selectById.getOrderNo()));
 					}
 					selectById.setOrderNo((String) clientBillNo.getData());
+				}else {
+					throw new SecurityException("未找到供应商信息");
 				}
+				selectById.setCorpAttn(corpMessage.getData().getAttn());
+				selectById.setCorpTel(corpMessage.getData().getTel());
 				selectById.setSrcId(order.getId());
 				selectById.setCorpId(item.getCorpId());
 				selectById.setSrcOrderNo(selectById.getSysNo());
@@ -543,6 +547,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					baseMapper.updateById(selectById);
 				}
 			});
+		}else {
+			throw new SecurityException("订单明细为空,生成采购单失败");
 		}
 
 		Order temp = new Order();

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryController.java

@@ -30,15 +30,12 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.school.entity.SalaryData;
-import org.springblade.school.entity.SalaryDataChain;
-import org.springblade.school.entity.SalaryStatistics;
+import org.springblade.school.entity.*;
 import org.springblade.school.service.ISalaryItemService;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.school.entity.Salary;
 import org.springblade.school.vo.SalaryVO;
 import org.springblade.school.service.ISalaryService;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -145,7 +142,7 @@ public class SalaryController extends BladeController {
 	 * 删除 通济学校-工资管理主表信息
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(salaryService.removeByIds(Func.toLongList(ids)));
@@ -158,7 +155,7 @@ public class SalaryController extends BladeController {
 	 * @return
 	 */
 	@PostMapping("checkOrder")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "请核数据", notes = "传入主表id")
 	public R checkOrder(@RequestBody Salary salary)
 	{
@@ -171,7 +168,7 @@ public class SalaryController extends BladeController {
 	 * 审核通过
 	 * */
 	@PostMapping("/passCheck")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "审核通过", notes = "传入主表id")
 	public R passCheck (@ApiParam(value = "主表id", required = true) @RequestParam Long id)
 	{
@@ -183,7 +180,7 @@ public class SalaryController extends BladeController {
 	 * 审核不通过
 	 * */
 	@PostMapping("/passCancel")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "审核不通过", notes = "传入主表id")
 	public R passCancel (@ApiParam(value = "主表id", required = true) @RequestParam Long id)
 	{
@@ -194,8 +191,8 @@ public class SalaryController extends BladeController {
 	 * 审核中
 	 * */
 	@PostMapping("/underReview")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "审核通过", notes = "传入主表id")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "审核中", notes = "传入主表id")
 	public R underReview (@ApiParam(value = "主表id", required = true) @RequestParam Long id)
 	{
 		salaryService.underReview(id);
@@ -203,37 +200,37 @@ public class SalaryController extends BladeController {
 	}
 
 	/**
-	 * 详情
+	 * 复制工资明细
 	 */
 	@GetMapping("/copyMessage")
-	@ApiOperationSupport(order = 10)
+	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "复制工资明细", notes = "传入salary")
 	public R<Salary> copyMessage(SalaryVO salary) {
 		return R.data(salaryService.copyMessage(salary));
 	}
 	/**
-	 * 分页 通济学校-工资管理主表信息
+	 * 分页 通济学校-首页统计工资环比图
 	 */
 	@GetMapping("/salaryStatistics")
-	@ApiOperationSupport(order = 11)
+	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "首页统计工资环比图", notes = "传入salary")
 	public R<List<SalaryStatistics>> SalaryStatistics(Salary salary) {
 		return R.data(salaryService.SalaryStatistics(salary));
 	}
 	/**
-	 * 分页 通济学校-工资管理主表信息
+	 * 分页 通济学校-首页教师工资总体数据
 	 */
 	@GetMapping("/salaryData")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 14)
 	@ApiOperation(value = "首页教师工资总体数据", notes = "传入salary")
 	public R<SalaryData> salaryData(Salary salary) {
 		return R.data(salaryService.salaryData(salary));
 	}
 	/**
-	 * 分页 通济学校-工资管理主表信息
+	 * 分页 通济学校-首页统计工资同比图
 	 */
 	@GetMapping("/salaryDataChain")
-	@ApiOperationSupport(order = 13)
+	@ApiOperationSupport(order = 15)
 	@ApiOperation(value = "首页统计工资同比图", notes = "传入salary")
 	public R<SalaryDataChain> salaryDataChain(SalaryVO salary) {
 		if (StringUtils.isBlank(salary.getAnnual())){
@@ -241,5 +238,14 @@ public class SalaryController extends BladeController {
 		}
 		return R.data(salaryService.salaryDataChain(salary));
 	}
+	/**
+	 * 分页 通济学校-首页统计部门月平均工资
+	 */
+	@GetMapping("/salaryAverage")
+	@ApiOperationSupport(order = 16)
+	@ApiOperation(value = "首页统计部门月平均工资", notes = "传入salary")
+	public R<List<SalaryAverage>> salaryAverage(Salary salary) {
+		return R.data(salaryService.salaryAverage(salary));
+	}
 
 }

blade-service/blade-school/src/main/java/org/springblade/school/mapper/SalaryMapper.java

@@ -18,10 +18,7 @@ package org.springblade.school.mapper;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.school.entity.Salary;
-import org.springblade.school.entity.SalaryData;
-import org.springblade.school.entity.SalaryDataChain;
-import org.springblade.school.entity.SalaryStatistics;
+import org.springblade.school.entity.*;
 import org.springblade.school.vo.SalaryVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -82,4 +79,11 @@ public interface SalaryMapper extends BaseMapper<Salary> {
 									@Param("salaryType") String salaryType,
 									@Param("tenantId") String tenantId);
 
+	/**
+	 * 工资首页部门月平均工资
+	 * @param salary
+	 * @return
+	 */
+	@SqlParser(filter=true)
+	List<SalaryAverage> salaryAverage(@Param("salary") Salary salary);
 }

blade-service/blade-school/src/main/java/org/springblade/school/mapper/SalaryMapper.xml

@@ -178,4 +178,159 @@
             and sa.salary_type = #{salaryType}
         </if>
     </select>
+    <select id="salaryAverage" resultType="org.springblade.school.entity.SalaryAverage">
+        SELECT
+        m.id AS moon,
+        m.branch AS salaryType,
+        IFNULL( n.studentNumber, 0 ) AS studentNumber,
+        IFNULL( n.fSalary, 0 ) AS fSalary
+        FROM
+        (
+        SELECT
+        1 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        2 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        3 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        4 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        5 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        6 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        7 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        8 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        9 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        10 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        11 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        12 AS id,
+        '小学部' AS branch UNION
+        SELECT
+        1 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        2 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        3 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        4 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        5 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        6 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        7 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        8 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        9 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        10 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        11 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        12 AS id,
+        '初中部' AS branch UNION
+        SELECT
+        1 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        2 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        3 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        4 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        5 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        6 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        7 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        8 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        9 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        10 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        11 AS id,
+        '高中部' AS branch UNION
+        SELECT
+        12 AS id,
+        '高中部' AS branch
+        ) m
+        LEFT JOIN (
+        SELECT
+        sa.salary_type AS salaryType,
+        sa.moon AS moon,
+        IFNULL( sa.person_number, 0 ) AS studentNumber,
+        CASE
+        WHEN sa.person_number != 0 THEN
+        ROUND(IFNULL( SUM( st.f_salary ), 0 )/sa.person_number,2)
+        ELSE
+        0
+        END AS fSalary
+        FROM
+        school_salary sa
+        LEFT JOIN school_salary_item st ON sa.id = st.pid
+        WHERE
+        sa.is_deleted = 0
+        AND st.is_deleted = 0
+        <if test="salary.annual!=null and salary.annual != ''">
+            and sa.annual = #{salary.annual}
+        </if>
+        <if test="salary.tenantId!=null and salary.tenantId != ''">
+            and sa.tenant_id = #{salary.tenantId}
+        </if>
+        <if test="salary.salaryType!=null and salary.salaryType != ''">
+            and sa.salary_type = #{salary.salaryType}
+        </if>
+        <if test="salary.annual==null or salary.annual == ''">
+            AND sa.annual=YEAR(NOW())
+        </if>
+        GROUP BY
+        sa.salary_type,
+        sa.moon
+        ORDER BY
+        sa.salary_type,
+        sa.moon
+        ) n ON m.id = n.moon AND m.branch = n.salaryType
+        ORDER BY m.id,CONVERT(n.salaryType USING gbk) DESC
+    </select>
 </mapper>

blade-service/blade-school/src/main/java/org/springblade/school/service/ISalaryService.java

@@ -17,10 +17,7 @@
 package org.springblade.school.service;
 
 import org.springblade.core.tool.api.R;
-import org.springblade.school.entity.Salary;
-import org.springblade.school.entity.SalaryData;
-import org.springblade.school.entity.SalaryDataChain;
-import org.springblade.school.entity.SalaryStatistics;
+import org.springblade.school.entity.*;
 import org.springblade.school.vo.SalaryVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -114,4 +111,11 @@ public interface ISalaryService extends IService<Salary> {
 	 */
 	SalaryDataChain salaryDataChain(SalaryVO salary);
 
+	/**
+	 * 工资首页部门月平均工资
+	 * @param salary
+	 * @return
+	 */
+	List<SalaryAverage> salaryAverage(Salary salary);
+
 }

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryServiceImpl.java

@@ -526,4 +526,12 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
 		return salaryDataChain;
 	}
 
+	@Override
+	public List<SalaryAverage> salaryAverage(Salary salary) {
+		if (StringUtils.isBlank(salary.getTenantId())){
+			salary.setTenantId(SecureUtil.getTenantId());
+		}
+		return baseMapper.salaryAverage(salary);
+	}
+
 }