修改操作

.idea/workspace.xml

@@ -2,9 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33a373ef-8a77-410d-8903-f96d9ffe27f3" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.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/resources/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairArticleTypeRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairArticleTypeRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" 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$/classes/" />
@@ -20,11 +23,65 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <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="1211">
-              <caret line="420" column="49" selection-start-line="420" selection-start-column="49" selection-end-line="420" selection-end-column="49" />
+            <state relative-caret-position="110">
+              <caret line="392" column="13" selection-start-line="392" selection-start-column="13" selection-end-line="392" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="136">
+              <caret line="77" column="121" selection-start-line="77" selection-start-column="121" selection-end-line="77" selection-end-column="121" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="821">
+              <caret line="70" column="50" selection-start-line="70" selection-start-column="50" selection-end-line="70" selection-end-column="50" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAreaService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="621">
+              <caret line="32" column="30" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairArticleType.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="203">
+              <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="36" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairArticleTypeRequest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="552">
+              <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
+            </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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="269">
+              <caret line="82" column="55" selection-start-line="82" selection-start-column="29" selection-end-line="82" selection-end-column="55" />
             </state>
           </provider>
         </entry>
@@ -41,7 +98,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
+            <state relative-caret-position="16882">
               <caret line="734" column="119" selection-start-line="734" selection-start-column="119" selection-end-line="734" selection-end-column="119" />
             </state>
           </provider>
@@ -51,12 +108,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>&lt;if test=&quot;maintenanceName != null and maintenanceName != ''&quot;&gt;</find>
-      <find>getRepairsShiftIdByHour</find>
-      <find>queryManageCount</find>
-      <find>isDuty</find>
-      <find>canceled_count</find>
-      <find>nowDate</find>
       <find>//2023-10-08 看是否是值班时间接单</find>
       <find>queryChangePriceConsumables</find>
       <find>repairChangeConsumes</find>
@@ -81,6 +132,12 @@
       <find>queryTimeoutReportExport</find>
       <find>reportExport</find>
       <find>提交订单</find>
+      <find>该物品已存在</find>
+      <find>getRepairArticleTypeByName</find>
+      <find>.getRepairByName</find>
+      <find>updateRepairAreaById</find>
+      <find>queryAreaByName</find>
+      <find>updateRepairArticleTypeById</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -95,9 +152,13 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairArticleTypeRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairAreaService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" />
       </list>
     </option>
   </component>
@@ -129,8 +190,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="953" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -139,6 +200,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -219,7 +281,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -230,7 +291,7 @@
     <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" />
@@ -274,17 +335,18 @@
       <workItem from="1696640887168" duration="44041000" />
       <workItem from="1696911564581" duration="2242000" />
       <workItem from="1696926308382" duration="6706000" />
+      <workItem from="1697072931916" duration="4099000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55063000" />
+    <option name="totallyTimeSpent" value="59162000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="953" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="1" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.2260128" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20350109" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -295,8 +357,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.33041576" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.65745854" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.33038673" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.66187847" />
       <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" />
@@ -313,7 +375,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.9671773" />
+      <window_info active="true" anchor="right" id="Maven" order="3" visible="true" weight="0.76258206" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -353,6 +415,12 @@
           <properties />
           <option name="timeStamp" value="13" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java</url>
+          <line>64</line>
+          <properties />
+          <option name="timeStamp" value="14" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -374,13 +442,6 @@
     <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
       <provider selected="true" editor-type-id="text-editor" />
     </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">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="204" selection-start-line="204" selection-end-line="204" />
-        </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="418">
@@ -586,11 +647,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
+        <state relative-caret-position="16882">
           <caret line="734" column="119" selection-start-line="734" selection-start-column="119" selection-end-line="734" selection-end-column="119" />
         </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="269">
+          <caret line="82" column="55" selection-start-line="82" selection-start-column="29" selection-end-line="82" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairArticleType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="203">
+          <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="36" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairArticleTypeRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="552">
+          <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
@@ -598,10 +680,38 @@
         </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">
+      <provider selected="true" editor-type-id="text-editor">
+        <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/repair/services/RepairAreaService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="621">
+          <caret line="32" column="30" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="30" />
+        </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="1211">
-          <caret line="420" column="49" selection-start-line="420" selection-start-column="49" selection-end-line="420" selection-end-column="49" />
+        <state relative-caret-position="110">
+          <caret line="392" column="13" selection-start-line="392" selection-start-column="13" selection-end-line="392" selection-end-column="13" />
+        </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="136">
+          <caret line="77" column="121" selection-start-line="77" selection-start-column="121" selection-end-line="77" selection-end-column="121" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="821">
+          <caret line="70" column="50" selection-start-line="70" selection-start-column="50" selection-end-line="70" selection-end-column="50" />
         </state>
       </provider>
     </entry>

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

@@ -67,8 +67,8 @@ public class RepairAreaController implements RepairAreaControllerAPI {
             return CommonResult.fail(st);
         }
         RepairArea data = repairAreaService.getRepairById(urar.getId());
-        RepairArea otherData = repairAreaService.getRepairByName(urar.getName());
-        if (data != null && otherData != null && data.getParentId().equals(otherData.getParentId())) {
+        RepairArea otherData = repairAreaService.queryAreaByName(urar.getName(), data.getParentId());
+        if (data != null && otherData != null && !data.getId().equals(otherData.getId())) {
             return CommonResult.fail("该区域楼层已存在！");
         }
 

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

@@ -75,7 +75,7 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
             return CommonResult.fail(st);
         }
 
-        RepairArticleType data = repairArticleTypeService.getRepairArticleTypeByName(uratr.getName(), null);
+        RepairArticleType data = repairArticleTypeService.getRepairArticleTypeByName(uratr.getName(), uratr.getSchoolId());
         if (data != null && !data.getId().equals(uratr.getId())) {
             return CommonResult.fail("该物品已存在！");
         }

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

@@ -3035,9 +3035,17 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.ok(page);
         }
 
+        ArrayList<Integer> usersList = new ArrayList<>();
+        for (RepairReceiving record : records) {
+            Integer userId = record.getUserId();
+            usersList.add(userId);
+        }
+
         LambdaQueryWrapper<RepairReceiving> wrapperReceiving2 = new LambdaQueryWrapper<>();
         wrapperReceiving2.between(ObjectUtils.isNotEmpty(startTime), RepairReceiving::getReceivingTime, startTime, endTime);
-        wrapperReceiving2.isNotNull(RepairReceiving::getFinishTime);
+        wrapperReceiving2.isNotNull(RepairReceiving::getFinishTime)
+                .in(RepairReceiving::getUserId,usersList)
+        ;
         List<RepairReceiving> repairReceivingList = repairReceivingService.list(wrapperReceiving2);
         if (ObjectUtils.isEmpty(repairReceivingList) && repairReceivingList.size() <= 0) {
             return CommonResult.ok(page);

src/main/java/com/repair/model/request/updateRepairArticleTypeRequest.java

@@ -1,5 +1,6 @@
 package com.repair.model.request;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -23,4 +24,10 @@ public class updateRepairArticleTypeRequest {
      */
     @NotBlank(message = "报修物品名称不能为空")
     private String name;
+
+    /**
+     * 校区ID
+     */
+    @NotNull(message = "校区ID不能为空")
+    private Integer schoolId;
 }

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: prod
+      active: dev
   servlet:
     multipart:
       max-file-size: 30MB     #单个文件最大限制

target/classes/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: prod
+      active: dev
   servlet:
     multipart:
       max-file-size: 30MB     #单个文件最大限制