夏文涛 преди 2 години
родител
ревизия
363c3fe3ac
променени са 3 файла, в които са добавени 36 реда и са изтрити 37 реда
  1. 26 33
      .idea/workspace.xml
  2. 10 4
      src/main/java/com/template/controller/SmartScoreController.java
  3. BIN
      target/mybatis_plus-0.0.1-SNAPSHOT.jar.original

+ 26 - 33
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -21,8 +21,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="486">
-              <caret line="671" column="48" lean-forward="true" selection-start-line="671" selection-start-column="48" selection-end-line="671" selection-end-column="48" />
+            <state relative-caret-position="106">
+              <caret line="455" column="34" selection-start-line="455" selection-start-column="34" selection-end-line="455" selection-end-column="34" />
               <folding>
                 <element signature="e#11979#11980#0" expanded="true" />
                 <element signature="e#12006#12007#0" expanded="true" />
@@ -40,7 +40,7 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/core/JwtAuthenticationInterceptor.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="295">
-              <caret line="75" column="32" lean-forward="true" selection-start-line="75" selection-start-column="12" selection-end-line="75" selection-end-column="32" />
+              <caret line="75" column="32" selection-start-line="75" selection-start-column="12" selection-end-line="75" selection-end-column="32" />
             </state>
           </provider>
         </entry>
@@ -103,7 +103,6 @@
     <findStrings>
       <find>sheet</find>
       <find>(HttpServletResponse</find>
-      <find>导出</find>
       <find>定时</find>
       <find>年级</find>
       <find>smartUserExport</find>
@@ -131,6 +130,7 @@
       <find>score</find>
       <find>classes</find>
       <find>gradeId</find>
+      <find>导出</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -234,10 +234,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="974" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-7" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -499,18 +498,18 @@
       <workItem from="1709604835831" duration="41000" />
       <workItem from="1709604890825" duration="250000" />
       <workItem from="1709606083794" duration="10623000" />
-      <workItem from="1709688259937" duration="124825000" />
+      <workItem from="1709688259937" duration="126793000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="275540000" />
+    <option name="totallyTimeSpent" value="277508000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.39059082" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.090618335" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -521,8 +520,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.2286652" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" weight="0.3118162" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.23093922" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" visible="true" weight="0.2986871" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -539,7 +538,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.120469086" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.2428884" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -642,15 +641,9 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>673</line>
-          <properties />
-          <option name="timeStamp" value="140" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>838</line>
+          <line>915</line>
           <properties />
-          <option name="timeStamp" value="141" />
+          <option name="timeStamp" value="143" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -659,13 +652,6 @@
     <SUITE FILE_PATH="coverage/mybatis_plus$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1709618808702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSubject.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="512">
@@ -985,7 +971,7 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/core/JwtAuthenticationInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
-          <caret line="75" column="32" lean-forward="true" selection-start-line="75" selection-start-column="12" selection-end-line="75" selection-end-column="32" />
+          <caret line="75" column="32" selection-start-line="75" selection-start-column="12" selection-end-line="75" selection-end-column="32" />
         </state>
       </provider>
     </entry>
@@ -1010,10 +996,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.0/poi-4.1.0.jar!/org/apache/poi/ss/usermodel/Sheet.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="163" column="9" selection-start-line="163" selection-start-column="9" selection-end-line="163" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="671" column="48" lean-forward="true" selection-start-line="671" selection-start-column="48" selection-end-line="671" selection-end-column="48" />
+        <state relative-caret-position="106">
+          <caret line="455" column="34" selection-start-line="455" selection-start-column="34" selection-end-line="455" selection-end-column="34" />
           <folding>
             <element signature="e#11979#11980#0" expanded="true" />
             <element signature="e#12006#12007#0" expanded="true" />

+ 10 - 4
src/main/java/com/template/controller/SmartScoreController.java

@@ -453,6 +453,12 @@ public class SmartScoreController implements SmartScoreControllerAPI {
         style.setBorderRight(BorderStyle.THIN);
         style.setBorderTop(BorderStyle.THIN);
         Sheet sheet = workbook.createSheet("总分");
+        sheet.createFreezePane(6,3,0,0);
+//        参数说明:
+//        a表示要冻结的列数;
+//        b表示要冻结的行数;
+//        c表示右边区域[可见]的首列序号;
+//        d表示下边区域[可见]的首行序号;
         Row headerRow = sheet.createRow(0);
         for (int i = 0; i < (subjects.size() + 6); i++) {
             if (i == 0) {
@@ -743,13 +749,13 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                             Optional<SmartSubject> subject = subjects.stream().filter(e -> e.getName().equals(subjectStr)).findFirst();
                             if (subject != null && subject.isPresent()) {
                                 //数据重复性判断 学期 + 学号 + 科目
-                                String existData = semester + cardNo + subject;
+                                String existData = semester.get().getName() + " " + name + " " + cardNo + " " + subject.get().getName();
                                 scoreNames.add(existData);
                                 if (scoreNames.stream().distinct().count() != scoreNames.size()) {
                                     return CommonResult.fail("导入的Excel中的" + existData + "存在重复数据");
                                 }
                                 //重复数据提示
-                                long exist = scores.stream().filter(e -> e.getSemester().equals(semester) && e.getCardNo().equals(cardNo) && e.getSubjectId().equals(subject.get().getId())).count();
+                                long exist = scores.stream().filter(e -> e.getSemester().equals(semester.get().getName()) && e.getCardNo().equals(cardNo) && e.getSubjectId().equals(subject.get().getId())).count();
                                 if (exist > 0) {
                                     return CommonResult.fail(existData + "成绩数据在系统中已存在,请勿重复导入");
                                 }
@@ -907,13 +913,13 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                             Optional<SmartSubject> subject = subjects.stream().filter(e -> e.getName().equals(subjectStr)).findFirst();
                             if (subject != null && subject.isPresent()) {
                                 //数据重复性判断 学期 + 学号 + 科目
-                                String existData = semester + cardNo + subject;
+                                String existData = semester.get().getName() + " " + name + " " + cardNo + " " + subject.get().getName();
                                 scoreNames.add(existData);
                                 if (scoreNames.stream().distinct().count() != scoreNames.size()) {
                                     return CommonResult.fail("导入的Excel中的" + existData + "存在重复数据");
                                 }
                                 //重复数据提示
-                                long exist = scores.stream().filter(e -> e.getSemester().equals(semester) && e.getCardNo().equals(cardNo) && e.getSubjectId().equals(subject.get().getId())).count();
+                                long exist = scores.stream().filter(e -> e.getSemester().equals(semester.get().getName()) && e.getCardNo().equals(cardNo) && e.getSubjectId().equals(subject.get().getId())).count();
                                 if (exist > 0) {
                                     return CommonResult.fail(existData + "成绩数据在系统中已存在,请勿重复导入");
                                 }

BIN
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original