客户端移动端接口

1.客户主页
2.客户发布工单详情
3.客户合作方列表

.idea/workspace.xml

@@ -4,73 +4,43 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </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/dto/CustomerDetailDTO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.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" />
+    <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口">
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" 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/ArgonPartnerDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/ArgonPartnerDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.java" 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/dao/CustomerInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CustomerInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CustomerInfo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageInfo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ArgonPartnerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ArgonPartnerService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/LaborerInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/LaborerInfoService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/MessageInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/MessageInfoService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TransportationInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TransportationInfoService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.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/ArgonPartnerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ArgonPartnerServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.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/CustomerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.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/MessageInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/MessageInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.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/target/classes/com/jpsoft/employment/modules/base/dao/ArgonPartnerDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/ArgonPartnerDAO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.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/dao/TransportationInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.class" 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/ArgonPartner.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ArgonPartner.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/LaborerInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/LaborerInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/MessageInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/MessageInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/TransportationInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/TransportationInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/ArgonPartnerService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/ArgonPartnerService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/LaborerInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/LaborerInfoService.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/TransportationInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TransportationInfoService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/CustomerInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/CustomerInfoService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TechnicianInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TechnicianInfoService.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/ArgonPartnerServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/ArgonPartnerServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.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$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.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/com/jpsoft/employment/modules/common/utils/Generator/AbstractCaptchaA.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Generator/AbstractCaptchaA.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/HttpConnectionUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/HttpConnectionUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/OSSUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/OSSUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/POIUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/POIUtils.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/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/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/MessageInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/MessageInfo.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$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/lotteryActivity/utils/POIUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/lotteryActivity/utils/POIUtils.class" 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$/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" />
     </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" />
@@ -78,66 +48,138 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="CustomerInfoApiController.java" pinned="false" current-in-tab="true">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="CustomerInfoApiController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="314">
-              <caret line="438" column="28" selection-start-line="438" selection-start-column="28" selection-end-line="438" selection-end-column="28" />
+            <state relative-caret-position="286">
+              <caret line="495" column="51" selection-start-line="495" selection-start-column="29" selection-end-line="495" selection-end-column="51" />
+              <folding>
+                <element signature="e#22862#22878#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CustomerDetailDTO.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java">
+      <file leaf-file-name="WebMvcConfig.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="110">
-              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            <state relative-caret-position="183">
+              <caret line="49" column="42" selection-start-line="49" selection-start-column="42" selection-end-line="49" selection-end-column="42" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/pom.xml">
+      <file leaf-file-name="ArgonPartnerController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+            <state relative-caret-position="541">
+              <caret line="218" column="19" lean-forward="true" selection-start-line="218" selection-start-column="19" selection-end-line="218" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+      <file leaf-file-name="ArgonPartner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="110">
-              <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+            <state relative-caret-position="445">
+              <caret line="53" column="28" selection-start-line="53" selection-start-column="28" selection-end-line="53" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/pom.xml">
+      <file leaf-file-name="LaborerInfo.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="264">
-              <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+            <state relative-caret-position="511">
+              <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/src/main/resources/application-dev.yml">
+      <file leaf-file-name="TransportationInfo.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="264">
-              <caret line="12" column="45" lean-forward="true" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" />
+            <state relative-caret-position="511">
+              <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ArgonPartner.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="LaborerInfo.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="73" column="13" selection-start-line="73" selection-start-column="13" selection-end-line="73" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TechnicianInfo.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="373">
+              <caret line="141" column="17" lean-forward="true" selection-start-line="141" selection-start-column="17" selection-end-line="141" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TransportationInfo.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1245">
+              <caret line="72" column="47" lean-forward="true" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" />
+        <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" />
+        <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" />
+      </list>
+    </option>
+  </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsGulpfileManager">
@@ -147,7 +189,8 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="userSettingsFile" value="D:\Develop Files\apache-maven-3.5.0\conf\settings.xml" />
+        <option name="localRepository" value="D:\java\apache-maven-3.3.9\maven-repository" />
+        <option name="userSettingsFile" value="D:\java\apache-maven-3.3.9\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -167,6 +210,11 @@
       <select />
     </treeState>
   </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-5" />
+    <option name="width" value="1616" />
+    <option name="height" value="876" />
+  </component>
   <component name="ProjectId" id="337s95eD0AWjTqoZYAdQAY8e2Z9" />
   <component name="ProjectLevelVcsManager">
     <OptionsSetting value="false" id="Update" />
@@ -176,8 +224,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -188,25 +234,25 @@
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -214,7 +260,7 @@
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -223,7 +269,7 @@
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -233,33 +279,72 @@
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="employment" type="462c0819:PsiDirectoryNode" />
               <item name="modules" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="base" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="employment" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+              <item name="base" type="462c0819:PsiDirectoryNode" />
+              <item name="entity" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="common" 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="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
+              <item name="base" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="ProjectViewState">
     <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="settings.editor.selected.configurable" value="MavenSettings" />
+  </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.jpsoft.employment.modules.mobile.controller" />
@@ -293,8 +378,8 @@
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.jpsoft.employment.EmploymentApplication" />
     </configuration>
     <list>
-      <item itemvalue="Application.EmploymentApplication" />
       <item itemvalue="Spring Boot.EmploymentApplication" />
+      <item itemvalue="Application.EmploymentApplication" />
     </list>
     <recent_temporary>
       <list>
@@ -313,47 +398,58 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1758679290408</updated>
+      <workItem from="1760314946411" duration="4437000" />
+      <workItem from="1760319444506" duration="2500000" />
+    </task>
+    <task id="LOCAL-00001" summary="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口">
+      <created>1760164729546</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1760164729546</updated>
     </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="8609000" />
+    <option name="totallyTimeSpent" value="25321000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32971507" />
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.32969153" />
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info id="Capture Tool" order="2" />
+      <window_info anchor="bottom" id="Event Log" order="13" side_tool="true" weight="0.32971507" />
+      <window_info anchor="right" id="Maven Projects" order="9" weight="0.32969153" />
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
+      <window_info id="Capture Tool" order="7" />
       <window_info id="Designer" order="2" />
-      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="right" id="Database" order="5" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39891452" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" weight="0.32971507" />
-      <window_info anchor="right" id="Palette&#9;" order="3" />
-      <window_info id="Image Layers" order="2" />
-      <window_info anchor="bottom" id="Java Enterprise" order="7" />
-      <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32971507" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.5468114" />
-      <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25321338" />
-      <window_info anchor="right" id="Bean Validation" order="3" weight="0.32969153" />
-      <window_info id="Web" order="2" side_tool="true" />
-      <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info id="UI Designer" order="4" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.39891452" />
+      <window_info anchor="bottom" id="TODO" order="7" />
+      <window_info anchor="bottom" id="Messages" order="0" weight="0.32971507" />
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info id="Image Layers" order="3" />
+      <window_info anchor="bottom" id="Java Enterprise" order="10" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="bottom" id="Version Control" order="12" weight="0.32971507" />
+      <window_info anchor="bottom" id="Run" order="3" weight="0.5468114" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25899744" />
+      <window_info anchor="right" id="Bean Validation" order="8" weight="0.32969153" />
+      <window_info id="Web" order="6" side_tool="true" />
+      <window_info anchor="right" id="Theme Preview" order="7" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="1" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -398,47 +494,109 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/TechnicianInfoController.java</url>
-          <line>201</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java</url>
-          <line>225</line>
-          <properties />
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="14410">
+          <caret line="676" column="20" selection-start-line="676" selection-start-column="20" selection-end-line="676" selection-end-column="20" />
+          <folding>
+            <element signature="e#22862#22878#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <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$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        <state relative-caret-position="88">
+          <caret line="5" selection-start-line="5" selection-end-line="5" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/pom.xml">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1078">
+          <caret line="76" selection-start-line="76" selection-end-line="76" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="25" column="29" lean-forward="true" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1298">
+          <caret line="59" column="29" selection-start-line="59" selection-start-column="29" selection-end-line="59" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
-          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+          <caret line="15" column="41" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="1012">
+          <caret line="63" selection-start-line="63" selection-end-line="91" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1122">
+          <caret line="64" column="12" lean-forward="true" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1342">
+          <caret line="71" column="19" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1452">
+          <caret line="93" column="42" lean-forward="true" selection-start-line="93" selection-start-column="42" selection-end-line="93" selection-end-column="42" />
         </state>
       </provider>
     </entry>
@@ -449,6 +607,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/web/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
@@ -456,10 +621,237 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="12" column="45" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="63" selection-start-line="63" selection-end-line="91" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="15" column="41" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1342">
+          <caret line="71" column="19" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1122">
+          <caret line="64" column="12" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="4" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="135" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="205">
+          <caret line="64" column="33" selection-start-line="64" selection-start-column="33" selection-end-line="64" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="17" column="37" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="5" selection-start-line="5" selection-end-line="5" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <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$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="303">
+          <caret line="131" column="28" selection-start-line="131" selection-start-column="16" selection-end-line="131" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="45" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="447">
+          <caret line="63" column="51" selection-start-line="63" selection-start-column="11" selection-end-line="63" selection-end-column="51" />
+          <folding>
+            <element signature="e#1716#1717#0" expanded="true" />
+            <element signature="e#1752#1753#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="15" column="45" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="23" lean-forward="true" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="22" column="48" lean-forward="true" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="86" column="13" lean-forward="true" selection-start-line="86" selection-start-column="13" selection-end-line="86" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/TechnicianInfoController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="201" selection-start-line="201" selection-end-line="201" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
-          <caret line="438" column="28" selection-start-line="438" selection-start-column="28" selection-end-line="438" selection-end-column="28" />
+        <state relative-caret-position="286">
+          <caret line="495" column="51" selection-start-line="495" selection-start-column="29" selection-end-line="495" selection-end-column="51" />
+          <folding>
+            <element signature="e#22862#22878#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="49" column="42" selection-start-line="49" selection-start-column="42" selection-end-line="49" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="541">
+          <caret line="218" column="19" lean-forward="true" selection-start-line="218" selection-start-column="19" selection-end-line="218" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="445">
+          <caret line="53" column="28" selection-start-line="53" selection-start-column="28" selection-end-line="53" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="511">
+          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="511">
+          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="73" column="13" selection-start-line="73" selection-start-column="13" selection-end-line="73" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="373">
+          <caret line="141" column="17" lean-forward="true" selection-start-line="141" selection-start-column="17" selection-end-line="141" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1245">
+          <caret line="72" column="47" lean-forward="true" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
         </state>
       </provider>
     </entry>

common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java

@@ -14,5 +14,6 @@ public interface CustomerInfoDAO {
 	CustomerInfo get(String id);
 	int delete(String id);
 	List<CustomerInfo> list();
+	CustomerInfo findByOpenId(String openId);
 	List<CustomerInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java

@@ -15,5 +15,6 @@ public interface TechnicianInfoDAO {
 	int delete(String id);
 	List<TechnicianInfo> list();
 	List<TechnicianInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<TechnicianInfo> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 	TechnicianInfo findByPhone(String phone);
 }

common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java

@@ -0,0 +1,34 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class TechnicianDTO {
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "区域")
+    private String region;
+
+    @ApiModelProperty(value = "会员等级")
+    private Integer level;
+
+    @ApiModelProperty(value = "是否实名认证（0：未认证，1：已认证）")
+    private Boolean isVerified;
+
+    @ApiModelProperty(value = "评分")
+    private BigDecimal score;
+
+    @ApiModelProperty(value = "完成单数")
+    private Integer completeOrderNum;
+
+    @ApiModelProperty(value = "合作单数")
+    private Integer cooperationNum;
+
+}

common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java

@@ -53,9 +53,6 @@ public class ArgonPartner {
 				@ApiModelProperty(value = "删除标示")
 	private Boolean delFlag;
 
-	@ApiModelProperty(value = "客户ID")
-	private String customerId;
-
 
 
 	

common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java

@@ -49,8 +49,5 @@ public class LaborerInfo {
 	
 				@ApiModelProperty(value = "删除标示")
 	private Boolean delFlag;
-
-	@ApiModelProperty(value = "客户ID")
-	private String customerId;
 	
 		}

common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java

@@ -49,8 +49,5 @@ public class TransportationInfo {
 	
 				@ApiModelProperty(value = "删除标示")
 	private Boolean delFlag;
-
-	@ApiModelProperty(value = "客户ID")
-	private String customerId;
 	
 		}

common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java

@@ -13,5 +13,6 @@ public interface CustomerInfoService {
 	int update(CustomerInfo model);
 	int delete(String id);
 	List<CustomerInfo> list();
+	CustomerInfo findByOpenId(String openId);
 	Page<CustomerInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java

@@ -14,5 +14,6 @@ public interface TechnicianInfoService {
 	int delete(String id);
 	List<TechnicianInfo> list();
 	Page<TechnicianInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+	Page<TechnicianInfo> pageSearchMobile(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 	TechnicianInfo findByPhone(String phone);
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java

@@ -12,6 +12,7 @@ public interface WorkOrderService {
 	WorkOrder get(String id);
 	boolean exist(String id);
 	int insert(WorkOrder model);
+	int insertDTO(WorkOrderAllDataDTO dto);
 	int update(WorkOrder model);
 	int delete(String id);
 	List<WorkOrder> list();

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java

@@ -58,6 +58,12 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
 		// TODO Auto-generated method stub
 		return customerInfoDAO.list();
 	}
+
+
+	@Override
+	public CustomerInfo findByOpenId(String openId){
+		return customerInfoDAO.findByOpenId(openId);
+	}
 		
 	@Override
 	public Page<CustomerInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java

@@ -68,6 +68,16 @@ public class TechnicianInfoServiceImpl implements TechnicianInfoService {
         return page;
 	}
 
+
+	@Override
+	public Page<TechnicianInfo> pageSearchMobile(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList){
+		Page<TechnicianInfo> page = PageHelper.startPage(pageNum,pageSize,count).doSelectPage(()->{
+			technicianInfoDAO.searchMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
+
 	@Override
 	public TechnicianInfo findByPhone(String phone) {
 		return technicianInfoDAO.findByPhone(phone);

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java

@@ -53,6 +53,64 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         return workOrderDAO.insert(model);
     }
 
+    @Override
+    public int insertDTO(WorkOrderAllDataDTO dto) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
+        WorkOrder workOrder = dto.getWorkOrder();
+        Date now = new Date();
+        workOrder.setCreateTime(now);
+        String createBy = workOrder.getCreateBy();
+
+        //图片
+        List<String> imageList = dto.getImageList();
+        String images="";
+        for (String image:imageList) {
+            images+=image+",";
+        }
+
+        if(StringUtils.isNotEmpty(images)){
+            images = images.substring(0,images.lastIndexOf(","));
+            workOrder.setImage(images);
+        }
+
+        workOrder.setPayStatus("0");
+        workOrder.setStatus("1");
+
+        int affectCount = workOrderDAO.insert(workOrder);
+
+        if (affectCount > 0) {
+            //水箱需求
+            InstallationRequirement installationRequirement = dto.getInstallationRequirement();
+            installationRequirement.setId(UUID.randomUUID().toString());
+            installationRequirement.setCreateBy(createBy);
+            installationRequirement.setDelFlag(false);
+            installationRequirement.setCreateTime(now);
+            installationRequirementDAO.insert(installationRequirement);
+
+            //接单要求
+            ReceiveRequire receiveRequire = dto.getReceiveRequire();
+            receiveRequire.setId(UUID.randomUUID().toString());
+            receiveRequire.setCreateBy(createBy);
+            receiveRequire.setDelFlag(false);
+            receiveRequire.setCreateTime(now);
+            receiveRequireDAO.insert(receiveRequire);
+
+            //工程进度
+            ConstructionProgress constructionProgress=new ConstructionProgress();
+            constructionProgress.setId(UUID.randomUUID().toString());
+            constructionProgress.setCreateBy(createBy);
+            constructionProgress.setDelFlag(false);
+            constructionProgress.setCreateTime(now);
+            constructionProgress.setIndex(1);
+            constructionProgressDAO.insert(constructionProgress);
+        }
+
+
+        return affectCount;
+    }
+
+
     @Override
     public int update(WorkOrder model) {
         // TODO Auto-generated method stub
@@ -84,7 +142,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
 
         String id = workOrder.getId();
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy/MM/dd");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
 
         WorkOrderAllDataDTO dto = new WorkOrderAllDataDTO();
 
@@ -179,13 +237,13 @@ public class WorkOrderServiceImpl implements WorkOrderService {
 
 
     @Override
-    public Map countByCustomerId(Map<String, Object> searchParams){
+    public Map countByCustomerId(Map<String, Object> searchParams) {
         return workOrderDAO.countByCustomerId(searchParams);
     }
 
 
     @Override
-    public List<String> findTopByCustomerId(String customerId){
+    public List<String> findTopByCustomerId(String customerId) {
         return workOrderDAO.findTopByCustomerId(customerId);
     }
 

common/src/main/resources/mapper/base/ArgonPartner.xml

@@ -15,7 +15,6 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
-			<result property="customerId" column="customer_id" />
 			</resultMap>
 	<insert id="insert" parameterType="ArgonPartner">
 	<!--
@@ -25,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_argon_partner
-	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
+	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -39,7 +38,6 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
-,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -79,9 +77,6 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
-			<if test="customerId!=null">
-				customer_id=#{customerId,jdbcType=VARCHAR},
-			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/src/main/resources/mapper/base/CustomerInfo.xml

@@ -129,6 +129,13 @@
 	<select id="list" resultMap="CustomerInfoMap">
 		select * from base_customer_info
 	</select>
+	<select id="findByOpenId" resultMap="CustomerInfoMap">
+		select * from base_customer_info
+		where del_flag=0
+		and open_id=#{openId}
+		order by create_time asc
+		limit 1
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="CustomerInfoMap">
 		<![CDATA[
 			select * from base_customer_info

common/src/main/resources/mapper/base/LaborerInfo.xml

@@ -14,7 +14,6 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
-			<result property="customerId" column="customer_id" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LaborerInfo">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into base_laborer_info
-	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag,customer_id)
+	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -37,7 +36,6 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
-,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -74,9 +72,6 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
-			<if test="customerId!=null">
-				customer_id=#{customerId,jdbcType=VARCHAR},
-			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/src/main/resources/mapper/base/TechnicianInfo.xml

@@ -165,6 +165,20 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="TechnicianInfoMap">
+		<![CDATA[
+			select * from base_technician_info
+		]]>
+		<where>
+			del_flag = fasle
+			<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>
 	<select id="findByPhone" parameterType="string" resultMap="TechnicianInfoMap">
 		select * from base_technician_info
 		where del_flag = 0

common/src/main/resources/mapper/base/TransportationInfo.xml

@@ -14,7 +14,6 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
-			<result property="customerId" column="customer_id" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TransportationInfo">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into base_transportation_info
-	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
+	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -37,7 +36,6 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
-,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -74,9 +72,6 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
-			<if test="customerId!=null">
-				customer_id=#{customerId,jdbcType=VARCHAR},
-			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/target/classes/mapper/base/ArgonPartner.xml

@@ -15,7 +15,6 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
-			<result property="customerId" column="customer_id" />
 			</resultMap>
 	<insert id="insert" parameterType="ArgonPartner">
 	<!--
@@ -25,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_argon_partner
-	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
+	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -39,7 +38,6 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
-,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -79,9 +77,6 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
-			<if test="customerId!=null">
-				customer_id=#{customerId,jdbcType=VARCHAR},
-			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/target/classes/mapper/base/CustomerInfo.xml

@@ -129,6 +129,13 @@
 	<select id="list" resultMap="CustomerInfoMap">
 		select * from base_customer_info
 	</select>
+	<select id="findByOpenId" resultMap="CustomerInfoMap">
+		select * from base_customer_info
+		where del_flag=0
+		and open_id=#{openId}
+		order by create_time asc
+		limit 1
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="CustomerInfoMap">
 		<![CDATA[
 			select * from base_customer_info

common/target/classes/mapper/base/LaborerInfo.xml

@@ -14,7 +14,6 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
-			<result property="customerId" column="customer_id" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LaborerInfo">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into base_laborer_info
-	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag,customer_id)
+	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -37,7 +36,6 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
-,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -74,9 +72,6 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
-			<if test="customerId!=null">
-				customer_id=#{customerId,jdbcType=VARCHAR},
-			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/target/classes/mapper/base/TechnicianInfo.xml

@@ -165,6 +165,20 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="TechnicianInfoMap">
+		<![CDATA[
+			select * from base_technician_info
+		]]>
+		<where>
+			del_flag = fasle
+			<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>
 	<select id="findByPhone" parameterType="string" resultMap="TechnicianInfoMap">
 		select * from base_technician_info
 		where del_flag = 0

common/target/classes/mapper/base/TransportationInfo.xml

@@ -14,7 +14,6 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
-			<result property="customerId" column="customer_id" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TransportationInfo">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into base_transportation_info
-	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
+	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -37,7 +36,6 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
-,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -74,9 +72,6 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
-			<if test="customerId!=null">
-				customer_id=#{customerId,jdbcType=VARCHAR},
-			</if>
 		</set>
 	where id_=#{id}
 	</update>

web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java

@@ -58,6 +58,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/technician/register")
 				.excludePathPatterns("/mobile/technician/wxLogin")
 				.excludePathPatterns("/generateCaptCha")
+				.excludePathPatterns("/mobile/customerInfoApi/findByOpenId")
+				.excludePathPatterns("/mobile/customerInfoApi/argonPartnerPageList")
+				.excludePathPatterns("/mobile/customerInfoApi/laborerPageList")
+				.excludePathPatterns("/mobile/customerInfoApi/transportationPageList")
 		;
 	}
 }

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java

@@ -2,32 +2,40 @@ package com.jpsoft.employment.modules.mobile.controller;
 
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.exception.CustomException;
 import com.jpsoft.employment.modules.base.dto.CustomerDetailDTO;
 import com.jpsoft.employment.modules.base.dto.PersonalCenterDTO;
+import com.jpsoft.employment.modules.base.dto.WorkOrderAllDataDTO;
 import com.jpsoft.employment.modules.base.entity.*;
 import com.jpsoft.employment.modules.base.service.*;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.utils.JwtUtil;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 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.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/mobile/customerInfoApi")
 public class CustomerInfoApiController {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
+    @Value("${jwt.secret}")
+    private String jwtSecret;
 
     @Autowired
     private CustomerInfoService customerInfoService;
@@ -549,7 +557,7 @@ public class CustomerInfoApiController {
 
     @ApiOperation(value = "工单列表")
     @RequestMapping(value = "workOrderPageList", method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
+    public MessageResult<Map> workOrderPageList(
             String status,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
@@ -588,4 +596,134 @@ public class CustomerInfoApiController {
     }
 
 
+    @ApiOperation(value = "获取工单详情")
+    @GetMapping("workOrderEdit/{id}")
+    public MessageResult<WorkOrderAllDataDTO> workOrderEdit(@PathVariable("id") String id) {
+        MessageResult<WorkOrderAllDataDTO> msgResult = new MessageResult<>();
+
+        try {
+            WorkOrder workOrder = workOrderService.get(id);
+
+            if (workOrder != null) {
+                WorkOrderAllDataDTO dto = workOrderService.getDtoList(workOrder);
+
+                msgResult.setResult(true);
+                msgResult.setData(dto);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+
+    @ApiOperation(value = "工单提交")
+    @PostMapping("workOrderAdd")
+    public MessageResult<WorkOrder> workOrderAdd(@RequestBody WorkOrderAllDataDTO dto, @RequestAttribute String subject) {
+        MessageResult<WorkOrder> msgResult = new MessageResult<>();
+
+        try {
+            WorkOrder workOrder = dto.getWorkOrder();
+            workOrder.setId(UUID.randomUUID().toString());
+            workOrder.setDelFlag(false);
+            workOrder.setCreateBy(subject);
+
+            int affectCount = workOrderService.insertDTO(dto);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(workOrder);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+
+    @ApiOperation(value = "师傅列表")
+    @RequestMapping(value = "technicianPageList", method = RequestMethod.POST)
+    public MessageResult<Map> technicianPageList(
+            String status,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String, Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time", "desc"));
+
+        if (StringUtils.isNotEmpty(status)) {
+            searchParams.put("status", status);
+        }
+
+
+        Page<TechnicianInfo> page = technicianInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+
+
+    @GetMapping("findByOpenId")
+    public MessageResult<Map> findByOpenId(String openId) {
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        try {
+
+            CustomerInfo customerInfo = customerInfoService.findByOpenId(openId);
+
+            if (customerInfo != null) {
+                String token = JwtUtil.createToken(jwtSecret, customerInfo.getId(), DateTime.now().plusDays(7).toDate());
+
+                Map<String, Object> dataMap = new HashMap<String, Object>();
+                dataMap.put("customerInfo", customerInfo);
+                dataMap.put("token", token);
+                msgResult.setData(dataMap);
+                msgResult.setResult(true);
+            } else {
+                throw new CustomException("openid不存在");
+            }
+        } catch (Exception ex) {
+            if (ex instanceof CustomException) {
+                logger.error(ex.getMessage());
+            } else {
+                logger.error(ex.getMessage(), ex);
+            }
+
+            msgResult.setMessage(ex.getMessage());
+            msgResult.setResult(false);
+        }
+
+        return msgResult;
+    }
+
 }