From 4d88b627c819cfe469d32389e9876806bdb2bdf3 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期四, 28 九月 2023 17:27:32 +0800
Subject: [PATCH] 9.26。15
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 5 +++++
.idea/workspace.xml | 25 +++++++++++++++----------
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html | 7 ++++---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js | 6 +++++-
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a8b2190..1396dec 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,15 +25,11 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。13">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。14">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/resources/sharding-jdbc.properties" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/sharding-jdbc.properties" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/sharding-jdbc.properties" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/sharding-jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -303,7 +299,7 @@
<workItem from="1695794503293" duration="3283000" />
<workItem from="1695799021203" duration="5869000" />
<workItem from="1695820563853" duration="56000" />
- <workItem from="1695863479059" duration="8278000" />
+ <workItem from="1695863479059" duration="12419000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -564,7 +560,15 @@
<option name="project" value="LOCAL" />
<updated>1695820597140</updated>
</task>
- <option name="localTasksCounter" value="35" />
+ <task id="LOCAL-00035" summary="9.26。14">
+ <option name="closed" value="true" />
+ <created>1695886217811</created>
+ <option name="number" value="00035" />
+ <option name="presentableId" value="LOCAL-00035" />
+ <option name="project" value="LOCAL" />
+ <updated>1695886217811</updated>
+ </task>
+ <option name="localTasksCounter" value="36" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -603,7 +607,8 @@
<MESSAGE value="9.26。11" />
<MESSAGE value="9.26。12" />
<MESSAGE value="9.26。13" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。13" />
+ <MESSAGE value="9.26。14" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。14" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index c67343c..bb8cc3f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -556,6 +556,11 @@
public String showExamineCoursePackageDetails(Model model, Integer id){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
+ System.out.println("============"+ tCoursePackage.getAuditStatus());
+ model.addAttribute("auditStatus", tCoursePackage.getAuditStatus());
+
+ model.addAttribute("authRemark", tCoursePackage.getAuthRemark());
+
model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
String[] split = tCoursePackage.getClassWeeks().split(";");
List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html
index 9fe4f92..a16fef0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html
@@ -204,14 +204,15 @@
<div class="form-group">
<label class="col-sm-3 control-label">*审核状态：</label>
<div class="col-sm-8" style="margin-top: 6px;">
- <input name="auditStatus" type="radio" value="2"/> 通过
- <input name="auditStatus" type="radio" value="3"/> 拒绝
+ <input name="auditStatus" type="radio" value="2" ${auditStatus == 2 ? 'checked' : ''}/> 通过
+ <input name="auditStatus" type="radio" value="3" ${auditStatus == 3 ? 'checked':''}/> 拒绝
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">*拒绝理由：</label>
<div class="col-sm-8" style="margin-top: 6px;">
- <textarea id="authRemark" style="width: 100%;height: 200px;" placeholder="请输入拒绝理由"></textarea>
+ <textarea id="authRemark" style="width: 100%;height: 200px;" placeholder="请输入拒绝理由" >${authRemark!}</textarea>
+
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js
index 3e9d1a6..1d0e26b 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js
@@ -99,7 +99,11 @@
Feng.error("请选择审核结果");
return
}
- let authRemark = $('#authRemark').text();
+
+ let authRemark = $('#authRemark').val();
+ console.log("========="+authRemark)
+
+
if(3 == auditStatus && '' == authRemark){
Feng.error("请输入拒绝理由");
return
--
Gitblit v1.7.1