From 865fc8d02e44811fb423df7125055c3a85e38964 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 09:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 17 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html | 3
.idea/encodings.xml | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html | 12 +
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 3
cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js | 31 +++
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 7
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html | 33 ++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 37 +++
.idea/workspace.xml | 243 +++++++++++++++++++-----
cloud-server-other/src/main/resources/mapper/SiteMapper.xml | 3
.idea/compiler.xml | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html | 143 ++++++++++++-
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 13 +
16 files changed, 469 insertions(+), 88 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3d60dfb..d160803 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
+ <option name="USE_RELEASE_OPTION" value="false" />
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
@@ -17,5 +18,6 @@
<module name="mb-cloud-auth" />
</profile>
</annotationProcessing>
+ <bytecodeTargetLevel target="8" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 9b576f9..f5917ff 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="Encoding">
+ <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$/cloud-server-account" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-server-account/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-server-account/src/main/resources" charset="UTF-8" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 804f305..7be9e85 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,13 +25,16 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.12">
- <change afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetionVO.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent1.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user1.html" afterDir="false" />
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.13bug2">
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -62,17 +65,30 @@
<option name="generalSettings">
<MavenGeneralSettings>
<option name="localRepository" value="C:\Users\45438\.m2\repository" />
- <option name="mavenHome" value="E:/apache-maven-3.9.3" />
+ <option name="mavenHome" value="$PROJECT_DIR$/../../apache-maven-3.9.3" />
<option name="userSettingsFile" value="C:\Users\45438\.m2\settings.xml" />
</MavenGeneralSettings>
+ </option>
+ <option name="enabledProfiles">
+ <list>
+ <option value="dev" />
+ </list>
+ </option>
+ <option name="disabledProfiles">
+ <list>
+ <option value="fat" />
+ </list>
</option>
</component>
<component name="PackageJsonUpdateNotifier">
<dismissed value="$PROJECT_DIR$/package.json" />
</component>
<component name="ProblemsViewState">
- <option name="selectedTabId" value="ProjectErrors" />
+ <option name="selectedTabId" value="CurrentFile" />
</component>
+ <component name="ProjectColorInfo">{
+ "associatedIndex": 5
+}</component>
<component name="ProjectId" id="2T0poWYlZShlnPso29uxjn4gQQo" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
@@ -81,14 +97,26 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">
- <property name="RequestMappingsPanelOrder0" value="0" />
- <property name="RequestMappingsPanelOrder1" value="1" />
- <property name="RequestMappingsPanelWidth0" value="75" />
- <property name="RequestMappingsPanelWidth1" value="75" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/user" />
- <property name="settings.editor.selected.configurable" value="MavenSettings" />
- </component>
+ <component name="PropertiesComponent"><![CDATA[{
+ "keyToString": {
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "ignore.virus.scanning.warn.message": "true",
+ "node.js.detected.package.eslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "project.structure.last.edited": "模块",
+ "project.structure.proportion": "0.0",
+ "project.structure.side.proportion": "0.0",
+ "settings.editor.selected.configurable": "MavenSettings",
+ "vue.rearranger.settings.migration": "true"
+ }
+}]]></component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
@@ -122,24 +150,53 @@
<option value="SpringBootApplicationConfigurationType" />
</set>
</option>
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
</component>
<component name="RunManager" selected="Spring Boot.ManagementApplication">
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <shortenClasspath name="MANIFEST" />
+ <option name="TEST_OBJECT" value="class" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
<configuration name="AccountApplicationTests" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
<module name="mb-cloud-account" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsh.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="AccountApplicationTests" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
+ <module name="mb-cloud-account" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.dsh.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="BigDecimalToChineseWords" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.dsh.guns.modular.system.util.BigDecimalToChineseWords" />
+ <module name="mb-cloud-management" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.dsh.guns.modular.system.util.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
@@ -177,6 +234,23 @@
<option name="Make" enabled="true" />
</method>
</configuration>
+ <configuration name="AccountApplicationTests.contextLoads" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <module name="mb-cloud-account" />
+ <shortenClasspath name="MANIFEST" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.dsh.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <option name="PACKAGE_NAME" value="com.dsh" />
+ <option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
+ <option name="METHOD_NAME" value="contextLoads" />
+ <option name="TEST_OBJECT" value="method" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<shortenClasspath name="MANIFEST" />
<option name="TEST_OBJECT" value="class" />
@@ -186,24 +260,39 @@
</configuration>
<configuration name="AccountApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-account" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="AccountApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-account" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
- <option name="ALTERNATIVE_JRE_PATH" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ActivityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-activity" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="ActivityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <module name="mb-cloud-activity" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="AuthApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <module name="mb-cloud-auth" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="cn.mb.cloud.auth.AuthApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -217,16 +306,39 @@
</configuration>
<configuration name="CompetitionApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-competition" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="CompetitionApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <module name="mb-cloud-competition" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="CourseApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-course" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="CourseApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <module name="mb-cloud-course" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="GatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+ <module name="mb-cloud-gateway" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="cn.mb.cloud.gateway.GatewayApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -239,10 +351,26 @@
</method>
</configuration>
<configuration name="ManagementApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="mb-cloud-management" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" />
<option name="ENABLE_JMX_AGENT" value="false" />
+ <module name="mb-cloud-management" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="ManagementApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <option name="ENABLE_JMX_AGENT" value="false" />
+ <module name="mb-cloud-management" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="OtherApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+ <module name="mb-cloud-other" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.OtherApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -261,17 +389,17 @@
</method>
</configuration>
<list>
- <item itemvalue="Application.AccountApplicationTests" />
- <item itemvalue="Application.BigDecimalToChineseWords" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
- <item itemvalue="Spring Boot.ManagementApplication" />
<item itemvalue="Spring Boot.AccountApplication" />
+ <item itemvalue="Spring Boot.ManagementApplication" />
<item itemvalue="Spring Boot.GatewayApplication" />
<item itemvalue="Spring Boot.OtherApplication" />
<item itemvalue="Spring Boot.ActivityApplication" />
<item itemvalue="Spring Boot.AuthApplication" />
<item itemvalue="Spring Boot.CourseApplication" />
<item itemvalue="Spring Boot.CompetitionApplication" />
+ <item itemvalue="应用程序.AccountApplicationTests" />
+ <item itemvalue="应用程序.BigDecimalToChineseWords" />
</list>
<recent_temporary>
<list>
@@ -305,7 +433,7 @@
</serviceView>
</option>
</component>
- <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration>C:\Users\luo\AppData\Roaming\Subversion</configuration>
</component>
@@ -380,6 +508,13 @@
<workItem from="1697072437579" duration="8289000" />
<workItem from="1697092527442" duration="204000" />
<workItem from="1697092830953" duration="1837000" />
+ <workItem from="1697178223586" duration="78000" />
+ <workItem from="1697178417354" duration="1021000" />
+ <workItem from="1697180043229" duration="965000" />
+ <workItem from="1697181152560" duration="3246000" />
+ <workItem from="1697184619489" duration="382000" />
+ <workItem from="1697185123659" duration="1829000" />
+ <workItem from="1697186980814" duration="3007000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -471,14 +606,6 @@
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1690364506501</updated>
- </task>
- <task id="LOCAL-00014" summary="9.15">
- <option name="closed" value="true" />
- <created>1694749099246</created>
- <option name="number" value="00014" />
- <option name="presentableId" value="LOCAL-00014" />
- <option name="project" value="LOCAL" />
- <updated>1694749099246</updated>
</task>
<task id="LOCAL-00015" summary="学员">
<option name="closed" value="true" />
@@ -752,7 +879,23 @@
<option name="project" value="LOCAL" />
<updated>1697024509448</updated>
</task>
- <option name="localTasksCounter" value="49" />
+ <task id="LOCAL-00049" summary="10.13bug1">
+ <option name="closed" value="true" />
+ <created>1697186903441</created>
+ <option name="number" value="00049" />
+ <option name="presentableId" value="LOCAL-00049" />
+ <option name="project" value="LOCAL" />
+ <updated>1697186903441</updated>
+ </task>
+ <task id="LOCAL-00050" summary="10.13bug2">
+ <option name="closed" value="true" />
+ <created>1697187817778</created>
+ <option name="number" value="00050" />
+ <option name="presentableId" value="LOCAL-00050" />
+ <option name="project" value="LOCAL" />
+ <updated>1697187817778</updated>
+ </task>
+ <option name="localTasksCounter" value="51" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -763,17 +906,13 @@
<map>
<entry key="MAIN">
<value>
- <State>
- <option name="COLUMN_ORDER" />
- </State>
+ <State />
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="学员" />
- <MESSAGE value="学员2" />
<MESSAGE value="学员4" />
<MESSAGE value="9.25" />
<MESSAGE value="9.26" />
@@ -797,7 +936,9 @@
<MESSAGE value="10.11" />
<MESSAGE value="10.12" />
<MESSAGE value="10.13" />
- <option name="LAST_COMMIT_MESSAGE" value="10.13" />
+ <MESSAGE value="10.13bug1" />
+ <MESSAGE value="10.13bug2" />
+ <option name="LAST_COMMIT_MESSAGE" value="10.13bug2" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 1b0a93f..aab6727 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -87,6 +87,13 @@
}
+ @ResponseBody
+ @PostMapping("/student/frozen")
+ public void frozen(@RequestBody TStudent student){
+ studentService.updateById(student);
+
+ }
+
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 6569c12..5909e6d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -181,7 +181,8 @@
for (PointsMerchandise merchandise : merchandises) {
IntegralCommodity integralCommodity = new IntegralCommodity();
integralCommodity.setCommodityId(merchandise.getId());
- integralCommodity.setCommodityImg(merchandise.getProductImages());
+ String[] split = merchandise.getProductImages().split(",");
+ integralCommodity.setCommodityImg(split[0]);
integralCommodity.setCommodityName(merchandise.getName());
integralCommodity.setCommodityPrice(merchandise.getPrice());
integralCommodity.setGoodsType(merchandise.getType());
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java
index 83afe6a..4283ba9 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java
@@ -38,4 +38,8 @@
@PostMapping("/student/queryStudentCom")
List<Map<String, Object>> listCom(@RequestBody Integer id);
+
+
+ @PostMapping("/student/frozen")
+ void frozen(@RequestBody TStudent student);
}
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 a918c2f..d56a7f0 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
@@ -653,6 +653,13 @@
}
+ @ResponseBody
+ @PostMapping("/queryCity1/")
+ public ResultUtil queryCity2(){
+
+ return new ResultUtil(0,null,null,null,null);
+ }
+
/**
* 根据城市code获取门店
* @param cityCode
@@ -686,19 +693,45 @@
return new ResultUtil(0,0,null,list,null);
}
+ @ResponseBody
+ @PostMapping("/queryStore1/")
+ public ResultUtil queryStore2(){
+// List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
+//// Map<String,Integer> map = new LinkedHashMap<>();
+// List<SelectDto> selectDtos = new ArrayList<>();
+// Map<String,Integer> map = new HashMap<>();
+//// for (TStore store : list) {
+// SelectDto selectDto = new SelectDto();
+// selectDto.setId(Long.valueOf(store.getId()));
+// selectDto.setValue(store.getName());
+// selectDtos.add(selectDto);
+//
+// }
+// map.put("options",selectDtos);
+
+ return new ResultUtil(0,0,null,null,null);
+ }
+
+
/**
* 根据门店id获取场地
* @param storeId
* @return
*/
@ResponseBody
- @PostMapping("/querySite")
- public List<TSite> querySite(Integer storeId){
+ @PostMapping("/querySite/{id}")
+ public List<TSite> querySite(@PathVariable("id") Integer storeId){
System.out.println("==storeId==="+storeId);
List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
return list;
}
+
+ @ResponseBody
+ @PostMapping("/querySite/")
+ public ResultUtil querySite1(){
+ return new ResultUtil(0,0,null,null,null);
+ }
/**
* 获取城市教练
* @param cityCode
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 8d2ff2a..fa7e8a3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -422,6 +422,23 @@
}
+ @RequestMapping("/frozen")
+ @ResponseBody
+
+ public ResultUtil forzen(Integer id,Integer state){
+
+ TStudent student = new TStudent();
+ student.setId(id);
+ student.setState(state);
+
+
+ studentClient.frozen(student);
+
+
+ return ResultUtil.success();
+
+ }
+
/**
* 获取列表
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index 08433d9..525019c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -117,7 +117,10 @@
"method": "get",
"messages": {
},
- "sendOn": ""
+ "sendOn": "",
+ "requestAdaptor": "",
+ "adaptor": "",
+ "silent": true
},
"onEvent": {
"change": {
@@ -139,7 +142,7 @@
"type": "select",
"label": "所在市：",
"name": "city",
- "value":"",
+ "value": "",
"id": "u:14bafe37d5f3",
"multiple": false,
"mode": "horizontal",
@@ -152,7 +155,10 @@
"method": "post",
"messages": {
},
- "sendOn": "this.province != null &&this.province != ' '"
+ "sendOn": "this.province != null &&this.province != ' '",
+ "requestAdaptor": "",
+ "adaptor": "",
+ "silent": true
},
"onEvent": {
"change": {
@@ -168,7 +174,10 @@
},
"labelField": "name",
"valueField": "code",
- "required": true
+ "required": true,
+ "loadingConfig": {
+ "show": true
+ }
},
{
"type": "select",
@@ -187,7 +196,10 @@
"url": "/coursePackage/queryStore1/$city",
"messages": {
},
- "sendOn": "this.city != null &&this.city != ' '"
+ "sendOn": "this.city != null &&this.city != ' '",
+ "requestAdaptor": "",
+ "adaptor": "",
+ "silent": true
},
"labelField": "name",
"valueField": "id",
@@ -218,14 +230,15 @@
"leftFixed": "lg"
},
"source": {
- "url": "/coursePackage/querySite",
+ "url": "/coursePackage/querySite/$store",
"method": "post",
"messages": {
},
- "data": {
- "storeId": "$store"
- },
- "dataType": "form"
+ "dataType": "form",
+ "requestAdaptor": "",
+ "adaptor": "",
+ "silent": true,
+ "replaceData": true
},
"labelField": "name",
"valueField": "id",
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
index d75b1f7..1412236 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
@@ -1,4 +1,47 @@
@layout("/common/_container.html"){
+
+ <style>
+ .avatar-uploader .el-upload {
+ border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ height: 100px;
+ width: 100px;
+ overflow: hidden;
+ }
+
+ .avatar-uploader .el-upload:hover {
+ border-color: #409EFF;
+ }
+ .avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 100px;
+ height: 100px;
+ line-height: 100px;
+ margin-top: 32px;
+ text-align: center;
+ }
+ .avatar {
+ width: 100px;
+ height: 100px;
+ display: block;
+ }
+
+ .col-sm-12 {
+ margin-top: 20px;
+ }
+
+ .col-sm-12 select {
+ height: 33px;
+ }
+ #app1{
+ margin-left: 255px;
+ }
+
+
+ </style>
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal">
@@ -141,23 +184,11 @@
<label class="col-sm-3 control-label head-scu-label"></label>
<label>推荐像素：210x280px</label>
</div>
- <div class="row" id="app1">
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label">*实景图片(请上传不超过五张图片): </label>
- <div class="col-sm-2" style="width: 100%;margin-left: 11%;margin-top: 1%">
- <el-upload
- :limit="5"
- class="avatar-uploader"
- action="/tCouponManage/uploadPic"
- list-type="picture-card"
- accept="."
- :on-success="handleAvatarSuccess"
- :on-remove="handleRemove">
- <i class="el-icon-plus"></i>
- </el-upload>
- <el-dialog :visible.sync="dialogVisible">
- <img width="100%" :src="imageUrl1" alt="">
- </el-dialog>
+ <div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">*详情页</label>
+ <div class="col-sm-2">
+ <div id="detailDrawingPreId">
+ <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
</div>
</div>
</div>
@@ -175,6 +206,38 @@
<!-- </div>-->
<!-- <input type="hidden" id="detailDrawing" value=""/>-->
<!-- </div>-->
+
+ <div class="row" id="app1">
+ <div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">*赛事活动图片(请上传不超过五张图片): </label>
+ <div class="col-sm-2" style="width: 100%;margin-left: 11%;margin-top: 1%">
+ <el-upload
+ :limit="5"
+ class="avatar-uploader"
+ action="/tCouponManage/uploadPic"
+ list-type="picture-card"
+ accept="."
+ :on-success="handleAvatarSuccess"
+ :on-remove="handleRemove">
+ <i class="el-icon-plus"></i>
+ </el-upload>
+ <el-dialog :visible.sync="dialogVisible">
+ <img width="100%" :src="imageUrl1" alt="">
+ </el-dialog>
+ </div>
+ </div>
+
+ </div>
+
+
+
+
+
+
+ </div>
+
+
+
<div class="form-group">
<label class="col-sm-3 control-label head-scu-label"></label>
<label>推荐像素：780x440px</label>
@@ -281,6 +344,52 @@
created() {
},
});
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
+ <script src="${ctxPath}/js/elementui/index.js"></script>
+ <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
+ <script src="${ctxPath}/js/vue/vue.js"></script>
+
+ <script type="text/javascript">
+
+ var vue2 = new Vue({
+ el: '#app1',
+ props: {
+ // 数量限制
+ limit: {
+ type: Number,
+ default: 2
+ },
+ },
+ data: {
+ autoUpload: true,//自动上传
+ imageUrl1: '',//模型数据，用于上传图片完成后图片预览
+ dialogVisible: false
+ },
+ methods: {
+ handleAvatarSuccess(res, file) {
+ console.log(TCarInfoDlg.goodsPicArray1)
+ TCarInfoDlg.goodsPicArray1.push(file);
+ },
+ beforeAvatarUpload(file) {
+ const isLt2M = file.size / 1024 / 1024 < 10;
+ if (!isLt2M) {
+ this.$message.error('上传图片大小不能超过 10MB!');
+ }
+ return isLt2M;
+ },
+ handleRemove(file, fileList) {
+ TCarInfoDlg.goodsPicArray1 = TCarInfoDlg.goodsPicArray1.filter(item => {
+ return item.uid != file.uid;
+ });
+ },
+ },
+ created() {
+ },
+ });
+
+
+
+
laydate.render({
elem: '#classStartTime'
,type: 'time'
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
index 95a8459..94dd640 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -85,7 +85,7 @@
<label class="col-sm-3 control-label">举办门店：</label>
<div class="col-sm-9">
<select class="form-control" id="shopId" name="shopId" multiple>
- <option value="">选择门店</option>
+
</select>
</div>
</div>
@@ -267,6 +267,8 @@
created() {
},
});
+
+
laydate.render({
elem: '#endTime'
,type:"date"
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
index 61b2a8c..435338d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
@@ -82,7 +82,6 @@
<label class="col-sm-3 control-label">举办门店：</label>
<div class="col-sm-9">
<select class="form-control" id="shopId" name="shopId">
- <option value="">选择门店</option>
@for(obj in list2){
<option value="${obj.id}" ${obj.id == item.storeId ? 'selected=selected' : ''}>${obj.name}</option>
@}
@@ -216,7 +215,18 @@
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
+
<script>
+
+ $(document).ready(function() {
+ $('#shopId').select2({
+ multiple: true,
+ closeOnSelect: false
+ });
+ });
+
let id = "${item.imgs}"
let obj = []
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
index 9fe851c..0b6fa72 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
@@ -36,6 +36,9 @@
<#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
<#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
<#button name="学员评语" icon="fa-edit" clickFun="TStudent.openTStudentDetail2()" space="true"/>
+ <#button name="冻结" icon="fa-edit" clickFun="TStudent.editCoursePackageState(2)" space="true"/>
+ <#button name="解冻" icon="fa-edit" clickFun="TStudent.editCoursePackageState(1)" space="true"/>
+
@if(shiro.hasPermission("/tStudent/delete")){
<#button name="删除" icon="fa-remove" clickFun="TStudent.delete()" space="true"/>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
index 6653ae6..1618198 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
@@ -174,6 +174,11 @@
return;
}
var shopId = $("#shopId").val();
+
+ if(shopId==""){
+ Feng.info("请选择门店");
+ return;
+ }
var shopIdString = shopId.join(",");
var name = $("#name").val();
if(name==""){
@@ -305,6 +310,12 @@
return;
}
var shopId = $("#shopId").val();
+ if(shopId==""){
+ Feng.info("请选择门店");
+ return;
+ }
+ var shopIdString = shopId.join(",");
+
var name = $("#name").val();
if(name==""){
Feng.info("请输入赛事名称");
@@ -389,7 +400,7 @@
ajax.set("id",$("#id").val());
ajax.set("provinceCode",pCode);
ajax.set("cityCode",cCode);
- ajax.set("storeId",shopId);
+ ajax.set("storeId",shopIdString);
ajax.set("name",name);
ajax.set("sTime",startTime);
ajax.set("eTime",endTime);
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
index f5c7c63..4d79554 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
@@ -178,6 +178,37 @@
TStudent.table.refresh({query: queryData});
};
+TStudent.editCoursePackageState = function (state) {
+ if (this.check()) {
+
+ if(TStudent.seItem.state == state){
+ Feng.error("不能重复操作");
+ return
+ }
+ parent.layer.confirm(state == 1 ? '是否解冻' : "是否冻结" , {
+ btn: ['确定', '取消']
+ }, function (index) {
+ let ajax = new $ax(Feng.ctxPath + "/tStudent/frozen", function (data) {
+ Feng.success(state == 1 ? '解冻' : "冻结" + "成功!");
+ TStudent.table.refresh();
+ }, function (data) {
+ Feng.error(state == 1 ? '解冻' : "冻结" + "失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("id", TStudent.seItem.id);
+ ajax.set("state", state);
+ ajax.start();
+ parent.layer.close(index);
+
+ }, function (index) {
+ parent.layer.close(index);
+ }
+
+
+ )
+
+ }
+};
+
$(function () {
var defaultColunms = TStudent.initColumn();
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index 4a9f884..b4b93a9 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -128,9 +128,6 @@
and t1.name like concat('%',#{query.name},'%')
</if>
and t1.state != 3
- and t1.insuranceEndTime <= DATE_ADD(CURDATE(), INTERVAL 2 MONTH)
-
-
</where>
ORDER BY insertTime desc
--
Gitblit v1.7.1