发布

.idea/workspace.xml

@@ -5,8 +5,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cb7b6a84-9179-4588-9374-31a70f785e65" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" afterDir="false" />
+      <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/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateUserVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateUserVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ScorePageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ScorePageVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ScoreVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ScoreVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" 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$/target/" />
@@ -37,88 +45,98 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1012">
-              <caret line="68" selection-start-line="68" selection-end-line="68" />
+            <state relative-caret-position="276">
+              <caret line="179" column="29" lean-forward="true" selection-start-line="179" selection-start-column="29" selection-end-line="179" selection-end-column="29" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="437">
-              <caret line="19" column="16" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="16" />
+            <state relative-caret-position="195">
+              <caret line="54" column="48" selection-start-line="54" selection-start-column="48" selection-end-line="54" selection-end-column="48" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="254">
+              <caret line="49" column="37" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2254">
-              <caret line="139" column="27" selection-start-line="139" selection-start-column="27" selection-end-line="139" selection-end-column="27" />
+            <state relative-caret-position="266">
+              <caret line="1714" column="16" lean-forward="true" selection-start-line="1714" selection-start-column="16" selection-end-line="1714" selection-end-column="16" />
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="method#importZipUsers#0;class#SmartUserController#0" />
+                <element signature="method#queryStudents#0;class#SmartUserController#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/Md5Utils.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="92">
-              <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+            <state relative-caret-position="608">
+              <caret line="115" column="39" selection-start-line="115" selection-start-column="26" selection-end-line="115" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ExcelUtil3.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="5" column="32" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
+            <state relative-caret-position="366">
+              <caret line="341" column="8" selection-start-line="341" selection-start-column="8" selection-end-line="342" selection-end-column="78" />
+              <folding>
+                <element signature="method#vertifyMessage#0;class#WechatScanLoginController#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/WarningEntity.java">
+        <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="161">
-              <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="268">
+              <caret line="67" column="18" selection-start-line="67" selection-start-column="18" selection-end-line="67" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartScoreMapper.xml">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="23">
-              <caret line="22" column="29" lean-forward="true" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
+            <state relative-caret-position="245">
+              <caret line="11" column="38" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateUserVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4209">
-              <caret line="183" column="28" selection-start-line="183" selection-start-column="28" selection-end-line="183" selection-end-column="28" />
+            <state relative-caret-position="493">
+              <caret line="33" column="11" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsReservationVo.java">
+        <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="437">
-              <caret line="19" column="23" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
+            <state relative-caret-position="176">
+              <caret line="163" column="60" selection-start-line="163" selection-start-column="60" selection-end-line="163" selection-end-column="60" />
             </state>
           </provider>
         </entry>
@@ -134,11 +152,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>existSmartClassData</find>
-      <find>PageUtils&lt;</find>
-      <find>queryPageSmartClass</find>
-      <find>updateSmartUserById</find>
-      <find>parentsAppointment</find>
       <find>.vo.VisitorPageVo</find>
       <find>otherAppointment</find>
       <find>.collect</find>
@@ -154,7 +167,6 @@
       <find>warningDepartmentTree</find>
       <find>QueryDepartmentTreeRecords</find>
       <find>&quot;/&quot;</find>
-      <find>QueryParentDepartments</find>
       <find>vertify</find>
       <find>smartVisitorPageByUserId</find>
       <find>like</find>
@@ -164,6 +176,12 @@
       <find>SYSTEM_ERROR</find>
       <find>deleteSmartVisitorById</find>
       <find>com.alibaba</find>
+      <find>querySmartScorePage</find>
+      <find>spv</find>
+      <find>querySmartSecordPage</find>
+      <find>queryAffiliateUserById</find>
+      <find>QueryParentDepartments</find>
+      <find>insertSmartApply</find>
     </findStrings>
     <replaceStrings>
       <replace>班级</replace>
@@ -187,11 +205,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartAuthorGroupMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthorGroup.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartAuthorGroupMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAuthorGroupServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartAuthorGroupService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartClassServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartClassService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartClassPageVo.java" />
@@ -200,7 +213,6 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/VisitorPageVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/GetVertifyCode.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
@@ -214,10 +226,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/WechatScanLoginControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateParentVo.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
@@ -230,14 +240,22 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertScoreRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateScoreRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsStaffNoVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsVisitorVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsReservationVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/Md5Utils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ScoreVo.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartScoreMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ScorePageVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateUserVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" />
       </list>
     </option>
   </component>
@@ -279,7 +297,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -453,6 +470,7 @@
         </subPane>
       </pane>
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -617,12 +635,12 @@
       <workItem from="1705388695984" duration="51258000" />
       <workItem from="1705885614332" duration="695000" />
       <workItem from="1705886328968" duration="31068000" />
-      <workItem from="1705992981607" duration="251000" />
+      <workItem from="1705992981607" duration="6416000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="446277000" />
+    <option name="totallyTimeSpent" value="452442000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
@@ -636,11 +654,11 @@
       <window_info id="Designer" order="5" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="8" visible="true" weight="0.27242887" />
+      <window_info content_ui="combo" id="Project" order="8" weight="0.2702407" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3071823" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.46498907" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.30415756" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4640884" />
       <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" />
@@ -654,7 +672,7 @@
       <window_info anchor="bottom" id="Version Control" order="14" />
       <window_info anchor="bottom" id="JRebel Executor" order="15" />
       <window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
-      <window_info anchor="right" id="Maven" order="0" weight="0.46268657" />
+      <window_info anchor="right" id="Maven" order="0" weight="0.94967175" />
       <window_info anchor="right" id="Palette" order="1" />
       <window_info anchor="right" id="Capture Analysis" order="2" />
       <window_info anchor="right" id="Database" order="3" weight="0.32942432" />
@@ -758,7 +776,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>492</line>
+          <line>494</line>
           <properties />
           <option name="timeStamp" value="76" />
         </line-breakpoint>
@@ -800,69 +818,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartWarningControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="56" column="47" selection-start-line="56" selection-start-column="26" selection-end-line="56" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1925">
-          <caret line="201" column="45" selection-start-line="201" selection-start-column="24" selection-end-line="201" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUploadServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="562">
-          <caret line="143" column="35" selection-start-line="143" selection-start-column="35" selection-end-line="143" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="46" column="20" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="8" column="26" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/AutoCode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="23" column="42" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/WechatScanLoginControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="677">
-          <caret line="89" column="80" selection-start-line="89" selection-start-column="80" selection-end-line="89" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateParentVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="598">
-          <caret line="37" column="83" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="723">
@@ -870,23 +825,6 @@
         </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="723">
-          <caret line="184" column="56" selection-start-line="184" selection-start-column="35" selection-end-line="184" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="386" column="60" selection-start-line="386" selection-start-column="60" selection-end-line="386" selection-end-column="60" />
-          <folding>
-            <element signature="method#vertifyMessage#0;class#WechatScanLoginController#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartVisitorControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="379">
@@ -908,13 +846,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="58" column="42" selection-start-line="58" selection-start-column="27" selection-end-line="58" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartVisitorMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="322">
@@ -950,23 +881,6 @@
         </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="358">
-          <caret line="121" column="7" lean-forward="true" selection-start-line="121" selection-start-column="7" selection-end-line="121" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="387">
-          <caret line="1436" column="57" lean-forward="true" selection-start-line="1429" selection-start-column="16" selection-end-line="1436" selection-end-column="57" />
-          <folding>
-            <element signature="method#importZipUsers#0;class#SmartUserController#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsStaffVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -1072,20 +986,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eApproveStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="68" selection-start-line="68" selection-end-line="68" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="437">
@@ -1093,16 +993,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2254">
-          <caret line="139" column="27" selection-start-line="139" selection-start-column="27" selection-end-line="139" selection-end-column="27" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/Md5Utils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="92">
@@ -1141,13 +1031,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="367">
-          <caret line="118" column="12" selection-start-line="118" selection-start-column="12" selection-end-line="118" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/target/classes/mapper/template/SmartScoreMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1158,10 +1041,145 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="62">
+          <caret line="68" selection-start-line="68" selection-end-line="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eApproveStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="12" column="10" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartScoreServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="271">
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/GradeVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="145" column="19" selection-start-line="145" selection-start-column="19" selection-end-line="145" selection-end-column="19" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#parentsAppointment#0;class#SmartVisitorController#0" />
+            <element signature="method#otherAppointment#0;class#SmartVisitorController#0" />
+            <element signature="method#appointmentPageRecord#0;class#SmartVisitorController#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartScoreManageMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ScoreVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="491">
+          <caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartScoreMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="22" column="29" lean-forward="true" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
+        <state relative-caret-position="38">
+          <caret line="5" column="47" selection-start-line="5" selection-start-column="47" selection-end-line="5" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ScorePageVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="353">
+          <caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+        </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="176">
+          <caret line="163" column="60" selection-start-line="163" selection-start-column="60" selection-end-line="163" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="245">
+          <caret line="11" column="38" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="38" />
+        </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="268">
+          <caret line="67" column="18" selection-start-line="67" selection-start-column="18" selection-end-line="67" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateUserVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="493">
+          <caret line="33" column="11" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="366">
+          <caret line="341" column="8" selection-start-line="341" selection-start-column="8" selection-end-line="342" selection-end-column="78" />
+          <folding>
+            <element signature="method#vertifyMessage#0;class#WechatScanLoginController#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="608">
+          <caret line="115" column="39" selection-start-line="115" selection-start-column="26" selection-end-line="115" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="1714" column="16" lean-forward="true" selection-start-line="1714" selection-start-column="16" selection-end-line="1714" selection-end-column="16" />
+          <folding>
+            <element signature="method#importZipUsers#0;class#SmartUserController#0" />
+            <element signature="method#queryStudents#0;class#SmartUserController#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="179" column="29" lean-forward="true" selection-start-line="179" selection-start-column="29" selection-end-line="179" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="54" column="48" selection-start-line="54" selection-start-column="48" selection-end-line="54" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="49" column="37" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" />
         </state>
       </provider>
     </entry>

src/main/java/com/template/api/SmartUserControllerAPI.java

@@ -109,4 +109,11 @@ public interface SmartUserControllerAPI {
     @GetMapping(value = "/queryStudents")
     @ApiOperation(value = "根据用户ID查询学生", notes = "根据用户ID查询学生", httpMethod = "GET")
     CommonResult queryStudents(@RequestParam int userId);
+
+    /**
+     * 根据数据ID获取用户信息
+     */
+    @GetMapping(value = "/queryInfoData")
+    @ApiOperation(value = "根据数据ID获取用户信息", notes = "根据数据ID获取用户信息", httpMethod = "GET")
+    CommonResult queryInfoData(@RequestParam int id);
 }

src/main/java/com/template/controller/SmartScoreController.java

@@ -159,7 +159,9 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                 data.setId(spv.getId());
                 data.setSemester(spv.getSemester());
                 data.setGrade(spv.getGrade());
+                data.setGradeId(spv.getGradeId());
                 data.setSchoolClass(spv.getSchoolClass());
+                data.setSchoolClassId(spv.getSchoolClassId());
                 data.setSubject(spv.getSubjectId());
                 data.setSubjectStr(eSubjectStatu.stringOf(spv.getSubjectId()));
                 data.setExamType(spv.getExamType());

src/main/java/com/template/controller/SmartUserController.java

@@ -1645,6 +1645,19 @@ public class SmartUserController implements SmartUserControllerAPI {
     @Override
     public CommonResult queryAffiliateUserById(int id) {
         List<AffiliateUserVo> result = smartUserService.queryAffiliateUserById(id);
+
+        if (result != null && result.size() > 0) {
+            List<SmartDepartment> departments = smartDepartmentService.list(null);
+            for (AffiliateUserVo data : result) {
+                //获取父级部门ID
+                Optional<SmartDepartment> department = departments.stream().filter(e -> e.getId().equals(data.getDepartmentId())).findFirst();
+                if (department != null && department.isPresent()) {
+                    String departmentName = QueryParentDepartments(department.get().getParentId(), departments, null);
+                    data.setDepartmentName(departmentName);
+                }
+            }
+        }
+
         return CommonResult.ok(result);
     }
 
@@ -1686,5 +1699,78 @@ public class SmartUserController implements SmartUserControllerAPI {
 
         return CommonResult.ok(result);
     }
+
+
+    @Override
+    public CommonResult queryInfoData(int id){
+
+        SmartUser su = smartUserService.getSmartById(id);
+        if(su == null){
+            return CommonResult.fail("用户信息失效，获取用户信息失败");
+        }
+
+        //部门数据集合
+        List<SmartDepartment> departments = smartDepartmentService.list(null);
+
+        WechatUserVo userData = new WechatUserVo();
+        userData.setId(su.getId());
+        userData.setCardNo(su.getCardNo());
+        userData.setTimeGroupId(su.getTimeGroupId());
+        userData.setName(su.getName());
+        userData.setIdentityId(su.getIdentityId());
+        userData.setIdCard(su.getIdCard());
+        userData.setSexId(su.getSexId());
+        userData.setDepartmentId(su.getDepartmentId());
+
+        Optional<SmartDepartment> department = departments.stream().filter(e -> e.getId().equals(su.getDepartmentId())).findFirst();
+        if (department != null && department.isPresent()) {
+            String departmentName = QueryParentDepartments(department.get().getParentId(), departments, null);
+            userData.setDepartmentName(departmentName == null ? "" : departmentName + "/" + department.get().getName());
+        }
+
+        userData.setHeadImage(su.getHeadImage());
+        userData.setGrade(su.getGrade());
+        userData.setCollege(su.getCollege());
+        userData.setSpeciality(su.getSpeciality());
+        userData.setSchoolClass(su.getSchoolClass());
+        userData.setCampus(su.getCampus());
+        userData.setDormitoryNumber(su.getDormitoryNumber());
+        userData.setPhone(su.getPhone());
+        userData.setAffiliate(su.getAffiliate());
+        //查找关联人
+        if (su.getIdentityId().intValue() == eIdentityStatu.Student.getValue()) {//学生
+            List<AffiliateParentVo> parents = smartUserService.queryAffiliateParents(su.getId());
+            if(parents != null && parents.size() > 0){
+                String affiliateStr = StringUtils.join(parents.stream().map(AffiliateParentVo::getName).collect(Collectors.toList()),",");
+                userData.setAffiliateName(affiliateStr);
+            }
+        } else if (su.getIdentityId().intValue() == eIdentityStatu.Parent.getValue()) {//家长
+            if(su.getAffiliate() != null){
+                List<String> affiliates = Arrays.asList(su.getAffiliate().split(","));
+                List<SmartUser> childs = smartUserService.getSmartUserIds(affiliates);
+                String affiliateStr = StringUtils.join(childs.stream().map(SmartUser::getName).collect(Collectors.toList()),",");
+                userData.setAffiliateName(affiliateStr);
+            }
+        }
+        //关联人名称用逗号隔开
+
+        userData.setTitle(su.getTitle());
+        userData.setAddress(su.getAddress());
+        userData.setNation(su.getNation());
+        userData.setOfStudent(su.getOfStudent());
+        userData.setGraduate(su.getGraduate());
+        userData.setDuties(su.getDuties());
+        userData.setIsPush(su.getIsPush());
+        userData.setIsCancel(su.getIsCancel());
+        userData.setOpenId(su.getOpenId());
+        userData.setXOpenId(su.getXOpenId());
+        userData.setGzhOpenId(su.getGzhOpenId());
+        userData.setXwStudentUid(su.getXwStudentUid());
+        userData.setBsStudentNo(su.getBsStudentNo());
+        userData.setXwTeacherCode(su.getXwTeacherCode());
+        userData.setBsStaffCode(su.getBsStaffCode());
+
+        return CommonResult.ok(userData);
+    }
 }
 

src/main/java/com/template/controller/SmartVisitorController.java

@@ -130,17 +130,21 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     public CommonResult deleteSmartVisitorById(int id) {
 
         SmartVisitor data = smartVisitorService.getSmartById(id);
-
         if (data == null) {
             return CommonResult.fail("当前数据不存在，删除失败！");
         }
 
+        //审核通过就不能删除
+        if(data.getStatu().intValue() == eApproveStatu.Pushed.getValue()){
+            return CommonResult.fail("无法删除已审核通过的访客数据");
+        }
+
+        //已审核通过的数据不能删除 那么就不需要进行下面这些操作
         //region 推送到希沃班牌，通知访客记录取消
         //endregion
         //region 删除百胜中的访客数据
         //endregion
 
-
         int result = smartVisitorService.deleteSmartVisitorById(id);
 
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");

src/main/java/com/template/model/pojo/SmartApply.java

@@ -48,7 +48,6 @@ public class SmartApply implements Serializable {
     private String category;
 
     @ApiModelProperty(value = "应用链接")
-    @NotBlank(message = "应用链接不能为空")
     private String urlLink;
 
     @ApiModelProperty(value = "简介")

src/main/java/com/template/model/vo/AffiliateUserVo.java

@@ -29,4 +29,14 @@ public class AffiliateUserVo {
      * 部门ID
      */
     private Integer departmentId;
+
+    /**
+     * 部门名称
+     */
+    private String departmentName;
+
+    /**
+     * 人脸照片
+     */
+    private String headImage;
 }

src/main/java/com/template/model/vo/ScorePageVo.java

@@ -26,11 +26,21 @@ public class ScorePageVo {
     private String grade;
 
     /**
+     * 年级ID
+     */
+    private String gradeId;
+
+    /**
      * 班级
      */
     private String schoolClass;
 
     /**
+     * 班级ID
+     */
+    private String schoolClassId;
+
+    /**
      * 学科
      */
     private Integer subjectId;

src/main/java/com/template/model/vo/ScoreVo.java

@@ -26,11 +26,21 @@ public class ScoreVo {
     private String grade;
 
     /**
+     * 年级ID
+     */
+    private String gradeId;
+
+    /**
      * 班级
      */
     private String schoolClass;
 
     /**
+     * 班级ID
+     */
+    private String schoolClassId;
+
+    /**
      * 学科ID
      */
     private Integer subject;

src/main/resources/mapper/template/SmartUserMapper.xml

@@ -6,10 +6,11 @@
         <result property="name" column="name"/>
         <result property="cardNo" column="card_no"/>
         <result property="departmentId" column="department_id"/>
+        <result property="headImage" column="head_image"/>
     </resultMap>
 
     <select id="queryAffiliateUserById" resultType="com.template.model.vo.AffiliateUserVo" resultMap="affiliateUserMap">
-        select id,name,card_no,department_id from smart_user
+        select id,name,card_no,department_id,head_image from smart_user
         where find_in_set(id,(select affiliate from smart_user where
         deleted = 0
         <if test="id != null and id != ''">

target/classes/mapper/template/SmartUserMapper.xml

@@ -6,10 +6,11 @@
         <result property="name" column="name"/>
         <result property="cardNo" column="card_no"/>
         <result property="departmentId" column="department_id"/>
+        <result property="headImage" column="head_image"/>
     </resultMap>
 
     <select id="queryAffiliateUserById" resultType="com.template.model.vo.AffiliateUserVo" resultMap="affiliateUserMap">
-        select id,name,card_no,department_id from smart_user
+        select id,name,card_no,department_id,head_image from smart_user
         where find_in_set(id,(select affiliate from smart_user where
         deleted = 0
         <if test="id != null and id != ''">