diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enforcement/EnfNosLawEnforcementFilingController.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enforcement/EnfNosLawEnforcementFilingController.java index 9d39e82..b4eb831 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enforcement/EnfNosLawEnforcementFilingController.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enforcement/EnfNosLawEnforcementFilingController.java @@ -3,7 +3,6 @@ package com.zdxt.enforcementnos.controller.app.enforcement; import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementFilingDetailVO; import com.zdxt.enforcementnos.service.NosLawEnforcementFilingService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.dromara.common.core.domain.R; @@ -31,7 +30,6 @@ public class EnfNosLawEnforcementFilingController { * @return 备案详情 */ @Operation(summary = "获取当前用户所属执法单位备案") - @Parameter(name = "id", description = "备案id", required = true) @GetMapping("/detail") public R getFiling() { return R.ok(nosLawEnforcementFilingService.getFiling()); diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enterprise/EntNosLawEnforcementTaskController.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enterprise/EntNosLawEnforcementTaskController.java index c3fe700..5355e39 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enterprise/EntNosLawEnforcementTaskController.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enterprise/EntNosLawEnforcementTaskController.java @@ -8,6 +8,7 @@ import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskPageBO; import com.zdxt.enforcementnos.domain.bo.SubmitNosLawEnforcementTaskItemBO; import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskByCommentStatusPageVO; import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskDetailVO; +import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskDigitalVoiceLoggingRelationVO; import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskPageVO; import com.zdxt.enforcementnos.service.NosLawEnforcementTaskService; import io.swagger.v3.oas.annotations.Operation; @@ -111,4 +112,17 @@ public class EntNosLawEnforcementTaskController { public R submitDigitalVoiceLoggingMaterials(@RequestBody @Valid NosLawEnforcementTaskDigitalVoiceLoggingBO bo) { return R.ok(nosLawEnforcementTaskService.submitDigitalVoiceLoggingMaterials(bo)); } + + /** + * 查询云笔录详情 + * @param taskId 任务id + * @return 详情 + */ + @Operation(summary = "查询云笔录详情") + @Parameter(name = "taskId", description = "任务id", required = true) + @GetMapping("/digital-voice-logging/detail") + public R getDigitalVoiceLoggingDetail( + @RequestParam("taskId") String taskId) { + return R.ok(nosLawEnforcementTaskService.getDigitalVoiceLoggingDetail(taskId)); + } } diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskDetailVO.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskDetailVO.java index a19e3b8..131cec7 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskDetailVO.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskDetailVO.java @@ -177,4 +177,10 @@ public class NosLawEnforcementTaskDetailVO { @Schema(description = "是否创建人") private Boolean creator; + + /** + * 云笔录状态(0-未发起,1-待企业提交,2-待执法人员确认,3-已完成) + */ + @Schema(description = "云笔录状态(0-未发起,1-待企业提交,2-待执法人员确认,3-已完成)", example = "1") + private Integer digitalVoiceLoggingStatus; } diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskServiceImpl.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskServiceImpl.java index 63b41ab..996afb2 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskServiceImpl.java @@ -657,9 +657,12 @@ public class NosLawEnforcementTaskServiceImpl extends ServiceImpl