diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index 44bef947..3180fa39 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -4,29 +4,18 @@ import java.util.Arrays; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.LoginUser; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.meeting.vo.AddDockVO; -import com.jero.meeting.vo.CheckVO; -import com.jero.meeting.vo.ImportSituationsVO; -import com.jero.meeting.vo.PayMeetingSituationVO; +import com.jero.meeting.vo.*; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; @@ -193,4 +182,15 @@ public class PayMeetingSituationController extends JeroController mergePayBill(@RequestBody MergePayBillVO mergePayBillVO) { + payMeetingSituationService.mergePayBill(mergePayBillVO); + return Result.OK("审核成功!"); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java index f3b0b0fa..515d612d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java @@ -3,6 +3,7 @@ package com.jero.meeting.service; import com.jero.meeting.entity.PayMeetingSituation; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.vo.AddDockVO; +import com.jero.meeting.vo.MergePayBillVO; import com.jero.meeting.vo.CheckVO; import com.jero.meeting.vo.PayMeetingSituationVO; @@ -51,4 +52,6 @@ public interface IPayMeetingSituationService extends IService meetingSituationIds; + +}