学校修改工资数据排序，列表添加金额 福达商品信息添加字段 费用添加应收总账 应付总账 利润总账

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -259,5 +259,10 @@ public class GoodsDesc implements Serializable {
 
 	@TableField(exist = false)
 	private String policyName;
+	/**
+	 * 装箱量
+	 */
+	@ApiModelProperty(value = "装箱量")
+	private String ctn;
 
 }

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -165,6 +166,11 @@ public class Salary implements Serializable {
 	 */
 		@TableField(exist = false)
 		private String pageLabel;
-
+	/**
+	 * 工资金额
+	 */
+		@ApiModelProperty(value = "工资金额")
+		@TableField(exist = false)
+		private BigDecimal amount;
 
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/AccVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.finance.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.finance.vojo.Acc;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,5 +33,14 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "AccVO对象", description = "财务账单")
 public class AccVO extends Acc {
 	private static final long serialVersionUID = 1L;
-
+	/**
+	 * 制单日期日期开始
+	 */
+	@ApiModelProperty(value = "制单日期日期开始")
+	private String createTimeStart;
+	/**
+	 * 制单日期日期结束
+	 */
+	@ApiModelProperty(value = "制单日期日期结束")
+	private String createTimeEnd;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/CostMessage.java

@@ -0,0 +1,62 @@
+package org.springblade.finance.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class CostMessage implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 公司id
+	 */
+	@ApiModelProperty(value = "公司id")
+	private Long corpId;
+
+	/**
+	 * 公司中文名
+	 */
+	@ApiModelProperty(value = "公司中文名")
+	private String corpName;
+	/**
+	 * 账单日期
+	 */
+	@ApiModelProperty(value = "账单日期")
+	private Date accDate;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "应收金额/应付金额")
+	private BigDecimal amount;
+	/**
+	 * 开票金额
+	 */
+	@ApiModelProperty(value = "开票金额")
+	private BigDecimal invoiceAmount;
+	/**
+	 * 结算金额
+	 */
+	@ApiModelProperty(value = "实收金额/实付金额")
+	private BigDecimal settlementAmount;
+	/**
+	 * 利润金额
+	 */
+	@ApiModelProperty(value = "利润金额")
+	private BigDecimal profitAmount;
+	/**
+	 * 未收金额
+	 */
+	@ApiModelProperty(value = "未收金额/未付金额")
+	private BigDecimal outstandingAmount;
+	/**
+	 * 利润总账中的应付金额
+	 */
+	@ApiModelProperty(value = "利润总账中的应付金额")
+	private BigDecimal handleAmount;
+
+
+}

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.school.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
@@ -40,6 +41,7 @@ import org.springblade.school.vo.SalaryVO;
 import org.springblade.school.service.ISalaryService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -56,7 +58,7 @@ public class SalaryController extends BladeController {
 
 	private final ISalaryService salaryService;
 	private final IUserClient userClient;
-
+	private final ISalaryItemService salaryItemService;
 	/**
 	 * 详情
 	 */
@@ -77,7 +79,10 @@ public class SalaryController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入salary")
 	public R<IPage<Salary>> list(Salary salary, Query query) {
 		salary.setTenantId(SecureUtil.getTenantId());
-		IPage<Salary> pages = salaryService.page(Condition.getPage(query), Condition.getQueryWrapper(salary));
+		LambdaQueryWrapper<Salary> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.setEntity(salary);
+		lambdaQueryWrapper.orderByDesc(Salary::getAnnual).orderByAsc(Salary::getMoon);
+		IPage<Salary> pages = salaryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{
 				R<User> user = userClient.userInfoById(item.getCreateUser());
@@ -90,6 +95,16 @@ public class SalaryController extends BladeController {
 						item.setUpdateUserName(info.getData().getName());
 					}
 				}
+				//获取工资额
+				LambdaQueryWrapper<SalaryItem> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(SalaryItem::getPid,item.getId());
+				queryWrapper.eq(SalaryItem::getIsDeleted,0);
+				List<SalaryItem> salaryItemList = salaryItemService.list(queryWrapper);
+				if (CollectionUtils.isNotEmpty(salaryItemList)){
+					item.setAmount(salaryItemList.stream().filter(e -> e.getfSalary() != null).map(SalaryItem::getfSalary).reduce(BigDecimal.ZERO,BigDecimal::add));
+				}else {
+					item.setAmount(BigDecimal.ZERO);
+				}
 			});
 		}
 		return R.data(pages);

blade-service/trade-finance/src/main/java/org/springblade/finance/excel/DealWithExcel.java

@@ -0,0 +1,47 @@
+package org.springblade.finance.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 应付总账导出
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DealWithExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 公司中文名
+	 */
+	@ExcelProperty(value = "结算单位")
+	private String corpName;
+	/**
+	 * 账单日期
+	 */
+	@ExcelProperty(value = "时间")
+	private Date accDate;
+	/**
+	 * 金额
+	 */
+	@ExcelProperty(value = "应付金额")
+	private BigDecimal amount;
+	/**
+	 * 结算金额
+	 */
+	@ExcelProperty(value = "实付金额")
+	private BigDecimal settlementAmount;
+	/**
+	 * 未收金额
+	 */
+	@ExcelProperty(value = "未付金额")
+	private BigDecimal outstandingAmount;
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/excel/ReceivableExcle.java

@@ -0,0 +1,53 @@
+package org.springblade.finance.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 应收总账导出
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ReceivableExcle implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 公司中文名
+	 */
+	@ExcelProperty(value = "结算单位")
+	private String corpName;
+	/**
+	 * 账单日期
+	 */
+	@ExcelProperty(value = "时间")
+	private Date accDate;
+	/**
+	 * 金额
+	 */
+	@ExcelProperty(value = "应收金额")
+	private BigDecimal amount;
+	/**
+	 * 结算金额
+	 */
+	@ExcelProperty(value = "实收金额")
+	private BigDecimal settlementAmount;
+	/**
+	 * 未收金额
+	 */
+	@ExcelProperty(value = "未收金额")
+	private BigDecimal outstandingAmount;
+	/**
+	 * 开票金额
+	 */
+	@ExcelProperty(value = "开票金额")
+	private BigDecimal invoiceAmount;
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/fince/DealWith.java

@@ -0,0 +1,98 @@
+package org.springblade.finance.fince;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+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.BeanUtil;
+import org.springblade.finance.excel.DealWithExcel;
+import org.springblade.finance.service.IAccService;
+import org.springblade.finance.vo.AccVO;
+import org.springblade.finance.vo.CostMessage;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 应付总账
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/dealWith")
+@Api(value = "应付总账", tags = "应付总账")
+public class DealWith extends BladeController {
+
+	private final IAccService accService;
+	private final ICorpsDescClient corpsDescClient;
+
+
+	/**
+	 * 分页 应付总账
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "应付总账分页", notes = "传入settlement")
+	public R<IPage<CostMessage>> list(AccVO accVO, Query query) {
+		if (StringUtils.isBlank(accVO.getTradeType())){
+			throw new SecurityException("请选择查询的贸易类型");
+		}
+		if (StringUtils.isBlank(accVO.getDc())){
+			throw new SecurityException("请选择查询的收费类型");
+		}
+		if (StringUtils.isBlank(accVO.getTenantId())){
+			accVO.setTenantId(SecureUtil.getTenantId());
+		}
+		IPage<CostMessage> costMessageIPage = accService.salaryMessage(accVO, Condition.getPage(query));
+		if (CollectionUtils.isNotEmpty(costMessageIPage.getRecords())){
+			costMessageIPage.getRecords().stream().forEach(item ->{
+				if (item.getCorpId() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpName(corpMessage.getData().getCname());
+					}
+				}
+			});
+		}
+		return R.data(costMessageIPage);
+	}
+	/**
+	 * 导出-应付总账
+	 *
+	 * */
+	@GetMapping("/export")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "应付总账")
+	public void export(AccVO accVO, HttpServletResponse response) {
+		if (StringUtils.isBlank(accVO.getTradeType())){
+			throw new SecurityException("请选择查询的贸易类型");
+		}
+		if (StringUtils.isBlank(accVO.getDc())){
+			throw new SecurityException("请选择查询的收费类型");
+		}
+		if (StringUtils.isBlank(accVO.getTenantId())){
+			accVO.setTenantId(SecureUtil.getTenantId());
+		}
+		List<DealWithExcel> list = new ArrayList<>();
+		List<CostMessage> costMessageList = accService.salaryMessage(accVO);
+		if (CollectionUtils.isNotEmpty(costMessageList)){
+			list = BeanUtil.copy(costMessageList, DealWithExcel.class);
+		}
+		ExcelUtil.export(response, "应付总账", "应付总账", list, DealWithExcel.class);
+	}
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/fince/Profit.java

@@ -0,0 +1,41 @@
+package org.springblade.finance.fince;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.finance.service.IAccService;
+import org.springblade.finance.vo.AccVO;
+import org.springblade.finance.vo.CostMessage;
+import org.springblade.finance.vojo.Settlement;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 利润总账
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/profit")
+@Api(value = "利润总账", tags = "利润总账")
+public class Profit extends BladeController {
+	private final IAccService accService;
+	private final ICorpsDescClient corpsDescClient;
+
+	/**
+	 * 分页 利润总账
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "利润总账分页", notes = "传入settlement")
+	public R<IPage<CostMessage>> list(AccVO accVO, Query query) {
+
+		return null;
+	}
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/fince/Receivable.java

@@ -0,0 +1,96 @@
+package org.springblade.finance.fince;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+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.BeanUtil;
+import org.springblade.finance.excel.DealWithExcel;
+import org.springblade.finance.excel.ReceivableExcle;
+import org.springblade.finance.service.IAccService;
+import org.springblade.finance.vo.AccVO;
+import org.springblade.finance.vo.CostMessage;
+import org.springblade.finance.vojo.Settlement;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 应收总账
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/receivable")
+@Api(value = "应收总账", tags = "应收总账")
+public class Receivable extends BladeController {
+	private final IAccService accService;
+	private final ICorpsDescClient corpsDescClient;
+	/**
+	 * 分页 应收总账
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "应收总账分页", notes = "传入settlement")
+	public R<IPage<CostMessage>> list(AccVO accVO, Query query) {
+		if (StringUtils.isBlank(accVO.getTradeType())){
+			throw new SecurityException("请选择查询的贸易类型");
+		}
+		if (StringUtils.isBlank(accVO.getDc())){
+			throw new SecurityException("请选择查询的收费类型");
+		}
+		if (StringUtils.isBlank(accVO.getTenantId())){
+			accVO.setTenantId(SecureUtil.getTenantId());
+		}
+		IPage<CostMessage> costMessageIPage = accService.salaryMessage(accVO, Condition.getPage(query));
+		if (CollectionUtils.isNotEmpty(costMessageIPage.getRecords())){
+			costMessageIPage.getRecords().stream().forEach(item ->{
+				if (item.getCorpId() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpName(corpMessage.getData().getCname());
+					}
+				}
+			});
+		}
+		return R.data(costMessageIPage);
+	}
+	/**
+	 * 导出-应收总账
+	 *
+	 * */
+	@GetMapping("/export")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "应收总账")
+	public void export(AccVO accVO, HttpServletResponse response) {
+		if (StringUtils.isBlank(accVO.getTradeType())){
+			throw new SecurityException("请选择查询的贸易类型");
+		}
+		if (StringUtils.isBlank(accVO.getDc())){
+			throw new SecurityException("请选择查询的收费类型");
+		}
+		if (StringUtils.isBlank(accVO.getTenantId())){
+			accVO.setTenantId(SecureUtil.getTenantId());
+		}
+		List<ReceivableExcle> list = new ArrayList<>();
+		List<CostMessage> costMessageList = accService.salaryMessage(accVO);
+		if (CollectionUtils.isNotEmpty(costMessageList)){
+			list = BeanUtil.copy(costMessageList, ReceivableExcle.class);
+		}
+		ExcelUtil.export(response, "应收总账", "应收总账", list, ReceivableExcle.class);
+	}
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.java

@@ -16,6 +16,8 @@
  */
 package org.springblade.finance.mapper;
 
+import org.apache.ibatis.annotations.Param;
+import org.springblade.finance.vo.CostMessage;
 import org.springblade.finance.vojo.Acc;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -41,4 +43,29 @@ public interface AccMapper extends BaseMapper<Acc> {
 	 */
 	List<AccVO> selectAccPage(IPage page, AccVO acc);
 
+	/**
+	 * 查询应收应付总账
+	 * @param accVO
+	 * @return
+	 */
+	List<CostMessage> salaryMessage(@Param("acc") AccVO accVO,IPage page);
+	/**
+	 * 查询应收应付总账
+	 * @param accVO
+	 * @return
+	 */
+	List<CostMessage> salaryMessage(@Param("acc") AccVO accVO);
+	/**
+	 * 查询利润总账
+	 * @param accVO
+	 * @return
+	 */
+	List<CostMessage> salaryProfit(@Param("acc") AccVO accVO,IPage page);
+	/**
+	 * 查询利润总账
+	 * @param accVO
+	 * @return
+	 */
+	List<CostMessage> salaryProfit(@Param("acc") AccVO accVO);
+
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.xml

@@ -49,5 +49,41 @@
     <select id="selectAccPage" resultMap="accResultMap">
         select * from finance_acc where is_deleted = 0
     </select>
+    <select id="salaryMessage" resultType="org.springblade.finance.vo.CostMessage">
+        SELECT
+	    Corpid AS corpId,
+	    create_time AS accDate,
+	    IFNULL( SUM( Amount ), 0 ) AS amount,
+	    IFNULL( SUM( Settlement_Amount ), 0 ) AS settlementAmount,
+	    IFNULL( SUM( Amount ), 0 )- IFNULL( SUM( Settlement_Amount ), 0 ) AS outstandingAmount,
+	    IFNULL( SUM( Invoice_Amount ), 0 ) AS invoiceAmount
+    FROM
+	    finance_acc
+    WHERE
+	    is_deleted = 0
+        <if test="acc.tenantId!=null and acc.tenantId != ''">
+            AND tenant_id = #{tenantId}
+        </if>
+        <if test="acc.tradeType!=null and acc.tradeType != ''">
+            AND trade_type = #{tradeType}
+        </if>
+        <if test="acc.itemType!=null and acc.itemType != ''">
+            AND item_type = #{itemType}
+        </if>
+        <if test="acc.dc!=null and acc.dc != ''">
+            AND DC = #{dc}
+        </if>
+        <if test="acc.createTimeStart!=null and acc.createTimeStart != ''">
+            AND create_time &lt;= #{createTimeStart}
+        </if>
+        <if test="acc.createTimeEnd!=null and acc.createTimeEnd != ''">
+            AND create_time &gt;= #{createTimeEnd}
+        </if>
+    GROUP BY
+	    Corpid
+    </select>
+    <select id="salaryProfit" resultType="org.springblade.finance.vo.CostMessage">
+
+    </select>
 
 </mapper>

blade-service/trade-finance/src/main/java/org/springblade/finance/service/IAccService.java

@@ -19,6 +19,7 @@ package org.springblade.finance.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.finance.vo.AccVO;
+import org.springblade.finance.vo.CostMessage;
 import org.springblade.finance.vojo.Acc;
 
 import java.util.List;
@@ -43,5 +44,17 @@ public interface IAccService extends IService<Acc> {
 	void submit(List<Acc> acc);
 
 	boolean removeAcc(List<Long> idList);
+	/**
+	 * 查询应收应付总账
+	 * @param accVO
+	 * @return
+	 */
+	IPage<CostMessage> salaryMessage(AccVO accVO,IPage<CostMessage> page);
+	/**
+	 * 查询应收应付总账
+	 * @param accVO
+	 * @return
+	 */
+	List<CostMessage> salaryMessage(AccVO accVO);
 
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/AccServiceImpl.java

@@ -27,6 +27,7 @@ import org.springblade.finance.mapper.ItemsMapper;
 import org.springblade.finance.mapper.SettlementMapper;
 import org.springblade.finance.service.IAccService;
 import org.springblade.finance.vo.AccVO;
+import org.springblade.finance.vo.CostMessage;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
@@ -154,4 +155,14 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 		return true;
 	}
 
+	@Override
+	public IPage<CostMessage> salaryMessage(AccVO accVO,IPage<CostMessage> page) {
+		return page.setRecords(baseMapper.salaryMessage(accVO,page));
+	}
+
+	@Override
+	public List<CostMessage> salaryMessage(AccVO accVO) {
+		return baseMapper.salaryMessage(accVO);
+	}
+
 }