diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
index 4c8a8d1b3..fd1d2d1f3 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
@@ -49,16 +49,16 @@ public class IscAppService implements Serializable {
*/
private String enabled;
- /**
- * 申请类型(0申请 1续期)
- */
- private String applyType;
-
/**
* 审核状态(0待审核 1审核通过 2驳回)
*/
private String status;
+ /**
+ * 审核意见
+ */
+ private String auditMind;
+
/**
* 虚拟地址
*/
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
index 8a0397684..e40d7512c 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
@@ -93,6 +93,12 @@ public class IscAppServiceBo extends BaseEntity {
@NotNull(message = "续期时长不能为空", groups = { AddGroup.class })
private Integer renewalDuration;
+ /**
+ * 申请类型(0申请 1续期)
+ */
+ @NotBlank(message = "申请类型必填")
+ private String applyType;
+
/**
* 分页大小
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
index 8fd398cc8..a4eba30ef 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
@@ -82,6 +82,12 @@ public class IscAppServiceVo {
@ApiModelProperty("审核状态(0待审核 1审核通过 2驳回)")
private String status;
+ /**
+ * 审核意见
+ */
+ @ApiModelProperty("审核意见")
+ private String auditMind;
+
/**
* 虚拟地址
*/
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 127c3d181..6029c5c52 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -159,6 +159,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl
-
+
@@ -23,6 +23,7 @@
+
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index fb83b5451..9f31344f6 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -184,7 +184,7 @@
>{{dict.dictLabel}}
-
+
@@ -233,6 +233,10 @@
+
+ 审核意见
+ {{this.form.auditMind}}
+
启用状态
@@ -467,6 +471,7 @@ export default {
getAppservice(appServiceId).then(response => {
this.loading = false;
this.form = response.data;
+ this.form.remark = undefined;
this.form.status = this.form.status.split(",");
this.open = true;
this.title = "应用服务续期";
@@ -506,6 +511,7 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
+ this.form.applyType = this.applyType;
this.form.status = this.form.status.join(",");
if (this.form.appServiceId != null) {
updateAppservice(this.form).then(response => {
diff --git a/sql/isc.sql b/sql/isc.sql
index b546ad060..5664a8f7c 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -11,7 +11,6 @@ CREATE TABLE `isc_app_service` (
`application_id` bigint NULL DEFAULT NULL COMMENT '应用ID',
`user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
`enabled` char(1) NOT NULL COMMENT '启用状态(0启用 1停用)',
- `apply_type` char(1) DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
`status` char(1) DEFAULT NULL COMMENT '审核状态(0待审核 1审核通过 2驳回)',
`virtual_addr` varchar(255) DEFAULT NULL COMMENT '虚拟地址',
`end_time` datetime(0) NULL DEFAULT NULL COMMENT '到期时间',