授权

.idea/workspace.xml

@@ -2,21 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/DateUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairEvaluateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairEvaluateMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -49,49 +41,40 @@
   <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/repair/controller/RepairArticleTypeController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="92" column="73" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="73" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="1712">
+              <caret line="245" column="16" selection-start-line="245" selection-start-column="16" selection-end-line="245" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="59" column="64" selection-start-line="59" selection-start-column="64" selection-end-line="59" selection-end-column="64" />
+            <state relative-caret-position="161">
+              <caret line="46" column="9" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="318">
-              <caret line="49" column="37" selection-start-line="47" selection-start-column="8" selection-end-line="49" selection-end-column="37" />
+            <state relative-caret-position="295">
+              <caret line="71" column="68" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="68" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="268">
-              <caret line="277" column="81" selection-start-line="277" selection-start-column="70" selection-end-line="277" selection-end-column="81" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="632">
-              <caret line="48" selection-start-line="48" selection-end-line="49" />
+            <state relative-caret-position="200">
+              <caret line="72" column="43" selection-start-line="72" selection-start-column="25" selection-end-line="72" selection-end-column="43" />
             </state>
           </provider>
         </entry>
@@ -108,13 +91,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>detail</find>
-      <find>queryConsumeMaterial</find>
-      <find>head</find>
-      <find>String userhead</find>
-      <find>AesUtils.decrypt(userhead)</find>
-      <find>repairSummarizing</find>
-      <find>queryTeamWorkCount</find>
       <find>queryLogisticHomeCount</find>
       <find>queryTeamWorkTimeout</find>
       <find>queryTeamWorkPage</find>
@@ -138,6 +114,13 @@
       <find>.or</find>
       <find>deleteRepairArticleTypeById</find>
       <find>insertRepairArticleType</find>
+      <find>card_number</find>
+      <find>isEm</find>
+      <find>@Tr</find>
+      <find>getRepairArticleTypeByName</find>
+      <find>queryEvaluatePageList</find>
+      <find>queryPageList</find>
+      <find>微校授权异常信息</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -178,8 +161,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/WxAccessToken.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/freezeRepairAdminRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairAssociationRequest.java" />
@@ -223,12 +204,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" />
       </list>
     </option>
   </component>
@@ -673,12 +656,12 @@
       <workItem from="1692328425694" duration="3410000" />
       <workItem from="1692338996790" duration="52964000" />
       <workItem from="1692691144895" duration="14181000" />
-      <workItem from="1692753806714" duration="4144000" />
+      <workItem from="1692753806714" duration="7358000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="852359000" />
+    <option name="totallyTimeSpent" value="855573000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -690,7 +673,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -702,10 +685,10 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.19037199" />
+      <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.21428572" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.678453" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.71823204" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.9569061" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -722,7 +705,7 @@
       <window_info anchor="bottom" id="Event Log" order="16" weight="0.32822758" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.85448575" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.75273526" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.32889125" />
@@ -868,12 +851,6 @@
           <option name="timeStamp" value="271" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java</url>
-          <line>54</line>
-          <properties />
-          <option name="timeStamp" value="288" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/scheduled/SystemScheduled.java</url>
           <line>73</line>
           <properties />
@@ -897,18 +874,6 @@
           <properties />
           <option name="timeStamp" value="311" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java</url>
-          <line>53</line>
-          <properties />
-          <option name="timeStamp" value="312" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java</url>
-          <line>48</line>
-          <properties />
-          <option name="timeStamp" value="313" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -917,71 +882,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.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/repair/model/vo/TrackDetailsVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="47" selection-start-line="2" selection-start-column="47" selection-end-line="2" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TransferDetailVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UploadFileVo.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/repair/model/vo/UserDataVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserScheduleVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxCodeVo.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/repair/model/vo/wxLoginVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxOpenVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -1222,16 +1122,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="826" column="60" selection-start-line="826" selection-start-column="45" selection-end-line="826" selection-end-column="60" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="338">
@@ -1253,41 +1143,107 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="59" column="64" selection-start-line="59" selection-start-column="64" selection-end-line="59" selection-end-column="64" />
+        <state relative-caret-position="295">
+          <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="632">
+          <caret line="48" selection-start-line="48" selection-end-line="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eSchool.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="92" column="73" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="73" />
+        <state relative-caret-position="269">
+          <caret line="1830" column="31" selection-start-line="1830" selection-start-column="12" selection-end-line="1830" selection-end-column="31" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairEvaluate.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
+        <state relative-caret-position="88">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="632">
-          <caret line="48" selection-start-line="48" selection-end-line="49" />
+        <state relative-caret-position="552">
+          <caret line="35" column="24" selection-start-line="35" selection-start-column="16" selection-end-line="35" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="85" column="24" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="52">
+          <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="943">
+          <caret line="55" column="77" selection-start-line="55" selection-start-column="56" selection-end-line="55" selection-end-column="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="640">
+          <caret line="130" column="78" selection-start-line="130" selection-start-column="65" selection-end-line="130" selection-end-column="78" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="268">
-          <caret line="277" column="81" selection-start-line="277" selection-start-column="70" selection-end-line="277" selection-end-column="81" />
+        <state relative-caret-position="1712">
+          <caret line="245" column="16" selection-start-line="245" selection-start-column="16" selection-end-line="245" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="46" column="9" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="71" column="68" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="72" column="43" selection-start-line="72" selection-start-column="25" selection-end-line="72" selection-end-column="43" />
         </state>
       </provider>
     </entry>

src/main/java/com/repair/api/LoginControllerAPI.java

@@ -33,7 +33,7 @@ public interface LoginControllerAPI {
 
     @GetMapping(value = "/Openid")
     @ApiOperation(value = "微校授权", notes = "微校授权", httpMethod = "POST")
-    CommonResult Openid(@RequestParam String wxcode);
+    CommonResult Openid(@RequestParam String wxcode) throws Exception;
 
     @GetMapping(value = "/XOpenid")
     @ApiOperation(value = "微信授权", notes = "微信授权", httpMethod = "POST")

src/main/java/com/repair/controller/LoginController.java

@@ -1,6 +1,7 @@
 package com.repair.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.repair.annotation.PassToken;
@@ -23,6 +24,7 @@ import com.repair.model.vo.*;
 import com.repair.services.RepairAdminService;
 import com.repair.services.RepairUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -191,7 +193,8 @@ public class LoginController implements LoginControllerAPI {
 
     @Override
     @PassToken
-    public CommonResult Openid(String wxcode){
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult Openid(String wxcode) throws Exception {
         System.out.println("微校授权："+wxcode);
         Gson gson = new Gson();
         String tokenUrl = "https://open.wecard.qq.com/connect/oauth2/token";
@@ -239,9 +242,13 @@ public class LoginController implements LoginControllerAPI {
         }
         //根据卡号查询repair_user表中的用户信息
         RepairUser user = repairUserService.getRepairByCardNumber(card_number);
-        if (identity_type != 4 && user == null) {
-            return CommonResult.fail("非法权限，授权失败");
-        }
+        //谁都能进
+//        if (identity_type != 4 && user == null) {
+//            return CommonResult.fail("非法权限，授权失败");
+//        }
+
+        System.out.println("微校授权校区："+campus);
+        System.out.println("微校授权校区ID："+eSchool.integerOf(campus));
 
         if (user == null) {
             try{
@@ -251,32 +258,44 @@ public class LoginController implements LoginControllerAPI {
                 user.setUserPhone(phone);
                 user.setUserZzid(eUserZZ.User.getValue());
                 user.setIdentityType(identity_type);
-                user.setSchoolId(eSchool.integerOf(campus));//校区ID
+                user.setSchoolId(ObjectUtils.isEmpty(campus) ? 1 : eSchool.integerOf(campus));//校区ID
                 user.setIsChange(0);
                 int num = repairUserService.insertRepairUser(user);
                 if (num <= 0) {
-                    return CommonResult.fail("无法记录用户信息，授权失败");
+                    System.out.println("微校授权失败，用户信息新增异常："+user_name+""+card_number);
+                    throw new Exception("微校授权失败！");
                 }
-                RepairAdmin admin = new RepairAdmin();
+
+            }catch (Exception e){
+                System.out.println("微校授权异常信息："+e.getMessage());
+                throw new Exception("微校授权失败！");
+            }
+        }
+
+        RepairAdmin admin = repairAdminService.getRepairByAccount(card_number);
+        if(admin == null){
+            try{
+                admin = new RepairAdmin();
                 admin.setAccount(card_number);
                 admin.setPassword("974264710");
                 admin.setUsername(user_name);
                 admin.setPhone(phone);
                 admin.setIsSuper(0);
                 admin.setStatu(1);
+                admin.setSchoolId(ObjectUtils.isEmpty(campus) ? 1 : eSchool.integerOf(campus));
                 admin.setCardNumber(card_number);
                 admin.setIsMobile(1);
                 int adminNum = repairAdminService.insertRepairAdmin(admin);
                 if (adminNum <= 0) {
+                    System.out.println("微校授权失败，管理端信息新增异常："+user_name);
                     return CommonResult.fail("无法记录账号信息，授权失败");
                 }
             }catch (Exception e){
                 System.out.println("微校授权异常信息："+e.getMessage());
+                throw new Exception("微校授权失败！");
             }
         }
 
-        RepairAdmin adminData = repairAdminService.getRepairByAccount(card_number);
-
         wxLoginVo wlv = new wxLoginVo();
         routeDataVo data = getRoutes(user.getUserZzid());
         wlv.setUserId(user.getId());
@@ -288,10 +307,10 @@ public class LoginController implements LoginControllerAPI {
         wlv.setSchoolId(user.getSchoolId());
         wlv.setSchoolName(eSchool.stringOf(user.getSchoolId()));
         long expired = 1000 * 60 * 60 * 24 * 365 * 10;
-        String token = JWTUtil.getToken(adminData, expired);
+        String token = JWTUtil.getToken(admin, expired);
         wlv.setToken(token);
-        wlv.setUserhead(AesUtils.encrypt(adminData.getId()));
-
+        wlv.setUserhead(AesUtils.encrypt(admin.getId()));
+        System.out.println("微校授权成功："+user_name+""+card_number);
         return CommonResult.ok(wlv);
     }
 

src/main/java/com/repair/model/vo/EvaluateVo.java

@@ -29,6 +29,13 @@ public class EvaluateVo {
     private String recordNo;
 
     /**
+     * 报修单ID
+     */
+    @ExcelProperty("报修单ID")
+    @ExcelIgnore
+    private int recordId;
+
+    /**
      * 姓名
      */
     @ExcelProperty("姓名")

src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java

@@ -82,8 +82,8 @@ public class RepairArticleTypeServiceImpl extends ServiceImpl<RepairArticleTypeM
     @Override
     public RepairArticleType getRepairArticleTypeByName(String name, Integer schoolId) {
         QueryWrapper<RepairArticleType> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.hasText(name), "name", name);
-        queryWrapper.like(schoolId != null, "school_id", schoolId);
+        queryWrapper.eq(StringUtils.hasText(name), "name", name);
+        queryWrapper.eq(schoolId != null, "school_id", schoolId);
         RepairArticleType datas = repairArticleTypeMapper.selectOne(queryWrapper);
         return datas;
     }

src/main/resources/mapper/repair/RepairEvaluateMapper.xml

@@ -4,6 +4,7 @@
 
     <resultMap type="com.repair.model.vo.EvaluateVo" id="repairEvaluatePageMap">
         <result property="id" column="id"/>
+        <result property="recordId" column="record_id"/>
         <result property="recordNo" column="record_no"/>
         <result property="userName" column="user_name"/>
         <result property="userPhone" column="user_phone"/>
@@ -17,7 +18,7 @@
 
     <select id="queryEvaluatePageList" resultType="com.repair.model.vo.EvaluateVo" resultMap="repairEvaluatePageMap">
         select
-        re.id,rr.record_no,rr.user_name,rr.user_phone,rr.description,rr.report_time,rr.maintenancer_name,re.star,re.content,re.create_time
+        re.id,re.record_id,rr.record_no,rr.user_name,rr.user_phone,rr.description,rr.report_time,rr.maintenancer_name,re.star,re.content,re.create_time
         from repair_evaluate re
         left join repair_record rr on rr.id = re.record_id and rr.deleted = 0
         <where>

target/classes/mapper/repair/RepairEvaluateMapper.xml

@@ -4,6 +4,7 @@
 
     <resultMap type="com.repair.model.vo.EvaluateVo" id="repairEvaluatePageMap">
         <result property="id" column="id"/>
+        <result property="recordId" column="record_id"/>
         <result property="recordNo" column="record_no"/>
         <result property="userName" column="user_name"/>
         <result property="userPhone" column="user_phone"/>
@@ -17,7 +18,7 @@
 
     <select id="queryEvaluatePageList" resultType="com.repair.model.vo.EvaluateVo" resultMap="repairEvaluatePageMap">
         select
-        re.id,rr.record_no,rr.user_name,rr.user_phone,rr.description,rr.report_time,rr.maintenancer_name,re.star,re.content,re.create_time
+        re.id,re.record_id,rr.record_no,rr.user_name,rr.user_phone,rr.description,rr.report_time,rr.maintenancer_name,re.star,re.content,re.create_time
         from repair_evaluate re
         left join repair_record rr on rr.id = re.record_id and rr.deleted = 0
         <where>