diff --git a/pom.xml b/pom.xml index 6e1effd..f3b5ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.ydool.boot ydool-boot - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT-rd diff --git a/src/main/java/com/ydool/boot/modules/rddb/entity/Report.java b/src/main/java/com/ydool/boot/modules/rddb/entity/Report.java index 90b3601..7fcc7ea 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/entity/Report.java +++ b/src/main/java/com/ydool/boot/modules/rddb/entity/Report.java @@ -1,7 +1,7 @@ package com.ydool.boot.modules.rddb.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.ydool.boot.core.entity.BaseEntity; +import com.ydool.boot.core.entity._BaseDataEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("t_report") -public class Report extends BaseEntity{ +public class Report extends _BaseDataEntity { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/ydool/boot/modules/rddb/web/ReportController.java b/src/main/java/com/ydool/boot/modules/rddb/web/ReportController.java index 32f92dc..acaa8f6 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/web/ReportController.java +++ b/src/main/java/com/ydool/boot/modules/rddb/web/ReportController.java @@ -43,6 +43,7 @@ public class ReportController extends BaseAdminController { } @PostMapping("list") + @PreAuth("rddb:report:list") @ResponseBody public void list(Report report) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -72,6 +73,7 @@ public class ReportController extends BaseAdminController { if(StrUtil.isBlank(report.getId())) { report.setCreatedId(getLoginUser().getId()); report.setStreetStr(getLoginUser().getStreetId()); + report.setHireStatus(0); } boolean flag = reportService.saveOrUpdate(report); render(flag ? Ret.ok() : Ret.fail("操作失败")); diff --git a/src/main/resources/views/modules/rddb/report/form.html b/src/main/resources/views/modules/rddb/report/form.html index 29f39ba..cc400f1 100644 --- a/src/main/resources/views/modules/rddb/report/form.html +++ b/src/main/resources/views/modules/rddb/report/form.html @@ -79,6 +79,7 @@ + <% if(hasAuth("rddb:report:audit")) { %>
审核信息
@@ -99,7 +100,32 @@ + + <% } %> + <% else { %> +
审核信息
+ + + + + +
+
+
+ +
+ +
+
+
+ + <% } %> + +