更新陈老师代码

.idea/workspace.xml

@@ -1,149 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
   <component name="ChangeListManager">
-<<<<<<< HEAD
-    <list default="true" id="be7aa737-81a4-4fa1-848a-b64feaec2f6c" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.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$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
-=======
-    <list default="true" id="36922be1-416a-4a25-9739-9814e01883a6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
->>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
+    <list default="true" id="b276f38f-0e4c-4de5-804a-b533dfcb04c5" name="Default Changelist" comment="">
+      <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/services/SmartDutiesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDutiesService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.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/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-<<<<<<< HEAD
-  <component name="DefaultGradleProjectSettings">
-    <option name="testRunner" value="GRADLE" />
-    <option name="delegatedBuild" value="true" />
-  </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <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="219">
-              <caret line="1990" column="37" selection-start-line="1990" selection-start-column="37" selection-end-line="1990" selection-end-column="37" />
-              <folding>
-                <element signature="e#2673#3357#0" />
-                <element signature="e#3363#4195#0" />
-                <element signature="e#4201#16437#0" />
-                <element signature="e#20496#33674#0" />
-                <element signature="e#33680#46719#0" />
-                <element signature="e#46725#47085#0" />
-                <element signature="e#86358#86375#0" />
-                <element signature="e#88787#88804#0" />
-                <element signature="e#90661#90676#0" />
-                <element signature="e#92649#92666#0" />
-                <element signature="e#82867#82882#0" />
-                <element signature="e#95111#95126#0" />
-                <element signature="e#96929#96945#0" />
-                <element signature="e#98969#98985#0" />
-                <element signature="e#101141#101162#0" />
-                <element signature="e#103895#103915#0" />
-                <element signature="e#106353#106370#0" />
-                <element signature="e#110851#110866#0" />
-                <element signature="e#114832#114846#0" />
-              </folding>
+            <state relative-caret-position="308">
+              <caret line="316" column="34" selection-start-line="316" selection-start-column="34" selection-end-line="316" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.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="310">
-              <caret line="25" column="31" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="31" />
+            <state relative-caret-position="295">
+              <caret line="382" column="58" selection-start-line="382" selection-start-column="42" selection-end-line="382" selection-end-column="58" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="976">
-              <caret line="84" column="21" selection-start-line="84" selection-start-column="8" selection-end-line="84" selection-end-column="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
+        <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="144">
-              <caret line="545" column="16" lean-forward="true" selection-start-line="545" selection-start-column="16" selection-end-line="545" selection-end-column="16" />
+            <state relative-caret-position="218">
+              <caret line="82" column="28" selection-start-line="82" selection-start-column="19" selection-end-line="82" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDutiesService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="327">
-              <caret line="194" column="40" selection-start-line="194" selection-start-column="25" selection-end-line="194" selection-end-column="40" />
+            <state relative-caret-position="667">
+              <caret line="33" column="58" selection-start-line="33" selection-start-column="58" selection-end-line="33" selection-end-column="58" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartVisitorControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="355">
-              <caret line="121" column="59" selection-start-line="121" selection-start-column="59" selection-end-line="121" selection-end-column="59" />
+            <state relative-caret-position="631">
+              <caret line="94" column="64" selection-start-line="94" selection-start-column="11" selection-end-line="94" selection-end-column="64" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.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="217">
-              <caret line="43" column="28" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="28" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="261">
-              <caret line="76" column="72" selection-start-line="76" selection-start-column="56" selection-end-line="76" selection-end-column="72" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartVisitorMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2484">
-              <caret line="108" column="13" selection-start-line="108" selection-start-column="13" selection-end-line="108" selection-end-column="13" />
+              <caret line="71" column="40" selection-start-line="71" selection-start-column="25" selection-end-line="71" selection-end-column="40" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-=======
->>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>visitingAgencys</find>
-      <find>queryVisitorPageDatas</find>
-      <find>appointmentPageRecord</find>
-      <find>smartVisitorPageByUserId</find>
-      <find>queryVisitorPage</find>
-      <find>examineRecord</find>
-      <find>SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));</find>
-      <find>qrCode</find>
-      <find>QrcodeImageVo</find>
-      <find>insertSmartUser</find>
+      <find>.join</find>
+      <find>smartUserExport</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -152,22 +85,17 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartVisitorMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartDutiesService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
       </list>
     </option>
   </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/soft/maven/apache-maven-3.8.6" />
-        <option name="useMavenConfig" value="true" />
-        <option name="userSettingsFile" value="D:\soft\maven\apache-maven-3.8.6\conf\settings.xml" />
+        <option name="mavenHome" value="D:/Software/Develop/Maven/apache-maven-3.3.9" />
+        <option name="userSettingsFile" value="D:\Software\Develop\Maven\apache-maven-3.3.9\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -190,17 +118,18 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-7" />
-    <option name="width" value="958" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
-  <component name="ProjectId" id="2bnFTIauC6hkDzZ6PKgW5F8o008" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -271,30 +200,13 @@
               <item name="services" type="462c0819:PsiDirectoryNode" />
               <item name="impl" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
-              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
-              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="template" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
-<<<<<<< HEAD
   <component name="PropertiesComponent">
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder1" value="1" />
@@ -302,35 +214,26 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../报修系统/repair_backend" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
-=======
-  <component name="ProjectViewState">
-    <option name="showExcludedFiles" value="false" />
-    <option name="showLibraryContents" value="true" />
->>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "MavenSettings"
-  }
-}]]></component>
   <component name="RebelAgentSelection">
     <selection>jr</selection>
   </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
   <component name="RunManager">
     <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="mybatis_plus" />
@@ -340,33 +243,25 @@
       </method>
     </configuration>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SshConsoleOptionsProvider">
-    <option name="myEncoding" value="UTF-8" />
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <created>1706770138891</created>
+      <changelist id="b276f38f-0e4c-4de5-804a-b533dfcb04c5" name="Default Changelist" comment="" />
+      <created>1706844127386</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1706770138891</updated>
-<<<<<<< HEAD
-      <workItem from="1706770142017" duration="13022000" />
-=======
-      <workItem from="1706770142017" duration="4313000" />
-      <workItem from="1706842947127" duration="21000" />
->>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
+      <updated>1706844127386</updated>
+      <workItem from="1706844128633" duration="8353000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13022000" />
+    <option name="totallyTimeSpent" value="8353000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
     <editor active="true" />
     <layout>
       <window_info id="JRebel" side_tool="true" />
@@ -376,7 +271,7 @@
       <window_info id="Favorites" side_tool="true" />
       <window_info id="Designer" />
       <window_info id="Web" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30734965" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.06876332" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Spring" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
@@ -390,12 +285,12 @@
       <window_info anchor="bottom" id="JRebel Console" 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" visible="true" weight="0.3314917" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.38674033" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32603937" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39889503" />
       <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" />
-      <window_info anchor="right" id="Maven" weight="0.93429846" />
+      <window_info anchor="right" id="Maven" weight="0.54788417" />
       <window_info anchor="right" id="Palette" />
       <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="right" id="Database" />
@@ -409,161 +304,62 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>963</line>
-          <properties />
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1973</line>
-          <properties />
-          <option name="timeStamp" value="5" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="76" column="72" selection-start-line="76" selection-start-column="56" selection-end-line="76" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartVisitorMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2484">
-          <caret line="108" column="13" selection-start-line="108" selection-start-column="13" selection-end-line="108" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.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="217">
-          <caret line="43" column="28" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="28" />
+          <caret line="71" column="40" selection-start-line="71" selection-start-column="25" selection-end-line="71" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BaseImageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDuties.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
+        <state relative-caret-position="295">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartVisitorControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDutiesService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="121" column="59" selection-start-line="121" selection-start-column="59" selection-end-line="121" selection-end-column="59" />
+        <state relative-caret-position="667">
+          <caret line="33" column="58" selection-start-line="33" selection-start-column="58" selection-end-line="33" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/qrCodeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="631">
+          <caret line="94" column="64" selection-start-line="94" selection-start-column="11" selection-end-line="94" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.1/spring-webmvc-5.3.1.jar!/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.class">
+    <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="460">
-          <caret line="51" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="218">
+          <caret line="82" column="28" selection-start-line="82" selection-start-column="19" selection-end-line="82" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.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="305">
-          <caret line="149" selection-start-line="149" selection-end-line="149" />
+        <state relative-caret-position="295">
+          <caret line="382" column="58" selection-start-line="382" selection-start-column="42" selection-end-line="382" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="25" column="31" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="31" />
+        <state relative-caret-position="332">
+          <caret line="213" selection-start-line="213" selection-end-line="213" />
         </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="219">
-          <caret line="1990" column="37" selection-start-line="1990" selection-start-column="37" selection-end-line="1990" selection-end-column="37" />
-          <folding>
-            <element signature="e#2673#3357#0" />
-            <element signature="e#3363#4195#0" />
-            <element signature="e#4201#16437#0" />
-            <element signature="e#20496#33674#0" />
-            <element signature="e#33680#46719#0" />
-            <element signature="e#46725#47085#0" />
-            <element signature="e#86358#86375#0" />
-            <element signature="e#88787#88804#0" />
-            <element signature="e#90661#90676#0" />
-            <element signature="e#92649#92666#0" />
-            <element signature="e#82867#82882#0" />
-            <element signature="e#95111#95126#0" />
-            <element signature="e#96929#96945#0" />
-            <element signature="e#98969#98985#0" />
-            <element signature="e#101141#101162#0" />
-            <element signature="e#103895#103915#0" />
-            <element signature="e#106353#106370#0" />
-            <element signature="e#110851#110866#0" />
-            <element signature="e#114832#114846#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="976">
-          <caret line="84" column="21" selection-start-line="84" selection-start-column="8" selection-end-line="84" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/turnOnTheDeviceRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
-          <caret line="32" column="19" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="194" column="40" selection-start-line="194" selection-start-column="25" selection-end-line="194" selection-end-column="40" />
-        </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="144">
-          <caret line="545" column="16" lean-forward="true" selection-start-line="545" selection-start-column="16" selection-end-line="545" selection-end-column="16" />
+        <state relative-caret-position="308">
+          <caret line="316" column="34" selection-start-line="316" selection-start-column="34" selection-end-line="316" selection-end-column="34" />
         </state>
       </provider>
     </entry>

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

@@ -81,6 +81,9 @@ public class SmartUserController implements SmartUserControllerAPI {
     private SmartUploadService smartUploadService;
 
     @Autowired
+    private SmartDutiesService smartDutiesService;
+
+    @Autowired
     private SmartDepartmentService smartDepartmentService;
 
     @Autowired
@@ -311,7 +314,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 ParentServiceBatchSaveOrUpdateParentsParam param = new ParentServiceBatchSaveOrUpdateParentsParam();
                 //响应体，MimeType为 application/json
                 ParentServiceBatchSaveOrUpdateParentsParam.RequestBody requestBody = ParentServiceBatchSaveOrUpdateParentsParam.RequestBody.builder()
-                        .build();
+                        .build(); 
                 param.setRequestBody(requestBody);
                 //query
                 ParentServiceBatchSaveOrUpdateParentsParam.Query query = ParentServiceBatchSaveOrUpdateParentsParam.Query.builder()
@@ -2257,6 +2260,23 @@ public class SmartUserController implements SmartUserControllerAPI {
 
         List<SmartUser> users = smartUserService.querySmartUsers(childDepartmentIds, name);
 
+        List<String> affiliates = new ArrayList<>();
+        List<String> affiliateStr = users.stream().map(SmartUser::getAffiliate).collect(Collectors.toList());
+        for (String datas : affiliateStr) {
+            String[] dataArray = datas.split(",");
+            for (int i = 0; i < dataArray.length; i++) {
+                affiliates.add(dataArray[i]);
+            }
+        }
+        List<SmartUser> affiliateDatas = smartUserService.getSmartUserIds(affiliates);
+
+        List<Integer> dutieIds = users != null && users.size() > 0 ? users.stream().map(SmartUser::getDuties).collect(Collectors.toList()) : null;
+        //职务数据
+        List<SmartDuties> duties = dutieIds != null && dutieIds.size() > 0 ? smartDutiesService.queryDutiesByIds(dutieIds) : null;
+        //年级
+        List<SmartGrade> grades = smartGradeService.list(null);
+        //班级
+        List<SmartClass> classes = smartClassService.list(null);
         //导出
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("用户信息管理");
@@ -2288,33 +2308,68 @@ public class SmartUserController implements SmartUserControllerAPI {
             SmartUser user = users.get(i);
 
             Row dataRow = sheet.createRow(i + 1);
-            dataRow.createCell(0).setCellValue(i + 1);
-            dataRow.createCell(1).setCellValue(user.getCardNo());
-            dataRow.createCell(2).setCellValue(user.getName());
-            dataRow.createCell(3).setCellValue(eIdentityStatu.stringOf(user.getIdentityId()));
-            dataRow.createCell(4).setCellValue(user.getIdCard());
-            dataRow.createCell(5).setCellValue(eSexStatu.stringOf(user.getSexId()));
+            dataRow.createCell(0).setCellValue(i + 1);//序号
+            dataRow.createCell(1).setCellValue(user.getCardNo());//学号
+            dataRow.createCell(2).setCellValue(user.getName());//姓名
+            dataRow.createCell(3).setCellValue(eIdentityStatu.stringOf(user.getIdentityId()));//身份
+            dataRow.createCell(4).setCellValue(user.getIdCard());//身份证号
+            dataRow.createCell(5).setCellValue(eSexStatu.stringOf(user.getSexId()));//性别
             //获取父级部门ID
             Optional<SmartDepartment> department = departments.stream().filter(e -> e.getId().equals(user.getDepartmentId())).findFirst();
             if (department != null && department.isPresent()) {
-                dataRow.createCell(6).setCellValue(QueryParentDepartments(department.get().getParentId(), departments, null));
+                dataRow.createCell(6).setCellValue(QueryParentDepartments(department.get().getParentId(), departments, null));//部门
+            }
+
+            dataRow.createCell(7).setCellValue(user.getHeadImage() == null ? "" : user.getHeadImage());//人脸
+
+            String grade = "";
+            Optional<SmartGrade> gradeData = grades == null ? null : grades.stream().filter(e -> e.getId().toString().equals(user.getGrade())).findFirst();
+            if (gradeData != null && gradeData.isPresent()) {
+                grade = gradeData.get().getName();
+            }
+            dataRow.createCell(8).setCellValue(grade);//年级
+            dataRow.createCell(9).setCellValue(user.getCollege() == null ? "" : user.getCollege());//学院
+            dataRow.createCell(10).setCellValue(user.getSpeciality() == null ? "" : user.getSpeciality());//专业
+
+            String classStr = "";
+            Optional<SmartClass> classData = classes == null ? null : classes.stream().filter(e -> e.getId().equals(user.getSchoolClass())).findFirst();
+            if (classData != null && classData.isPresent()) {
+                classStr = classData.get().getName();
+            }
+            dataRow.createCell(11).setCellValue(classStr);//班级
+
+            dataRow.createCell(12).setCellValue(user.getCampus() == null ? "" : user.getCampus());//校区
+            dataRow.createCell(13).setCellValue(user.getDormitoryNumber() == null ? "" : user.getDormitoryNumber());//宿舍号
+            dataRow.createCell(14).setCellValue(user.getPhone() == null ? "" : user.getPhone());//手机号
+
+            List<String> affiliateCellStrs = new ArrayList<>();
+            if (user.getAffiliate() != null && affiliateDatas != null) {
+                String[] affArrayStr = user.getAffiliate().split(",");
+                for (int j = 0; j < affArrayStr.length; j++) {
+                    String affArrayIndex = affArrayStr[j];
+                    Optional<SmartUser> affUser = affiliateDatas.stream().filter(e -> e.getId().toString().equals(affArrayIndex)).findFirst();
+                    if(affUser != null && affUser.isPresent()){
+                        affiliateCellStrs.add(affUser.get().getName());
+                    }
+
+                }
             }
 
-            dataRow.createCell(7).setCellValue(user.getHeadImage() == null ? "" : user.getHeadImage());
-            dataRow.createCell(8).setCellValue(user.getGrade() == null ? "" : user.getGrade());
-            dataRow.createCell(9).setCellValue(user.getCollege() == null ? "" : user.getCollege());
-            dataRow.createCell(10).setCellValue(user.getSpeciality() == null ? "" : user.getSpeciality());
-            dataRow.createCell(11).setCellValue(user.getSchoolClass() == null ? 0 : user.getSchoolClass());
-            dataRow.createCell(12).setCellValue(user.getCampus() == null ? "" : user.getCampus());
-            dataRow.createCell(13).setCellValue(user.getDormitoryNumber() == null ? "" : user.getDormitoryNumber());
-            dataRow.createCell(14).setCellValue(user.getPhone() == null ? "" : user.getPhone());
-            dataRow.createCell(15).setCellValue(user.getAffiliate() == null ? "" : user.getAffiliate());
-            dataRow.createCell(16).setCellValue(user.getTitle() == null ? "" : user.getTitle());
-            dataRow.createCell(17).setCellValue(user.getAddress() == null ? "" : user.getAddress());
-            dataRow.createCell(18).setCellValue(user.getNation() == null ? "" : user.getNation());
-            dataRow.createCell(19).setCellValue(user.getOfStudent() == null ? "" : user.getOfStudent());
-            dataRow.createCell(20).setCellValue(user.getGraduate() == null ? "" : user.getGraduate());
-            dataRow.createCell(21).setCellValue(user.getDuties() == null ? 0 : user.getDuties());
+            dataRow.createCell(15).setCellValue(StringUtils.join(affiliateCellStrs, ","));//关联人
+
+            dataRow.createCell(16).setCellValue(user.getTitle() == null ? "" : user.getTitle());//职称
+            dataRow.createCell(17).setCellValue(user.getAddress() == null ? "" : user.getAddress());//家庭住址
+            dataRow.createCell(18).setCellValue(user.getNation() == null ? "" : user.getNation());//民族
+            dataRow.createCell(19).setCellValue(user.getOfStudent() == null ? "" : user.getOfStudent());//生源地
+            dataRow.createCell(20).setCellValue(user.getGraduate() == null ? "" : user.getGraduate());//毕业学校
+            String dutieStr = "";
+            if (duties != null && duties.size() > 0 && user.getDuties() != null) {
+                Optional<SmartDuties> oduty = duties.stream().filter(e -> e.getId().equals(user.getDuties())).findFirst();
+                if (oduty != null && oduty.isPresent()) {
+                    dutieStr = oduty.get().getName();
+                }
+            }
+            dataRow.createCell(21).setCellValue(dutieStr);//职务
         }
 
         // 将工作簿写入文件

src/main/java/com/template/services/SmartDutiesService.java

@@ -30,4 +30,6 @@ public interface SmartDutiesService extends IService<SmartDuties> {
     SmartDuties querySmartDutiesByName(String name, Integer categoryId);
 
     List<SmartDuties> getSmartDutiesByCategoryId(Integer categoryId);
+
+    List<SmartDuties> queryDutiesByIds(List<Integer> ids);
 }

src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java

@@ -90,4 +90,13 @@ public class SmartDutiesServiceImpl extends ServiceImpl<SmartDutiesMapper, Smart
 
         return result;
     }
+
+    @Override
+    public List<SmartDuties> queryDutiesByIds(List<Integer> ids) {
+        QueryWrapper<SmartDuties> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in(ids != null && ids.size() > 0, "id", ids);
+
+        List<SmartDuties> duties = smartDutiesMapper.selectList(queryWrapper);
+        return duties;
+    }
 }