diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index 80a7dfe4..b6dbefbb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -313,17 +313,5 @@ public class CommitteeMeetingSituationController extends JeroController signIn(@RequestBody SignInVO signInVO) { - ValidUtil.validate(signInVO); - payMeetingSituationService.signIn(signInVO); - return Result.OK("签到成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index f722ff4a..131bca5a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -311,17 +311,5 @@ public class InternalMeetingSituationController extends JeroController signIn(@RequestBody SignInVO signInVO) { - ValidUtil.validate(signInVO); - payMeetingSituationService.signIn(signInVO); - return Result.OK("签到成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index 69a86cea..1b867682 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -313,17 +313,5 @@ public class OtherMeetingSituationController extends JeroController signIn(@RequestBody SignInVO signInVO) { - ValidUtil.validate(signInVO); - payMeetingSituationService.signIn(signInVO); - return Result.OK("签到成功!"); - } - } 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 dc283aa8..e9e4495a 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 @@ -27,6 +27,7 @@ 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.valid.group.SignIn; import com.jero.meeting.vo.*; import com.jero.meeting.vo.excel.*; import com.jero.project.common.PayProjectCommon; @@ -308,43 +309,6 @@ public class PayMeetingSituationController extends JeroController addDock(@RequestBody AddDockVO addDockVO) { - payMeetingSituationService.addDock(addDockVO); - return Result.OK("设置对接人成功!"); - } - - /** - * 审核付款凭证 - */ - @RequiresPermissions("otherMeeting:auditCredentials") - @AutoLog(value = "审核付款凭证") - @ApiOperation(value = "审核付款凭证") - @PostMapping(value = "/check") - public Result check(@RequestBody CheckVO checkVO) { - payMeetingSituationService.check(checkVO); - return Result.OK("审核成功!"); - } - - /** - * 审核报名信息 - */ - @AutoLog(value = "审核报名信息") - @RequiresPermissions("otherMeeting:auditSignUp") - @ApiOperation(value = "审核报名信息") - @PostMapping(value = "/checkRegister") - public Result checkRegister(@RequestBody CheckVO checkVO) { - payMeetingSituationService.checkRegister(checkVO); - return Result.OK("审核成功!"); - } - /** * 合并开票 */ @@ -357,6 +321,17 @@ public class PayMeetingSituationController extends JeroController getSignInPage(@RequestBody SignInVO signInVO) { + ValidUtil.validate(signInVO); + SignInPageVO signInPageVO = payMeetingSituationService.signIn(signInVO); + return Result.OK(signInPageVO); + } + /** * 签到 */ @@ -364,7 +339,7 @@ public class PayMeetingSituationController extends JeroController signIn(@RequestBody SignInVO signInVO) { - ValidUtil.validate(signInVO); + ValidUtil.validate(signInVO, SignIn.class); payMeetingSituationService.signIn(signInVO); return Result.OK("签到成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index 7d6fed87..3f0b3ccf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -313,17 +313,4 @@ public class StandardsMeetingSituationController extends JeroController signIn(@RequestBody SignInVO signInVO) { - ValidUtil.validate(signInVO); - payMeetingSituationService.signIn(signInVO); - return Result.OK("签到成功!"); - } - - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index 19669178..56d60986 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -313,17 +313,5 @@ public class WorkGroupMeetingSituationController extends JeroController signIn(@RequestBody SignInVO signInVO) { - ValidUtil.validate(signInVO); - payMeetingSituationService.signIn(signInVO); - return Result.OK("签到成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index fe5bfcb7..c323385e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -243,6 +243,10 @@ public class PayMeetingSituation implements Serializable { @Dict(dicCode = "yn") private Integer checkIn; + /**签到文件*/ + @ApiModelProperty(value = "签到文件") + private String checkFile; + /**邮寄联系人*/ @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") @ApiModelProperty(value = "邮寄联系人") 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 c9775f39..4e487143 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 @@ -59,7 +59,7 @@ public interface IPayMeetingSituationService extends IService contractPage(Page page, MeetingSituationContractVO meetingSituationContractVO); - void signIn(SignInVO signInVO); + SignInPageVO signIn(SignInVO signInVO); String getMeetingType(PayMeetingSituation payMeetingSituation); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 97bbac66..a10e6658 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -544,13 +544,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl