From edb9ccaced04c88524dcb84ad514b29e28e8a0a5 Mon Sep 17 00:00:00 2001
From: zhouyuan <1069065057@qq.com>
Date: Tue, 12 Oct 2021 12:00:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9C=BA=E5=85=B3=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=A1=AB=E5=86=99=E4=B8=8A=E6=8A=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../boot/modules/rddb/entity/Report.java      |  4 +--
 .../modules/rddb/web/ReportController.java    |  2 ++
 .../views/modules/rddb/report/form.html       | 27 +++++++++++++++++++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e1effd..f3b5ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.ydool.boot</groupId>
         <artifactId>ydool-boot</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT-rd</version>
     </parent>
 
     <properties>
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<Report> 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 @@
                     </div>
                 </div>
                 <!--files-->
+                <% if(hasAuth("rddb:report:audit")) { %>
                 <div class="form-unit">审核信息</div>
                 <act:title title="" fields="4"/>
                 <act:input text="录用状态" name="hireStatus" col="2" as="select" dictType="sys_wait_pass_refuse"/>
@@ -99,7 +100,32 @@
                         </div>
                     </div>
                 </div>
+                </div>
+                <% } %>
+                <% else { %>
+            <div class="form-unit">审核信息</div>
+            <act:title title="" fields="4"/>
+            <act:input text="录用状态" name="hireStatus" col="2" as="select" dictType="sys_wait_pass_refuse" readonly="true" />
+            <act:input text="录用级别" name="hireLevel" col="2" as="select" dictType="report_hire_level"  readonly="true"/>
+            <act:input text="录用媒体" name="hireCategory" col="2" as="select" dictType="report_hire_category"  readonly="true"/>
+            <act:input text="录用时间" as="date" view="month" name="hireDate" col="2"  readonly="true"/>
+            <div class="row">
+                <div class="col-xs-12">
+                    <div class="form-group">
+                        <label class="control-label col-sm-2">
+                            <span aria-required="true"></span>
+                            得分：
+                        </label>
+                        <div class="col-sm-10">
+                            <input type="number" max="100" min="1" id="title" name="score" value="${report.score!}" maxlength="" readonly
+                                   class="form-control" placeholder="">
+                        </div>
+                    </div>
+                </div>
             </div>
+            </div>
+                <% } %>
+
 
             <div class="box-footer">
                 <div class="row">
@@ -115,6 +141,7 @@
                     </div>
                 </div>
             </div>
+
         </act:form>
     </div>
 </div>