1.氩气合作方功能，搬运小工管理功能，运输方功能，

2.客户中心手机端接口
3.客户首页数据接口

.idea/shelf/_2025_10_9_9_16____.xml

@@ -1,4 +1,4 @@
-<changelist name="在进行更新之前于_2025_10_9_上午9_16_取消提交了更改_[更改]" date="1759972640276" recycled="true" deleted="true">
+<changelist name="在进行更新之前于_2025_10_9_上午9_16_取消提交了更改_[更改]" date="1759972640276" recycled="true">
   <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_9_上午9_16_取消提交了更改_[更改]/shelved.patch" />
   <option name="DESCRIPTION" value="在进行更新之前于 2025/10/9 上午9:16 取消提交了更改 [更改]" />
 </changelist>

.idea/workspace.xml

@@ -4,68 +4,280 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/ConstructionProgressDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/ConstructionProgressDAO.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/WorkOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ConstructionProgressService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ConstructionProgressService.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/impl/ConstructionProgressServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ConstructionProgressServiceImpl.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/resources/mapper/base/ConstructionProgress.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ConstructionProgress.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/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java" afterDir="false" />
+    <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" />
+      <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/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/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/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/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/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/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" />
     </list>
+    <ignored path="$PROJECT_DIR$/target/" />
+    <ignored path="$PROJECT_DIR$/common/target/" />
+    <ignored path="$PROJECT_DIR$/web/target/" />
+    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="CustomerInfoApiController.java" pinned="false" current-in-tab="true">
+        <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>
+          </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">
+          <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>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/pom.xml">
+          <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>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <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>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/pom.xml">
+          <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>
+          </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">
+          <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>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="customMavenHome" value="D:\Develop Files\apache-maven-3.5.0" />
-        <option name="mavenHomeTypeForPersistence" value="CUSTOM" />
         <option name="userSettingsFile" value="D:\Develop Files\apache-maven-3.5.0\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 1
-}</component>
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="web" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="web" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+        </path>
+      </expand>
+      <select />
+    </treeState>
+  </component>
   <component name="ProjectId" id="337s95eD0AWjTqoZYAdQAY8e2Z9" />
   <component name="ProjectLevelVcsManager">
     <OptionsSetting value="false" id="Update" />
   </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" 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" />
+            </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="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="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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" 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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="employment" 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="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" />
+            </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="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" />
+            </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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="AndroidView" />
+    </panes>
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Projects Files/水箱定制项目/water-tank-installation-server&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
-    &quot;应用程序.EmploymentApplication.executor&quot;: &quot;Debug&quot;
-  }
-}</component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.jpsoft.employment.modules.mobile.controller" />
     </key>
   </component>
-  <component name="RunManager">
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="Application.EmploymentApplication">
     <configuration name="EmploymentApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.jpsoft.employment.EmploymentApplication" />
       <module name="web" />
@@ -75,17 +287,25 @@
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
     </configuration>
+    <configuration name="EmploymentApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="web" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.jpsoft.employment.EmploymentApplication" />
+    </configuration>
+    <list>
+      <item itemvalue="Application.EmploymentApplication" />
+      <item itemvalue="Spring Boot.EmploymentApplication" />
+    </list>
     <recent_temporary>
       <list>
-        <item itemvalue="应用程序.EmploymentApplication" />
+        <item itemvalue="Application.EmploymentApplication" />
       </list>
     </recent_temporary>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="默认任务">
       <changelist id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="" />
@@ -96,20 +316,152 @@
     </task>
     <servers />
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="8609000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
+    <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 id="Designer" order="2" />
+      <window_info anchor="right" id="Database" order="3" />
+      <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 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="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <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>
+  <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$/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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/pom.xml">
+      <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>
+      </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/pom.xml">
+      <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>
+      </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" lean-forward="true" 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/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>
+      </provider>
+    </entry>
+  </component>
 </project>

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

@@ -14,5 +14,7 @@ public interface ArgonPartnerDAO {
 	ArgonPartner get(String id);
 	int delete(String id);
 	List<ArgonPartner> list();
+	List<ArgonPartner> findByCustomerId(String customerId);
 	List<ArgonPartner> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<ArgonPartner> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -14,5 +14,7 @@ public interface LaborerInfoDAO {
 	LaborerInfo get(String id);
 	int delete(String id);
 	List<LaborerInfo> list();
+	List<LaborerInfo> findByCustomerId(String customerId);
 	List<LaborerInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<LaborerInfo> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -1,6 +1,8 @@
 package com.jpsoft.employment.modules.base.dao;
 
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.jpsoft.employment.modules.base.entity.MessageInfo;
 import java.util.Map;
@@ -14,5 +16,7 @@ public interface MessageInfoDAO {
 	MessageInfo get(String id);
 	int delete(String id);
 	List<MessageInfo> list();
+	List<Map> findByRecipientId(String recipientId);
+	List<MessageInfo> findByRecipientIdAndType(@Param("recipientId") String recipientId,@Param("type") String type);
 	List<MessageInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -14,5 +14,7 @@ public interface TransportationInfoDAO {
 	TransportationInfo get(String id);
 	int delete(String id);
 	List<TransportationInfo> list();
+	List<TransportationInfo> findByCustomerId(String customerId);
 	List<TransportationInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<TransportationInfo> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -9,11 +9,22 @@ import com.jpsoft.employment.modules.common.dto.Sort;
 @Repository
 public interface WorkOrderDAO {
 	int insert(WorkOrder entity);
+
 	int update(WorkOrder entity);
+
 	int exist(String id);
+
 	WorkOrder get(String id);
+
 	int delete(String id);
+
 	List<WorkOrder> list();
+
 	List<WorkOrder> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
+
 	List<WorkOrder> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+	Map countByCustomerId(Map<String, Object> searchParams);
+
+	List<String> findTopByCustomerId(String customerId);
 }

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

@@ -0,0 +1,25 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CustomerDetailDTO {
+    @ApiModelProperty(value = "客户Id")
+    private String id;
+
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "所在地区")
+    private String region;
+
+    @ApiModelProperty(value = "头像")
+    private String image;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String realName;
+
+    @ApiModelProperty(value = "管理员电话")
+    private String phone;
+}

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

@@ -0,0 +1,27 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PersonalCenterDTO {
+    @ApiModelProperty(value = "客户Id")
+    private String id;
+
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String phone;
+
+    @ApiModelProperty(value = "总发单量")
+    private Integer total;
+
+    @ApiModelProperty(value = "完工单量")
+    private Integer completedNum;
+
+    @ApiModelProperty(value = "发单金额")
+    private BigDecimal amount;
+}

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

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

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

@@ -73,5 +73,9 @@ public class CustomerInfo {
 
 	@ApiModelProperty(value = "审核状态（0：未审核，1：已审核）")
 	private String status;
+
+	@ApiModelProperty(value = "营业执照")
+	private String businessLicense;
+
 	
 		}

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

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

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

@@ -57,5 +57,8 @@ public class MessageInfo {
 	
 				@ApiModelProperty(value = "删除标示")
 	private Boolean delFlag;
+
+	@ApiModelProperty(value = "是否已读")
+	private Boolean isRead;
 	
 		}

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

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

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

@@ -13,5 +13,7 @@ public interface ArgonPartnerService {
 	int update(ArgonPartner model);
 	int delete(String id);
 	List<ArgonPartner> list();
+	List<ArgonPartner> findByCustomerId(String customerId);
 	Page<ArgonPartner> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	Page<ArgonPartner> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

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

@@ -13,5 +13,7 @@ public interface LaborerInfoService {
 	int update(LaborerInfo model);
 	int delete(String id);
 	List<LaborerInfo> list();
+	List<LaborerInfo> findByCustomerId(String customerId);
 	Page<LaborerInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	Page<LaborerInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

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

@@ -13,5 +13,7 @@ public interface MessageInfoService {
 	int update(MessageInfo model);
 	int delete(String id);
 	List<MessageInfo> list();
+	List<Map> findByRecipientId(String recipientId);
+	List<MessageInfo> findByRecipientIdAndType(String recipientId,String type);
 	Page<MessageInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 }

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

@@ -2,6 +2,7 @@ package com.jpsoft.employment.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
+
 import com.jpsoft.employment.modules.base.entity.TransportationInfo;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -13,5 +14,7 @@ public interface TransportationInfoService {
 	int update(TransportationInfo model);
 	int delete(String id);
 	List<TransportationInfo> list();
+	List<TransportationInfo> findByCustomerId(String customerId);
 	Page<TransportationInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	Page<TransportationInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

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

@@ -15,7 +15,9 @@ public interface WorkOrderService {
 	int update(WorkOrder model);
 	int delete(String id);
 	List<WorkOrder> list();
+	List<String> findTopByCustomerId(String customerId);
 	WorkOrderAllDataDTO getDtoList(WorkOrder workOrder);
 	Page<WorkOrder> pageSearchMobile(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 	Page<WorkOrder> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+	Map countByCustomerId(Map<String, Object> searchParams);
 }

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

@@ -58,6 +58,12 @@ public class ArgonPartnerServiceImpl implements ArgonPartnerService {
 		// TODO Auto-generated method stub
 		return argonPartnerDAO.list();
 	}
+
+
+	@Override
+	public List<ArgonPartner> findByCustomerId(String customerId){
+		return argonPartnerDAO.findByCustomerId(customerId);
+	}
 		
 	@Override
 	public Page<ArgonPartner> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
@@ -67,4 +73,13 @@ public class ArgonPartnerServiceImpl implements ArgonPartnerService {
         
         return page;
 	}
+
+	@Override
+	public Page<ArgonPartner> pageSearchMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<ArgonPartner> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			argonPartnerDAO.searchMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
 }

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

@@ -58,7 +58,12 @@ public class LaborerInfoServiceImpl implements LaborerInfoService {
 		// TODO Auto-generated method stub
 		return laborerInfoDAO.list();
 	}
-		
+
+
+	@Override
+	public List<LaborerInfo> findByCustomerId(String customerId){
+		return laborerInfoDAO.findByCustomerId(customerId);
+	}
 	@Override
 	public Page<LaborerInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
         Page<LaborerInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
@@ -67,4 +72,13 @@ public class LaborerInfoServiceImpl implements LaborerInfoService {
         
         return page;
 	}
+
+	@Override
+	public Page<LaborerInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<LaborerInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			laborerInfoDAO.searchMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
 }

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

@@ -58,6 +58,17 @@ public class MessageInfoServiceImpl implements MessageInfoService {
 		// TODO Auto-generated method stub
 		return messageInfoDAO.list();
 	}
+
+	@Override
+	public List<Map> findByRecipientId(String recipientId){
+		return messageInfoDAO.findByRecipientId(recipientId);
+	}
+
+
+	@Override
+	public List<MessageInfo> findByRecipientIdAndType(String recipientId,String type){
+		return messageInfoDAO.findByRecipientIdAndType(recipientId,type);
+	}
 		
 	@Override
 	public Page<MessageInfo> 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/TransportationInfoServiceImpl.java

@@ -58,6 +58,11 @@ public class TransportationInfoServiceImpl implements TransportationInfoService
 		// TODO Auto-generated method stub
 		return transportationInfoDAO.list();
 	}
+
+	@Override
+	public List<TransportationInfo> findByCustomerId(String customerId){
+		return transportationInfoDAO.findByCustomerId(customerId);
+	}
 		
 	@Override
 	public Page<TransportationInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
@@ -67,4 +72,13 @@ public class TransportationInfoServiceImpl implements TransportationInfoService
         
         return page;
 	}
+
+	@Override
+	public Page<TransportationInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<TransportationInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			transportationInfoDAO.searchMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
 }

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

@@ -178,4 +178,16 @@ public class WorkOrderServiceImpl implements WorkOrderService {
     }
 
 
+    @Override
+    public Map countByCustomerId(Map<String, Object> searchParams){
+        return workOrderDAO.countByCustomerId(searchParams);
+    }
+
+
+    @Override
+    public List<String> findTopByCustomerId(String customerId){
+        return workOrderDAO.findTopByCustomerId(customerId);
+    }
+
+
 }

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

@@ -15,6 +15,7 @@
 			<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">
 	<!--
@@ -24,7 +25,7 @@
 	-->
 	<![CDATA[
 		insert into base_argon_partner
-	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +39,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -77,12 +79,14 @@
 				<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>
 	<select id="get" parameterType="string" resultMap="ArgonPartnerMap">
-		select 
-id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag		from base_argon_partner where id_=#{0}
+		select * from base_argon_partner where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_argon_partner where id_=#{0}
@@ -90,6 +94,9 @@ id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create
 	<select id="list" resultMap="ArgonPartnerMap">
 		select * from base_argon_partner
 	</select>
+	<select id="findByCustomerId" resultMap="ArgonPartnerMap">
+		select * from base_argon_partner where del_flag=false and customer_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="ArgonPartnerMap">
 		<![CDATA[
 			select * from base_argon_partner
@@ -104,4 +111,18 @@ id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="ArgonPartnerMap">
+		<![CDATA[
+			select * from base_argon_partner
+		]]>
+		<where>
+			del_flag=false
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

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

@@ -22,7 +22,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="companyName" column="company_name" />
 			<result property="status" column="status_" />
-
+			<result property="businessLicense" column="business_license" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.CustomerInfo">
 	<!--
@@ -32,7 +32,7 @@
 	-->
 	<![CDATA[
 		insert into base_customer_info
-	    (id_,user_name,password_,open_id,phone_,id_card,id_card_image,real_name,gender_,region_,image_,create_time,update_time,del_flag,create_by,update_by,company_name,status_)
+	    (id_,user_name,password_,open_id,phone_,id_card,id_card_image,real_name,gender_,region_,image_,create_time,update_time,del_flag,create_by,update_by,company_name,status_,business_license)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -53,6 +53,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{companyName,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
+,#{businessLicense,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -113,6 +114,9 @@
 			<if test="status!=null">
 				status_=#{status,jdbcType=VARCHAR},
 			</if>
+			<if test="businessLicense!=null">
+				business_license=#{businessLicense,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -14,8 +14,9 @@
 			<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="LaborerInfo">
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LaborerInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
 		select sys_guid() from dual
@@ -23,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_laborer_info
-	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag,customer_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +37,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -72,12 +74,14 @@
 				<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>
 	<select id="get" parameterType="string" resultMap="LaborerInfoMap">
-		select 
-id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag		from base_laborer_info where id_=#{0}
+		select * from base_laborer_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_laborer_info where id_=#{0}
@@ -85,6 +89,9 @@ id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_fl
 	<select id="list" resultMap="LaborerInfoMap">
 		select * from base_laborer_info
 	</select>
+	<select id="findByCustomerId" resultMap="LaborerInfoMap">
+		select * from base_laborer_info where del_flag=false and customer_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="LaborerInfoMap">
 		<![CDATA[
 			select * from base_laborer_info
@@ -98,4 +105,17 @@ id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_fl
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="LaborerInfoMap">
+		<![CDATA[
+			select * from base_laborer_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

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

@@ -16,6 +16,8 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
+			<result property="isRead" column="is_read" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.MessageInfo">
 	<!--
@@ -25,7 +27,7 @@
 	-->
 	<![CDATA[
 		insert into base_message_info
-	    (id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_time,create_by,update_by,del_flag,is_read)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +42,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{isRead,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -82,12 +85,14 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="isRead!=null">
+				is_read=#{isRead,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="MessageInfoMap">
-		select 
-id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_time,create_by,update_by,del_flag		from base_message_info where id_=#{0}
+		select * from base_message_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_message_info where id_=#{0}
@@ -95,6 +100,15 @@ id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_ti
 	<select id="list" resultMap="MessageInfoMap">
 		select * from base_message_info
 	</select>
+	<select id="findByRecipientId" resultType="java.util.Map">
+		select count(*) as 'count',type_ as 'type' from base_message_info
+		where del_flag=false and is_read=false and recipient_id=#{0}
+		group by type_
+	</select>
+	<select id="findByRecipientIdAndType" resultMap="MessageInfoMap">
+		select * from base_message_info
+		where del_flag=false and recipient_id=#{recipientId} and type_=#{type}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="MessageInfoMap">
 		<![CDATA[
 			select * from base_message_info

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

@@ -14,6 +14,7 @@
 			<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">
 	<!--
@@ -23,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_transportation_info
-	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +37,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -72,12 +74,14 @@
 				<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>
 	<select id="get" parameterType="string" resultMap="TransportationInfoMap">
-		select 
-id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag		from base_transportation_info where id_=#{0}
+		select * from base_transportation_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_transportation_info where id_=#{0}
@@ -85,6 +89,9 @@ id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update
 	<select id="list" resultMap="TransportationInfoMap">
 		select * from base_transportation_info
 	</select>
+	<select id="findByCustomerId" resultMap="TransportationInfoMap">
+		select * from base_transportation_info where del_flag=false and customer_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="TransportationInfoMap">
 		<![CDATA[
 			select * from base_transportation_info
@@ -98,4 +105,17 @@ id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="TransportationInfoMap">
+		<![CDATA[
+			select * from base_transportation_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

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

@@ -15,6 +15,7 @@
 			<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">
 	<!--
@@ -24,7 +25,7 @@
 	-->
 	<![CDATA[
 		insert into base_argon_partner
-	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +39,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -77,12 +79,14 @@
 				<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>
 	<select id="get" parameterType="string" resultMap="ArgonPartnerMap">
-		select 
-id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag		from base_argon_partner where id_=#{0}
+		select * from base_argon_partner where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_argon_partner where id_=#{0}
@@ -90,6 +94,9 @@ id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create
 	<select id="list" resultMap="ArgonPartnerMap">
 		select * from base_argon_partner
 	</select>
+	<select id="findByCustomerId" resultMap="ArgonPartnerMap">
+		select * from base_argon_partner where del_flag=false and customer_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="ArgonPartnerMap">
 		<![CDATA[
 			select * from base_argon_partner
@@ -104,4 +111,18 @@ id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="ArgonPartnerMap">
+		<![CDATA[
+			select * from base_argon_partner
+		]]>
+		<where>
+			del_flag=false
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

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

@@ -22,7 +22,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="companyName" column="company_name" />
 			<result property="status" column="status_" />
-
+			<result property="businessLicense" column="business_license" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.CustomerInfo">
 	<!--
@@ -32,7 +32,7 @@
 	-->
 	<![CDATA[
 		insert into base_customer_info
-	    (id_,user_name,password_,open_id,phone_,id_card,id_card_image,real_name,gender_,region_,image_,create_time,update_time,del_flag,create_by,update_by,company_name,status_)
+	    (id_,user_name,password_,open_id,phone_,id_card,id_card_image,real_name,gender_,region_,image_,create_time,update_time,del_flag,create_by,update_by,company_name,status_,business_license)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -53,6 +53,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{companyName,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
+,#{businessLicense,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -113,6 +114,9 @@
 			<if test="status!=null">
 				status_=#{status,jdbcType=VARCHAR},
 			</if>
+			<if test="businessLicense!=null">
+				business_license=#{businessLicense,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -14,8 +14,9 @@
 			<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="LaborerInfo">
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LaborerInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
 		select sys_guid() from dual
@@ -23,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_laborer_info
-	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag,customer_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +37,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -72,12 +74,14 @@
 				<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>
 	<select id="get" parameterType="string" resultMap="LaborerInfoMap">
-		select 
-id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag		from base_laborer_info where id_=#{0}
+		select * from base_laborer_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_laborer_info where id_=#{0}
@@ -85,6 +89,9 @@ id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_fl
 	<select id="list" resultMap="LaborerInfoMap">
 		select * from base_laborer_info
 	</select>
+	<select id="findByCustomerId" resultMap="LaborerInfoMap">
+		select * from base_laborer_info where del_flag=false and customer_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="LaborerInfoMap">
 		<![CDATA[
 			select * from base_laborer_info
@@ -98,4 +105,17 @@ id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_fl
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="LaborerInfoMap">
+		<![CDATA[
+			select * from base_laborer_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

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

@@ -16,6 +16,8 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="delFlag" column="del_flag" />
+			<result property="isRead" column="is_read" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.MessageInfo">
 	<!--
@@ -25,7 +27,7 @@
 	-->
 	<![CDATA[
 		insert into base_message_info
-	    (id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_time,create_by,update_by,del_flag,is_read)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +42,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{isRead,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -82,12 +85,14 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="isRead!=null">
+				is_read=#{isRead,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="MessageInfoMap">
-		select 
-id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_time,create_by,update_by,del_flag		from base_message_info where id_=#{0}
+		select * from base_message_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_message_info where id_=#{0}
@@ -95,6 +100,15 @@ id_,type_,send_time,title_,content_,sender_id,recipient_id,create_time,update_ti
 	<select id="list" resultMap="MessageInfoMap">
 		select * from base_message_info
 	</select>
+	<select id="findByRecipientId" resultType="java.util.Map">
+		select count(*) as 'count',type_ as 'type' from base_message_info
+		where del_flag=false and is_read=false and recipient_id=#{0}
+		group by type_
+	</select>
+	<select id="findByRecipientIdAndType" resultMap="MessageInfoMap">
+		select * from base_message_info
+		where del_flag=false and recipient_id=#{recipientId} and type_=#{type}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="MessageInfoMap">
 		<![CDATA[
 			select * from base_message_info

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

@@ -14,6 +14,7 @@
 			<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">
 	<!--
@@ -23,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_transportation_info
-	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag)
+	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag,customer_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +37,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
+,#{customerId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -72,12 +74,14 @@
 				<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>
 	<select id="get" parameterType="string" resultMap="TransportationInfoMap">
-		select 
-id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag		from base_transportation_info where id_=#{0}
+		select * from base_transportation_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_transportation_info where id_=#{0}
@@ -85,6 +89,9 @@ id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update
 	<select id="list" resultMap="TransportationInfoMap">
 		select * from base_transportation_info
 	</select>
+	<select id="findByCustomerId" resultMap="TransportationInfoMap">
+		select * from base_transportation_info where del_flag=false and customer_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="TransportationInfoMap">
 		<![CDATA[
 			select * from base_transportation_info
@@ -98,4 +105,17 @@ id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="TransportationInfoMap">
+		<![CDATA[
+			select * from base_transportation_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java

@@ -216,7 +216,7 @@ public class ArgonPartnerController {
         }
 
 
-        Page<ArgonPartner> page = argonPartnerService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<ArgonPartner> page = argonPartnerService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
 
 
         msgResult.setResult(true);

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

@@ -0,0 +1,591 @@
+package com.jpsoft.employment.modules.mobile.controller;
+
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.dto.CustomerDetailDTO;
+import com.jpsoft.employment.modules.base.dto.PersonalCenterDTO;
+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.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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.*;
+
+@RestController
+@RequestMapping("/mobile/customerInfoApi")
+public class CustomerInfoApiController {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CustomerInfoService customerInfoService;
+
+    @Autowired
+    private WorkOrderService workOrderService;
+
+    @Autowired
+    private MessageInfoService messageInfoService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @Autowired
+    private ArgonPartnerService argonPartnerService;
+
+    @Autowired
+    private LaborerInfoService laborerInfoService;
+
+    @Autowired
+    private TransportationInfoService transportationInfoService;
+
+    @Autowired
+    private TechnicianInfoService technicianInfoService;
+
+    @ApiOperation(value = "个人中心")
+    @RequestMapping(value = "personalCenter", method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "formId", value = "表单编号", paramType = "form"),
+    })
+    public MessageResult<PersonalCenterDTO> personalCenter(String token, @RequestAttribute String subject) {
+        MessageResult<PersonalCenterDTO> messageResult = new MessageResult<>();
+
+        CustomerInfo customerInfo = customerInfoService.get(subject);
+
+        try {
+            if (customerInfo == null) {
+                throw new Exception("请先登录系统！");
+            }
+
+            PersonalCenterDTO dto = new PersonalCenterDTO();
+            dto.setId(customerInfo.getId());
+            dto.setCustomerName(customerInfo.getCompanyName());
+
+            Map<String, Object> searchParams = new HashMap<>();
+
+            searchParams.put("companyId", subject);
+
+            Map totalMap = workOrderService.countByCustomerId(searchParams);
+
+            int total = 0;
+            BigDecimal amount = BigDecimal.ZERO;
+
+            if (totalMap != null) {
+                if (totalMap.get("count_") != null) {
+                    total = Integer.parseInt(totalMap.get("count_").toString());
+                    amount = new BigDecimal(totalMap.get("price").toString());
+                }
+
+            }
+
+            searchParams.put("status", "1");
+
+            Map completedNumMap = workOrderService.countByCustomerId(searchParams);
+
+            int completedNum = 0;
+
+            if (completedNumMap != null) {
+                if (totalMap.get("count_") != null) {
+                    completedNum = Integer.parseInt(totalMap.get("count_").toString());
+                }
+            }
+
+            dto.setTotal(total);
+            dto.setCompletedNum(completedNum);
+            dto.setAmount(amount);
+
+            messageResult.setData(dto);
+            messageResult.setResult(true);
+
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+
+        return messageResult;
+    }
+
+
+    @ApiOperation(value = "企业信息")
+    @RequestMapping(value = "companyInformation", method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "formId", value = "表单编号", paramType = "form"),
+    })
+    public MessageResult<CustomerDetailDTO> companyInformation(String token, @RequestAttribute String subject) {
+        MessageResult<CustomerDetailDTO> messageResult = new MessageResult<>();
+
+        CustomerInfo customerInfo = customerInfoService.get(subject);
+
+        CustomerDetailDTO dto = new CustomerDetailDTO();
+
+        if (customerInfo != null) {
+            dto.setId(customerInfo.getId());
+            dto.setCompanyName(customerInfo.getCompanyName());
+            dto.setRealName(customerInfo.getRealName());
+            dto.setImage(customerInfo.getImage());
+            dto.setRegion(customerInfo.getRegion());
+            dto.setPhone(customerInfo.getPhone());
+        }
+
+        messageResult.setData(dto);
+        messageResult.setResult(true);
+
+        return messageResult;
+    }
+
+
+    @ApiOperation(value = "修改企业信息")
+    @PostMapping("update")
+    public MessageResult<CustomerInfo> update(@RequestBody CustomerInfo customerInfo, @RequestAttribute String subject) {
+        MessageResult<CustomerInfo> msgResult = new MessageResult<>();
+
+        try {
+            customerInfo.setUpdateBy(subject);
+            customerInfo.setUpdateTime(new Date());
+
+            int affectCount = customerInfoService.update(customerInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(customerInfo);
+            } 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 = "获取企业信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<CustomerInfo> edit(@PathVariable("id") String id) {
+        MessageResult<CustomerInfo> msgResult = new MessageResult<>();
+
+        try {
+            CustomerInfo customerInfo = customerInfoService.get(id);
+
+            if (customerInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(customerInfo);
+            } 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 = "messageTypeList", method = RequestMethod.POST)
+    public MessageResult<List<Map>> messageTypeList(String token, @RequestAttribute String subject) {
+        MessageResult<List<Map>> messageResult = new MessageResult<>();
+
+        CustomerInfo customerInfo = customerInfoService.get(subject);
+
+        List<Map> mapList = messageInfoService.findByRecipientId(customerInfo.getId());
+
+        for (Map map : mapList) {
+            String type = map.get("type").toString();
+            String typeN = dataDictionaryService.findNameByCatalogNameAndValue("消息分类", type);
+            map.put("typeN", typeN);
+        }
+
+        messageResult.setData(mapList);
+        messageResult.setResult(true);
+
+        return messageResult;
+    }
+
+
+    @ApiOperation(value = "消息列表")
+    @RequestMapping(value = "messageList", method = RequestMethod.POST)
+    public MessageResult<List<MessageInfo>> messageTypeList(String type, String token, @RequestAttribute String subject) {
+        MessageResult<List<MessageInfo>> messageResult = new MessageResult<>();
+
+        CustomerInfo customerInfo = customerInfoService.get(subject);
+
+        List<MessageInfo> messageInfoList = messageInfoService.findByRecipientIdAndType(customerInfo.getId(), type);
+
+        messageResult.setData(messageInfoList);
+        messageResult.setResult(true);
+
+        return messageResult;
+    }
+
+
+    @ApiOperation(value = "主页")
+    @RequestMapping(value = "main", method = RequestMethod.POST)
+    public MessageResult<Map<String,Object>> main(String token, @RequestAttribute String subject) {
+        MessageResult<Map<String,Object>> msgResult = new MessageResult<>();
+
+        CustomerInfo customerInfo = customerInfoService.get(subject);
+
+        try {
+            if (customerInfo == null) {
+                throw new Exception("请先登录系统！");
+            }
+
+            Map<String,Object> dataMap = new HashMap();
+
+            Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("companyId", customerInfo.getId());
+
+            Map map = workOrderService.countByCustomerId(searchParams);
+
+            Integer total = 0;
+
+            if (map != null) {
+                total = Integer.parseInt(map.get("count").toString());
+            }
+
+
+            //待接单
+            searchParams.put("status", "1");
+
+            Map map1 = workOrderService.countByCustomerId(searchParams);
+
+            Integer count1 = 0;
+
+            if (map != null) {
+                count1 = Integer.parseInt(map1.get("count").toString());
+            }
+
+            //施工中
+            searchParams.put("status", "2");
+
+            Map map2 = workOrderService.countByCustomerId(searchParams);
+
+            Integer count2 = 0;
+
+            if (map != null) {
+                count2 = Integer.parseInt(map2.get("count").toString());
+            }
+
+
+            //待验收
+            searchParams.put("status", "3");
+
+            Map map3 = workOrderService.countByCustomerId(searchParams);
+
+            Integer count3 = 0;
+
+            if (map != null) {
+                count3 = Integer.parseInt(map3.get("count").toString());
+            }
+
+
+            //待验收
+            searchParams.put("status", "4");
+
+            Map map4 = workOrderService.countByCustomerId(searchParams);
+
+            Integer count4 = 0;
+
+            if (map != null) {
+                count4 = Integer.parseInt(map4.get("count").toString());
+            }
+
+            List<ArgonPartner> argonPartnerList = argonPartnerService.findByCustomerId(customerInfo.getId());
+
+            List<LaborerInfo> laborerInfoList = laborerInfoService.findByCustomerId(customerInfo.getId());
+
+            List<TransportationInfo> transportationInfoList = transportationInfoService.findByCustomerId(customerInfo.getId());
+
+
+            List<String> technicianIdList = workOrderService.findTopByCustomerId(customerInfo.getId());
+
+            List<TechnicianInfo> technicianInfoList = new ArrayList<>();
+
+            for (String technicianId : technicianIdList) {
+                TechnicianInfo technicianInfo = technicianInfoService.get(technicianId);
+
+                if(technicianInfo!=null){
+                    technicianInfoList.add(technicianInfo);
+                }
+            }
+
+
+            dataMap.put("total", total);
+            dataMap.put("count1", count1);
+            dataMap.put("count2", count2);
+            dataMap.put("count3", count3);
+            dataMap.put("count4", count4);
+
+            dataMap.put("argonPartnerList", argonPartnerList);
+            dataMap.put("laborerInfoList", laborerInfoList);
+            dataMap.put("transportationInfoList", transportationInfoList);
+            dataMap.put("technicianInfoList", technicianInfoList);
+
+            msgResult.setResult(true);
+            msgResult.setData(dataMap);
+
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+
+
+    @ApiOperation(value="氩气合作方列表")
+    @RequestMapping(value = "argonPartnerPageList",method = RequestMethod.POST)
+    public MessageResult<Map> argonPartnerPageList(
+            String id,
+            @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(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<ArgonPartner> page = argonPartnerService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+
+
+    @ApiOperation(value="氩气合作方详情")
+    @GetMapping("argonPartnerEdit/{id}")
+    public MessageResult<ArgonPartner> argonPartnerEdit(@PathVariable("id") String id){
+        MessageResult<ArgonPartner> msgResult = new MessageResult<>();
+
+        try {
+            ArgonPartner argonPartner = argonPartnerService.get(id);
+
+            if (argonPartner != null) {
+                msgResult.setResult(true);
+                msgResult.setData(argonPartner);
+            } 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 = "laborerPageList",method = RequestMethod.POST)
+    public MessageResult<Map> laborerPageList(
+            String id,
+            @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(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<LaborerInfo> page = laborerInfoService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="搬运小工信息详情")
+    @GetMapping("laborerEdit/{id}")
+    public MessageResult<LaborerInfo> laborerEdit(@PathVariable("id") String id){
+        MessageResult<LaborerInfo> msgResult = new MessageResult<>();
+
+        try {
+            LaborerInfo laborerInfo = laborerInfoService.get(id);
+
+            if (laborerInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(laborerInfo);
+            } 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 = "transportationPageList",method = RequestMethod.POST)
+    public MessageResult<Map> transportationPageList(
+            String id,
+            @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(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<TransportationInfo> page = transportationInfoService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="运输方信息详情")
+    @GetMapping("transportationEdit/{id}")
+    public MessageResult<TransportationInfo> transportationEdit(@PathVariable("id") String id){
+        MessageResult<TransportationInfo> msgResult = new MessageResult<>();
+
+        try {
+            TransportationInfo transportationInfo = transportationInfoService.get(id);
+
+            if (transportationInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(transportationInfo);
+            } 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 = "workOrderPageList", method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            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<WorkOrder> page = workOrderService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+
+        for (WorkOrder workOrder : page) {
+            CustomerInfo customerInfo = customerInfoService.get(workOrder.getCompanyId());
+            if (customerInfo != null) {
+                workOrder.setCompanyName(customerInfo.getRealName());
+            }
+        }
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+
+}