diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java index 7a34057..f237362 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java @@ -9,9 +9,6 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; -import com.bonus.common.security.annotation.InnerAuth; -import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -40,7 +37,7 @@ public class QuestionRecordController extends BaseController { * @return * */ - @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:question:list")) +// @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:question:list")) @GetMapping("/list") @SysLog(title = "问题记录列表", businessType = OperaType.QUERY, logType = 0, module = "问题记录列表", details = "问题记录列表") public TableDataInfo list(QuestionRecordDto o) { @@ -54,7 +51,7 @@ public class QuestionRecordController extends BaseController { return getDataTableError(new ArrayList<>()); } - @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:insert")) +// @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:insert")) @PostMapping("/insert") @SysLog(title = "新增问题记录", businessType = OperaType.UPDATE, logType = 0, module = "新增问题记录", details = "新增问题记录") public AjaxResult exit(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "params")String params) { @@ -73,7 +70,7 @@ public class QuestionRecordController extends BaseController { /** * 删除分包商 */ - @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:del")) +// @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:del")) @PostMapping("/del") @SysLog(title = "删除问题记录", businessType = OperaType.UPDATE, logType = 0, module = "删除问题记录") public AjaxResult del(@Validated @RequestBody QuestionRecordDto o) { @@ -94,7 +91,7 @@ public class QuestionRecordController extends BaseController { /** * 删除分包商 */ - @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:deal")) +// @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:deal")) @PostMapping("/deal") @SysLog(title = "处理问题", businessType = OperaType.UPDATE, logType = 0, module = "处理问题") public AjaxResult deal(@Validated @RequestBody QuestionRecordDto o) { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java index f953647..2b822bb 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java @@ -42,7 +42,7 @@ public class QuestionRecordDto { private String handler; /** - * 详情 + * 解决回复 */ private String remark; /** diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml index bf083b1..f93e3d7 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml @@ -7,12 +7,14 @@ qr.id, qr.module, qr.content, + qr.status, qr.submitter, qr.handler, qr.create_time, qr.update_time from question_record qr + qr.is_active = 1 and qr.module = #{module} @@ -33,7 +35,7 @@ - + insert into question_record( module, content, submitter,create_id) values( #{module}, #{content}, #{submitter}, #{createId})