diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知,工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知,工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index afdc004..3812666 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,5 +24,5 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); - + List selectByUserId(@Param("userId") Long userId); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知,工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index afdc004..3812666 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,5 +24,5 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); - + List selectByUserId(@Param("userId") Long userId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知,工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index afdc004..3812666 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,5 +24,5 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); - + List selectByUserId(@Param("userId") Long userId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index f52c39d..22f86ab 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,4 +97,11 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知,工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index afdc004..3812666 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,5 +24,5 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); - + List selectByUserId(@Param("userId") Long userId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index f52c39d..22f86ab 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,4 +97,11 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index c3ef88e..1416126 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.FileGrantNoticeSaveResponse; import com.casic.missiles.dto.resource.staff.RegistrationFormRequest; +import com.casic.missiles.dto.resource.staff.StaffTrainConfirmRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; @@ -85,11 +86,11 @@ } - @ApiOperation("发送通知") - @PostMapping("/sendNote") - public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { - return fileGrantNoticeService.saveFileGrantNotice(request); - } +// @ApiOperation("发送通知") +// @PostMapping("/sendNote") +// public ReturnDTO sendNote(@RequestBody @Valid BizResourceFileGrantNotice request) { +// return fileGrantNoticeService.saveFileGrantNotice(request); +// } @ApiOperation("向参训人员发送通知,工作台提醒") @@ -98,4 +99,9 @@ return trainingRegistrationFormService.workbenchReminder(idDTO.getId()); } + @ApiOperation("参训人员确认") + @PostMapping("/confirm") + public ReturnDTO confirm(@RequestBody @Valid StaffTrainConfirmRequest confirmRequest) { + return trainingRegistrationFormService.confirmForm(confirmRequest); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java index afdc004..3812666 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffInfoMapper.java @@ -24,5 +24,5 @@ String selectNameById(@Param("id") Long id); List selectPersonCertificate(); - + List selectByUserId(@Param("userId") Long userId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 85ed0f7..dc0ba80 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -25,6 +25,8 @@ List selectUsableSignList(@Param("userId") Long userId); + List selectUsableSignListByAccount(@Param("userAccount") String account); + Page selectSignListPage(Page page, @Param("request") SignListRequest request); List selectSignList(@Param("request") SignListRequest request); diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml index f52c39d..22f86ab 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffInfoMapper.xml @@ -97,4 +97,11 @@ left join biz_resource_staff_verifier_detail brsvd on brsv.id = brsvd.verifier_id + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml index 5b76861..c69daef 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceTrainingRegistrationFormParticipantsMapper.xml @@ -6,8 +6,10 @@ + + @@ -15,7 +17,7 @@ - id, form_id, is_conform, is_sign, confirm_time, create_time, description + id, form_id, participant_id, is_conform, is_sign, is_noticed, confirm_time, create_time, description diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index 8854047..d09f942 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -61,6 +61,15 @@ WHERE ssur.user_id = #{userId} + +