Selaa lähdekoodia

师傅端移动接口

jzkai 4 viikkoa sitten
vanhempi
commit
87d647f16c
33 muutettua tiedostoa jossa 159 lisäystä ja 95 poistoa
  1. 4 0
      .idea/shelf/_2025_10_16_8_11____.xml
  2. 24 0
      .idea/shelf/_2025_10_16_8_11____1.xml
  3. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/CustomerInfo.class
  4. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/MessageInfoDAO.class
  5. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/MessageInfoService.class
  6. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/MessageInfoServiceImpl.class
  7. 3 0
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/shelved.patch
  8. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/CustomerInfo.class
  9. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoDAO.class
  10. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoService.class
  11. BIN
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoServiceImpl.class
  12. 3 0
      .idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/shelved.patch
  13. 22 94
      .idea/workspace.xml
  14. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dao/AboutUsDAO.class
  15. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class
  16. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.class
  17. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.class
  18. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.class
  19. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.class
  20. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dto/TechnicianDTO.class
  21. BIN
      common/target/classes/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.class
  22. BIN
      common/target/classes/com/jpsoft/employment/modules/base/entity/AboutUs.class
  23. BIN
      common/target/classes/com/jpsoft/employment/modules/base/service/AboutUsService.class
  24. BIN
      common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class
  25. BIN
      common/target/classes/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.class
  26. BIN
      common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class
  27. 96 0
      common/target/classes/mapper/base/AboutUs.xml
  28. 7 1
      web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java
  29. BIN
      web/target/classes/com/jpsoft/employment/modules/base/controller/AboutUsController.class
  30. BIN
      web/target/classes/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.class
  31. BIN
      web/target/classes/com/jpsoft/employment/modules/mobile/controller/MessageApiController.class
  32. BIN
      web/target/classes/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.class
  33. BIN
      web/target/classes/com/jpsoft/employment/modules/mobile/controller/ResourceApiController.class

+ 4 - 0
.idea/shelf/_2025_10_16_8_11____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]" date="1760573475757" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2025/10/16 上午8:11 取消提交了更改 [更改]" />
+</changelist>

+ 24 - 0
.idea/shelf/_2025_10_16_8_11____1.xml

@@ -0,0 +1,24 @@
+<changelist name="在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1" date="1760573608919" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2025/10/16 上午8:11 取消提交了更改 [更改]" />
+  <binary>
+    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" />
+    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoDAO.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" />
+    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/CustomerInfo.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" />
+    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoServiceImpl.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" />
+    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoService.class" />
+  </binary>
+</changelist>

BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/CustomerInfo.class


BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/MessageInfoDAO.class


BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/MessageInfoService.class


BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/MessageInfoServiceImpl.class


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 0
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]/shelved.patch


BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/CustomerInfo.class


BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoDAO.class


BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoService.class


BIN
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoServiceImpl.class


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 0
.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/shelved.patch


+ 22 - 94
.idea/workspace.xml

@@ -8,52 +8,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="客户主页后台提交工单接口修改">
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/AboutUsDAO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/AboutUs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/AboutUsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/AboutUs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/AboutUsController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CommentInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CommentInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Feedback.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Feedback.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ArgonPartner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/ArgonPartner.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CommentInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/CommentInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/Feedback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/Feedback.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/LaborerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/LaborerInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TransportationInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TransportationInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path="$PROJECT_DIR$/common/target/" />
-    <ignored path="$PROJECT_DIR$/web/target/" />
-    <ignored path="D:\java\idea-workspace\water-tank-installation-server\.idea\shelf/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -272,6 +233,9 @@
       <select />
     </treeState>
   </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 3
+}]]></component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="width" value="1616" />
@@ -280,6 +244,7 @@
   <component name="ProjectId" id="337s95eD0AWjTqoZYAdQAY8e2Z9" />
   <component name="ProjectLevelVcsManager">
     <OptionsSetting value="false" id="Update" />
+    <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -391,15 +356,11 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../floorlock-server" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.0" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "应用程序.EmploymentApplication.executor": "Debug"
+  }
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.jpsoft.employment.modules.mobile.controller" />
@@ -412,19 +373,7 @@
       <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\resources\mapper\base" />
     </key>
   </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" selected="Application.EmploymentApplication">
+  <component name="RunManager" selected="应用程序.EmploymentApplication">
     <configuration name="EmploymentApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.jpsoft.employment.EmploymentApplication" />
       <module name="web" />
@@ -434,22 +383,24 @@
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="EmploymentApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="web" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.jpsoft.employment.EmploymentApplication" />
     </configuration>
     <list>
-      <item itemvalue="Spring Boot.EmploymentApplication" />
-      <item itemvalue="Application.EmploymentApplication" />
+      <item itemvalue="应用程序.EmploymentApplication" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.EmploymentApplication" />
+        <item itemvalue="应用程序.EmploymentApplication" />
       </list>
     </recent_temporary>
   </component>
-  <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="false" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -589,30 +540,12 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State>
-              <option name="RECENTLY_FILTERED_USER_GROUPS">
-                <collection />
-              </option>
-              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-                <collection />
-              </option>
-              <option name="COLUMN_ORDER">
-                <list>
-                  <option value="0" />
-                  <option value="1" />
-                  <option value="2" />
-                  <option value="3" />
-                </list>
-              </option>
-            </State>
+            <State />
           </value>
         </entry>
       </map>
     </option>
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="1.氩气合作方功能,搬运小工管理功能,运输方功能,&#10;2.客户中心手机端接口&#10;3.客户首页数据接口" />
     <MESSAGE value="客户端移动端接口&#10;1.客户主页&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
@@ -620,11 +553,6 @@
     <MESSAGE value="客户主页后台提交工单接口修改" />
     <option name="LAST_COMMIT_MESSAGE" value="客户主页后台提交工单接口修改" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="6" />
-    </breakpoint-manager>
-  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />

BIN
common/target/classes/com/jpsoft/employment/modules/base/dao/AboutUsDAO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/dto/TechnicianDTO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/entity/AboutUs.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/service/AboutUsService.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.class


BIN
common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class


+ 96 - 0
common/target/classes/mapper/base/AboutUs.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.base.dao.AboutUsDAO">
+	<resultMap id="AboutUsMap" type="com.jpsoft.employment.modules.base.entity.AboutUs">
+		<id property="id" column="id_" />
+			<result property="userAgreement" column="user_agreement" />
+			<result property="privacyPolicy" column="privacy_policy" />
+			<result property="disclaimer" column="disclaimer" />
+			<result property="createTime" column="create_time" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="updateBy" column="update_by" />
+			</resultMap>
+	<insert id="insert" parameterType="AboutUs">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_about_us
+	    (id_,user_agreement,privacy_policy,disclaimer,create_time,update_time,del_flag,create_by,update_by)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{userAgreement,jdbcType=VARCHAR}
+,#{privacyPolicy,jdbcType=VARCHAR}
+,#{disclaimer,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_about_us where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="AboutUs">
+		update base_about_us
+		<set>
+				<if test="userAgreement!=null">
+		user_agreement=#{userAgreement,jdbcType=VARCHAR},
+		</if>
+				<if test="privacyPolicy!=null">
+		privacy_policy=#{privacyPolicy,jdbcType=VARCHAR},
+		</if>
+				<if test="disclaimer!=null">
+		disclaimer=#{disclaimer,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="AboutUsMap">
+		select 
+id_,user_agreement,privacy_policy,disclaimer,create_time,update_time,del_flag,create_by,update_by		from base_about_us where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_about_us where id_=#{0}
+	</select>
+	<select id="list" resultMap="AboutUsMap">
+		select * from base_about_us where del_flag=false limit 1
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="AboutUsMap">
+		<![CDATA[
+			select * from base_about_us
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 7 - 1
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java

@@ -20,6 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -97,13 +98,18 @@ public class MessageApiController {
 
     @ApiOperation(value="获取详情")
     @GetMapping("edit/{id}")
-    public MessageResult<MessageInfo> edit(@PathVariable("id") String id){
+    @Transactional(rollbackFor = Exception.class)
+    public MessageResult<MessageInfo> edit(@PathVariable("id") String id) {
         MessageResult<MessageInfo> msgResult = new MessageResult<>();
 
         try {
             MessageInfo messageInfo = messageInfoService.get(id);
 
             if (messageInfo != null) {
+                messageInfo.setIsRead(true);
+                messageInfo.setUpdateTime(new Date());
+                messageInfoService.update(messageInfo);
+
                 msgResult.setResult(true);
                 msgResult.setData(messageInfo);
             } else {

BIN
web/target/classes/com/jpsoft/employment/modules/base/controller/AboutUsController.class


BIN
web/target/classes/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.class


BIN
web/target/classes/com/jpsoft/employment/modules/mobile/controller/MessageApiController.class


BIN
web/target/classes/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.class


BIN
web/target/classes/com/jpsoft/employment/modules/mobile/controller/ResourceApiController.class


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä