From c4205186fd8f54bc0ce1ef647328813d4595748c Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Fri, 7 May 2021 13:45:13 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=8A=A5=E5=90=8D=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplyAuditLogAppController.java           |  3 +-
 .../dtos/applyauditlog/ApplyAuditLogDTO.java  |  8 ++++++
 .../impl/ApplyAuditLogServiceImpl.java        | 28 ++++++++++++++++++-
 .../resources/static/route/apply/audit.html   |  8 +++---
 .../resources/static/route/apply/show.html    |  2 +-
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java
index 266df21..e66bfa6 100644
--- a/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java
+++ b/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java
@@ -84,7 +84,8 @@ public class ApplyAuditLogAppController extends DefaultBaseController {
 
     @ApiOperation(value = "报名信息审核日志列表", notes = "报名信息审核日志列表接口")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "token", value = "token", paramType = "header")
+        @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+        @ApiImplicitParam(name = "applyId", value = "applyId", paramType = "applyId")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("list")
diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java
index 6d2229e..0b5173b 100644
--- a/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java
+++ b/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java
@@ -20,6 +20,8 @@ public class ApplyAuditLogDTO {
     private String applyId;
     @ApiModelProperty(name = "applyAuditState", value = "审核结果 2审核通过 4报名完成-1审核不通过")
     private Integer applyAuditState;
+    @ApiModelProperty(name = "applyAuditStateName", value = "审核结果中文名称")
+    private String applyAuditStateName;
     @ApiModelProperty(name = "applyAuditExplain", value = "审核说明")
     private String applyAuditExplain;
     @ApiModelProperty(name = "applyAuditUserId", value = "审核人ID")
@@ -95,5 +97,11 @@ public class ApplyAuditLogDTO {
         this.isDelete = isDelete;
     }
 
+    public String getApplyAuditStateName() {
+        return applyAuditStateName;
+    }
 
+    public void setApplyAuditStateName(String applyAuditStateName) {
+        this.applyAuditStateName = applyAuditStateName;
+    }
 }
diff --git a/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java b/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java
index 95398ff..f82ca2d 100644
--- a/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java
@@ -162,7 +162,9 @@ public class ApplyAuditLogServiceImpl extends DefaultBaseService implements IApp
 
     @Override
     public List<ApplyAuditLogDTO> list(Map<String, Object> params) {
-        return applyAuditLogDao.list(params);
+        List<ApplyAuditLogDTO> list = applyAuditLogDao.list(params);
+        setStateName(list);
+        return list;
     }
 
     @Override
@@ -189,4 +191,28 @@ public class ApplyAuditLogServiceImpl extends DefaultBaseService implements IApp
         return count == null ? 0 : count;
     }
 
+
+    public void setStateName(List<ApplyAuditLogDTO> list){
+        for (ApplyAuditLogDTO applyAuditLogDTO : list) {
+            if(applyAuditLogDTO.getApplyAuditState() == 0){
+                applyAuditLogDTO.setApplyAuditStateName("用户申请报名");
+            }
+            if(applyAuditLogDTO.getApplyAuditState() == 1){
+                applyAuditLogDTO.setApplyAuditStateName("用户撤回报名");
+            }
+            if(applyAuditLogDTO.getApplyAuditState() == 2){
+                applyAuditLogDTO.setApplyAuditStateName("审核通过");
+            }
+            if(applyAuditLogDTO.getApplyAuditState() == -1){
+                applyAuditLogDTO.setApplyAuditStateName("审核不通过");
+            }
+            if(applyAuditLogDTO.getApplyAuditState() == 3){
+                applyAuditLogDTO.setApplyAuditStateName("用户以报道");
+            }
+            if(applyAuditLogDTO.getApplyAuditState() == 4){
+                applyAuditLogDTO.setApplyAuditStateName("报名完成");
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/resources/static/route/apply/audit.html b/src/main/resources/static/route/apply/audit.html
index 153a8dd..73e25c4 100644
--- a/src/main/resources/static/route/apply/audit.html
+++ b/src/main/resources/static/route/apply/audit.html
@@ -65,7 +65,7 @@
                     <div class="layui-col-md4">
                         <label class="layui-form-label">出生日期</label>
                         <div class="layui-input-block">
-                            <input type="text" id="applyDataBirth" name="applyDataBirth" class="layui-input" value="" placeholder="无" lay-verify="required" readonly style="cursor: pointer;">
+                            <input type="text" id="applyDataBirth" name="applyDataBirth" class="layui-input" value="" placeholder="无" readonly style="cursor: pointer;">
                         </div>
                     </div>
                 </div>
@@ -73,7 +73,7 @@
                     <div class="layui-col-md4">
                         <label class="layui-form-label">职务</label>
                         <div class="layui-input-block">
-                            <input type="text" id="applyPosition" name="applyPosition" class="layui-input" value="" placeholder="无" lay-verify="required" readonly style="cursor: pointer;">
+                            <input type="text" id="applyPosition" name="applyPosition" class="layui-input" value="" placeholder="无" readonly style="cursor: pointer;">
                         </div>
                     </div>
                     <div class="layui-col-md4">
@@ -93,7 +93,7 @@
                     <div class="layui-col-md4">
                         <label class="layui-form-label">证件类型</label>
                         <div class="layui-input-block">
-                            <input type="text" id="applyCardTypeName" name="applyCardTypeName" class="layui-input" value="" placeholder="无" lay-verify="required" readonly style="cursor: pointer;">
+                            <input type="text" id="applyCardTypeName" name="applyCardTypeName" class="layui-input" value="" placeholder="无" readonly style="cursor: pointer;">
                         </div>
                     </div>
                     <div class="layui-col-md4">
@@ -145,7 +145,7 @@
                     <div class="layui-col-md6">
                         <label class="layui-form-label">单位电话</label>
                         <div class="layui-input-block">
-                            <input type="number" id="applyUnitPhone" name="applyUnitPhone" class="layui-input" value="" placeholder="无" lay-verify="required" readonly="readonly">
+                            <input type="text" id="applyUnitPhone" name="applyUnitPhone" class="layui-input" value="" placeholder="无" readonly="readonly">
                         </div>
                     </div>
                 </div>
diff --git a/src/main/resources/static/route/apply/show.html b/src/main/resources/static/route/apply/show.html
index b3a8cb2..0cfa160 100644
--- a/src/main/resources/static/route/apply/show.html
+++ b/src/main/resources/static/route/apply/show.html
@@ -148,7 +148,7 @@
                     <div class="layui-col-md6">
                         <label class="layui-form-label">单位电话</label>
                         <div class="layui-input-block">
-                            <input type="number" id="applyUnitPhone" name="applyUnitPhone" class="layui-input" value="" placeholder="无" lay-verify="required" readonly="readonly">
+                            <input type="text" id="applyUnitPhone" name="applyUnitPhone" class="layui-input" value="" placeholder="无" lay-verify="required" readonly="readonly">
                         </div>
                     </div>
                 </div>