.idea/workspace.xml

@@ -3,36 +3,50 @@
   <component name="AutoImportSettings">
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" line="63" />
+  </component>
   <component name="ChangeListManager">
-    <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表">
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.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/dao/AboutUsDAO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/AboutUs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/AboutUsService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/AboutUs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/AboutUsController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.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/InstallationRequirement.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/InstallationRequirement.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ReceiveRequire.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ReceiveRequire.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/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/InstallationRequirement.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/InstallationRequirement.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ReceiveRequire.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ReceiveRequire.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/ArgonPartner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/InstallationRequirement.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/InstallationRequirement.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ReceiveRequire.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ReceiveRequire.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CommentInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CommentInfo.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Feedback.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Feedback.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ArgonPartner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/ArgonPartner.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/InstallationRequirement.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/InstallationRequirement.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ReceiveRequire.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/ReceiveRequire.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CommentInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/CommentInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/Feedback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/Feedback.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/LaborerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/LaborerInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TransportationInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TransportationInfo.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/common/target/" />
@@ -50,53 +64,101 @@
       <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="550">
-              <caret line="83" column="64" selection-start-line="83" selection-start-column="64" selection-end-line="83" selection-end-column="64" />
+            <state relative-caret-position="335">
+              <caret line="766" column="60" selection-start-line="766" selection-start-column="60" selection-end-line="766" selection-end-column="60" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AboutUs.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/AboutUs.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="383">
+              <caret line="80" column="64" selection-start-line="80" selection-start-column="64" selection-end-line="80" selection-end-column="64" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AboutUsDAO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/AboutUsDAO.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="15" column="18" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AboutUsService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/AboutUsService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="308">
+              <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AboutUsServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="313">
+              <caret line="58" column="28" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PersonalCenterDTO.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.java">
+      <file leaf-file-name="ArgonPartnerServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ArgonPartnerServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="616">
-              <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
+            <state relative-caret-position="263">
+              <caret line="12" selection-start-line="12" selection-end-line="12" selection-end-column="53" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CustomerInfo.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CustomerInfo.java">
+      <file leaf-file-name="AboutUsController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/AboutUsController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="557">
-              <caret line="79" selection-start-line="79" selection-end-line="80" selection-end-column="32" />
+            <state relative-caret-position="321">
+              <caret line="217" lean-forward="true" selection-start-line="217" selection-end-line="217" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CommentInfo.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml">
+      <file leaf-file-name="PartnerApiController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="17" column="61" lean-forward="true" selection-start-line="17" selection-start-column="61" selection-end-line="17" selection-end-column="61" />
+            <state relative-caret-position="22">
+              <caret line="38" column="64" lean-forward="true" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WorkOrderSubDataDTO.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.java">
+      <file leaf-file-name="ArgonPartnerController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="205">
-              <caret line="80" column="37" lean-forward="true" selection-start-line="80" selection-start-column="37" selection-end-line="80" selection-end-column="37" />
+            <state relative-caret-position="66">
+              <caret line="3" selection-start-line="3" selection-end-line="5" selection-end-column="53" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CustomerInfo.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml">
+      <file leaf-file-name="ArgonPartnerDAO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/ArgonPartnerDAO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="124" column="17" lean-forward="true" selection-start-line="124" selection-start-column="17" selection-end-line="124" selection-end-column="17" />
+            <state relative-caret-position="132">
+              <caret line="6" selection-start-line="6" selection-end-line="6" selection-end-column="53" />
             </state>
           </provider>
         </entry>
@@ -128,33 +190,45 @@
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" />
-        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" />
-        <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java" />
-        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" />
-        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" />
-        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java" />
-        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/InstallationRequirement.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ReceiveRequire.java" />
         <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/ReceiveRequire.xml" />
-        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" />
-        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.java" />
         <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" />
         <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/InstallationRequirement.xml" />
-        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CustomerInfo.java" />
         <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" />
+        <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.java" />
+        <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/AboutUsDAO.java" />
+        <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/AboutUsController.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/AboutUsService.java" />
+        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/AboutUs.xml" />
         <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" />
       </list>
     </option>
@@ -212,9 +286,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -225,120 +297,20 @@
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="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="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="employment" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="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="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="employment" type="462c0819:PsiDirectoryNode" />
-              <item name="modules" type="462c0819:PsiDirectoryNode" />
-              <item name="base" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="employment" type="462c0819:PsiDirectoryNode" />
-              <item name="modules" type="462c0819:PsiDirectoryNode" />
-              <item name="base" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="employment" type="462c0819:PsiDirectoryNode" />
-              <item name="modules" type="462c0819:PsiDirectoryNode" />
-              <item name="base" type="462c0819:PsiDirectoryNode" />
-              <item name="entity" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
-              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-              <item name="base" type="462c0819:PsiDirectoryNode" />
+              <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" />
@@ -346,6 +318,7 @@
               <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" />
@@ -354,6 +327,7 @@
               <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" />
@@ -363,6 +337,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="employment" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
@@ -408,6 +383,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -427,6 +404,13 @@
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.jpsoft.employment.modules.mobile.controller" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\java\idea-workspace\water-tank-installation-server\web\src\main\java\com\jpsoft\employment\modules\base\controller" />
+      <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\java\com\jpsoft\employment\modules\base\service\impl" />
+      <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\java\com\jpsoft\employment\modules\base\service" />
+      <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\java\com\jpsoft\employment\modules\base\dao" />
+      <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\resources\mapper\base" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -478,7 +462,8 @@
       <updated>1758679290408</updated>
       <workItem from="1760314946411" duration="4437000" />
       <workItem from="1760319444506" duration="21323000" />
-      <workItem from="1760401405905" duration="17444000" />
+      <workItem from="1760401405905" duration="24894000" />
+      <workItem from="1760488615175" duration="7487000" />
     </task>
     <task id="LOCAL-00001" summary="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口">
       <created>1760164729546</created>
@@ -501,11 +486,18 @@
       <option name="project" value="LOCAL" />
       <updated>1760340817161</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="客户主页后台提交工单接口修改">
+      <created>1760426361907</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1760426361907</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="61588000" />
+    <option name="totallyTimeSpent" value="76525000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
@@ -521,7 +513,7 @@
       <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="4" />
-      <window_info anchor="bottom" id="Debug" order="4" weight="0.3772049" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.5088195" />
       <window_info anchor="bottom" id="TODO" order="7" />
       <window_info anchor="bottom" id="Messages" order="0" weight="0.32971507" />
       <window_info anchor="right" id="Palette&#9;" order="6" />
@@ -532,7 +524,7 @@
       <window_info anchor="bottom" id="Run" order="3" weight="0.5468114" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25899744" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.26156813" />
       <window_info anchor="right" id="Bean Validation" order="8" weight="0.32969153" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info anchor="right" id="Theme Preview" order="7" />
@@ -544,6 +536,40 @@
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="Find" order="2" />
     </layout>
+    <layout-to-restore>
+      <window_info id="Designer" order="2" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="bottom" id="Run" order="3" weight="0.5468114" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info id="Image Layers" order="3" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info id="Capture Tool" order="7" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="bottom" id="Event Log" order="13" side_tool="true" weight="0.32971507" />
+      <window_info anchor="bottom" id="Messages" order="0" weight="0.32971507" />
+      <window_info anchor="bottom" id="TODO" order="7" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Java Enterprise" order="10" />
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="12" weight="0.32971507" />
+      <window_info anchor="right" id="Maven Projects" order="9" weight="0.32969153" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26156813" />
+      <window_info anchor="right" id="Database" order="5" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info id="Web" order="6" side_tool="true" />
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info anchor="right" id="Theme Preview" order="7" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.5088195" />
+      <window_info anchor="right" id="Bean Validation" order="8" weight="0.32969153" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -591,7 +617,8 @@
     <MESSAGE value="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口" />
     <MESSAGE value="客户端移动端接口&#10;1.客户主页&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
     <MESSAGE value="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
-    <option name="LAST_COMMIT_MESSAGE" value="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
+    <MESSAGE value="客户主页后台提交工单接口修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="客户主页后台提交工单接口修改" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -603,363 +630,381 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="15" column="45" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
+        <state relative-caret-position="307">
+          <caret line="164" column="38" lean-forward="true" selection-start-line="164" selection-start-column="38" selection-end-line="164" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/pom.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/InstallationRequirement.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="23" lean-forward="true" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
+        <state relative-caret-position="401">
+          <caret line="49" column="25" lean-forward="true" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java">
+    <entry file="jar://$PROJECT_DIR$/../../apache-maven-3.3.9/maven-repository/org/springframework/spring-core/5.3.2/spring-core-5.3.2-sources.jar!/org/springframework/cglib/proxy/MethodProxy.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="30">
+          <caret line="220" selection-start-line="220" selection-end-line="220" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/pom.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/InstallationRequirement.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
+        <state relative-caret-position="259">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="22" column="48" lean-forward="true" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
+        <state relative-caret-position="220">
+          <caret line="124" column="17" lean-forward="true" selection-start-line="124" selection-start-column="17" selection-end-line="124" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="86" column="13" lean-forward="true" selection-start-line="86" selection-start-column="13" selection-end-line="86" selection-end-column="13" />
+        <state relative-caret-position="205">
+          <caret line="80" column="37" lean-forward="true" selection-start-line="80" selection-start-column="37" selection-end-line="80" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/TechnicianInfoController.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="201" selection-start-line="201" selection-end-line="201" />
+        <state relative-caret-position="616">
+          <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="49" column="42" selection-start-line="49" selection-start-column="42" selection-end-line="49" selection-end-column="42" />
+        <state relative-caret-position="198">
+          <caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="445">
-          <caret line="53" column="28" selection-start-line="53" selection-start-column="28" selection-end-line="53" selection-end-column="28" />
+        <state relative-caret-position="361">
+          <caret line="22" column="30" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="511">
-          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+        <state relative-caret-position="374">
+          <caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="836">
-          <caret line="46" column="48" lean-forward="true" selection-start-line="46" selection-start-column="48" selection-end-line="46" selection-end-column="48" />
+        <state relative-caret-position="6072">
+          <caret line="290" column="40" selection-start-line="290" selection-start-column="40" selection-end-line="290" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="35">
-          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
+        <state relative-caret-position="572">
+          <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
-          <caret line="102" column="64" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
+        <state relative-caret-position="4466">
+          <caret line="203" column="64" selection-start-line="203" selection-start-column="64" selection-end-line="203" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ArgonPartnerService.java">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/CommentInfoController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+        <state relative-caret-position="3938">
+          <caret line="194" selection-start-line="194" selection-end-line="225" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ArgonPartnerServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CommentInfoServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        <state relative-caret-position="1298">
+          <caret line="70" column="31" selection-start-line="70" selection-start-column="31" selection-end-line="70" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/ArgonPartnerDAO.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CommentInfoDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
+        <state relative-caret-position="286">
+          <caret line="17" column="22" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="89" column="87" lean-forward="true" selection-start-line="89" selection-start-column="41" selection-end-line="89" selection-end-column="87" />
+        <state relative-caret-position="2398">
+          <caret line="109" column="28" selection-start-line="109" selection-start-column="28" selection-end-line="109" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CommentInfoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ArgonPartnerService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/LaborerInfoService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
+        <state relative-caret-position="286">
+          <caret line="17" column="22" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="58" column="32" lean-forward="true" selection-start-line="58" selection-start-column="32" selection-end-line="58" selection-end-column="32" />
+        <state relative-caret-position="469">
+          <caret line="78" column="32" selection-start-line="78" selection-start-column="32" selection-end-line="78" selection-end-column="32" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+        <state relative-caret-position="308">
+          <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2002">
-          <caret line="91" column="86" selection-start-line="91" selection-start-column="86" selection-end-line="91" selection-end-column="86" />
+        <state relative-caret-position="469">
+          <caret line="115" column="25" selection-start-line="115" selection-start-column="25" selection-end-line="115" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TransportationInfoService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
+        <state relative-caret-position="286">
+          <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1034">
-          <caret line="58" column="40" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
+        <state relative-caret-position="513">
+          <caret line="69" column="38" selection-start-line="69" selection-start-column="38" selection-end-line="69" selection-end-column="38" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
+        <state relative-caret-position="286">
+          <caret line="17" column="29" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1848">
-          <caret line="84" column="93" selection-start-line="84" selection-start-column="93" selection-end-line="84" selection-end-column="93" />
+        <state relative-caret-position="379">
+          <caret line="107" column="26" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/../../apache-maven-3.3.9/maven-repository/org/springframework/spring-web/5.3.2/spring-web-5.3.2-sources.jar!/org/springframework/web/bind/annotation/PathVariable.java">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="32" column="2" lean-forward="true" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
+        <state relative-caret-position="453">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="46" selection-end-line="61" selection-end-column="56" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
+        <state relative-caret-position="132">
+          <caret line="7" selection-start-line="7" selection-end-line="8" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="11" selection-start-line="11" selection-end-line="18" selection-end-column="42" />
+        <state relative-caret-position="352">
+          <caret line="16" column="37" lean-forward="true" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-457">
-          <caret line="37" column="43" lean-forward="true" selection-start-line="37" selection-start-column="43" selection-end-line="37" selection-end-column="43" />
+        <state relative-caret-position="711">
+          <caret line="47" column="4" lean-forward="true" selection-start-line="47" selection-start-column="4" selection-end-line="47" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CustomerInfo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1408">
-          <caret line="90" column="25" selection-start-line="90" selection-start-column="20" selection-end-line="90" selection-end-column="25" />
+        <state relative-caret-position="379">
+          <caret line="39" selection-start-line="39" selection-end-line="40" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ReceiveRequire.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="87" column="22" selection-start-line="87" selection-start-column="22" selection-end-line="87" selection-end-column="22" />
+        <state relative-caret-position="506">
+          <caret line="23" column="36" selection-start-line="23" selection-start-column="36" selection-end-line="23" selection-end-column="36" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ReceiveRequire.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1039">
-          <caret line="59" column="25" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="25" />
+        <state relative-caret-position="577">
+          <caret line="57" column="23" selection-start-line="57" selection-start-column="19" selection-end-line="57" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/sys/service/DataDictionaryService.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/FeedbackService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="22" column="24" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="24" />
+        <state relative-caret-position="242">
+          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/../../apache-maven-3.3.9/maven-repository/org/springframework/spring-web/5.3.2/spring-web-5.3.2-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/FeedbackServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="563">
-          <caret line="205" selection-start-line="205" selection-end-line="205" />
+        <state relative-caret-position="469">
+          <caret line="64" column="29" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/FeedbackDAO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
-          <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+          <caret line="16" column="19" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="74" column="37" selection-start-line="74" selection-start-column="37" selection-end-line="74" selection-end-column="37" />
+        <state relative-caret-position="417">
+          <caret line="102" column="26" selection-start-line="102" selection-start-column="26" selection-end-line="102" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/FeedbackController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="164" column="38" lean-forward="true" selection-start-line="164" selection-start-column="38" selection-end-line="164" selection-end-column="38" />
+        <state relative-caret-position="277">
+          <caret line="41" selection-start-line="41" selection-end-line="70" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/AboutUs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
+        <state relative-caret-position="330">
+          <caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/InstallationRequirement.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="401">
-          <caret line="49" column="25" lean-forward="true" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" />
+        <state relative-caret-position="110">
+          <caret line="5" column="84" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="84" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/ArgonPartnerDAO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
-          <caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
+          <caret line="6" selection-start-line="6" selection-end-line="6" selection-end-column="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="704">
-          <caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/../../apache-maven-3.3.9/maven-repository/org/springframework/spring-core/5.3.2/spring-core-5.3.2-sources.jar!/org/springframework/cglib/proxy/MethodProxy.java">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="220" selection-start-line="220" selection-end-line="220" />
+        <state relative-caret-position="66">
+          <caret line="3" selection-start-line="3" selection-end-line="5" selection-end-column="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/InstallationRequirement.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ArgonPartnerServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="259">
-          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        <state relative-caret-position="263">
+          <caret line="12" selection-start-line="12" selection-end-line="12" selection-end-column="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/AboutUsController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="955">
-          <caret line="66" column="36" selection-start-line="66" selection-start-column="36" selection-end-line="66" selection-end-column="36" />
+        <state relative-caret-position="321">
+          <caret line="217" lean-forward="true" selection-start-line="217" selection-end-line="217" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="17" column="61" lean-forward="true" selection-start-line="17" selection-start-column="61" selection-end-line="17" selection-end-column="61" />
+        <state relative-caret-position="22">
+          <caret line="38" column="64" lean-forward="true" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/AboutUsService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="124" column="17" lean-forward="true" selection-start-line="124" selection-start-column="17" selection-end-line="124" selection-end-column="17" />
+        <state relative-caret-position="308">
+          <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CustomerInfo.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="557">
-          <caret line="79" selection-start-line="79" selection-end-line="80" selection-end-column="32" />
+        <state relative-caret-position="313">
+          <caret line="58" column="28" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/AboutUsDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="80" column="37" lean-forward="true" selection-start-line="80" selection-start-column="37" selection-end-line="80" selection-end-column="37" />
+        <state relative-caret-position="330">
+          <caret line="15" column="18" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/AboutUs.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
+        <state relative-caret-position="383">
+          <caret line="80" column="64" selection-start-line="80" selection-start-column="64" selection-end-line="80" selection-end-column="64" />
         </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="550">
-          <caret line="83" column="64" selection-start-line="83" selection-start-column="64" selection-end-line="83" selection-end-column="64" />
+        <state relative-caret-position="335">
+          <caret line="766" column="60" selection-start-line="766" selection-start-column="60" selection-end-line="766" selection-end-column="60" />
         </state>
       </provider>
     </entry>

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

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.employment.modules.base.entity.AboutUs;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface AboutUsDAO {
+	int insert(AboutUs entity);
+	int update(AboutUs entity);
+	int exist(String id);
+	AboutUs get(String id);
+	int delete(String id);
+	List<AboutUs> list();
+	List<AboutUs> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

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

@@ -30,5 +30,7 @@ public interface WorkOrderDAO {
 
 	Map countByCustomerId(@Param("searchParams") Map<String, Object> searchParams);
 
+	Integer countByTechnicianId(@Param("searchParams") Map<String, Object> searchParams);
+
 	List<String> findTopByCustomerId(String customerId);
 }

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

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EnterCertificationDTO {
+    @ApiModelProperty(value = "企业Id")
+    private String id;
+
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String businessCode;
+
+    @ApiModelProperty(value = "营业执照")
+    private String businessLicense;
+}

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

@@ -0,0 +1,29 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EnterInfoDTO {
+
+    @ApiModelProperty(value = "企业Id")
+    private String id;
+
+    @ApiModelProperty(value = "头像")
+    private String image;
+
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String businessCode;
+
+    @ApiModelProperty(value = "所在地区")
+    private String region;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String realName;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+}

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

@@ -31,4 +31,7 @@ public class TechnicianDTO {
     @ApiModelProperty(value = "合作单数")
     private Integer cooperationNum;
 
+    @ApiModelProperty(value = "服务信息")
+    private String serviceInfo;
+
 }

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

@@ -0,0 +1,50 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_about_us的实体类
+ */
+@Data
+@ApiModel(value = "base_about_us的实体类")
+public class AboutUs {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "用户协议")
+	private String userAgreement;
+	
+				@ApiModelProperty(value = "隐私协议")
+	private String privacyPolicy;
+	
+				@ApiModelProperty(value = "免责条款")
+	private String disclaimer;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+				@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "删除标示")
+	private Boolean delFlag;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+				@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+		}

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

@@ -60,9 +60,15 @@ public class CommentInfo {
 				@ApiModelProperty(value = "更新人")
 	private String updateBy;
 
+	@ApiModelProperty(value = "师傅ID")
+	private String technicianId;
 
 				@Transient
 	@ApiModelProperty(value = "评价客户")
 	private String companyName;
+
+
+
+
 	
 		}

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

@@ -46,5 +46,15 @@ public class Feedback {
 	
 				@ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+
+	@ApiModelProperty(value = "企业ID")
+	private String companyId;
+
+	@ApiModelProperty(value = "图片")
+	private String image;
+
+	@ApiModelProperty(value = "图片")
+	private String type;
 	
 		}

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

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.employment.modules.base.entity.AboutUs;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface AboutUsService {
+	AboutUs get(String id);
+	boolean exist(String id);
+	int insert(AboutUs model);
+	int update(AboutUs model);
+	int delete(String id);
+	List<AboutUs> list();
+	Page<AboutUs> pageSearch(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

@@ -22,4 +22,5 @@ public interface WorkOrderService {
 	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);
+	Integer countByTechnicianId(Map<String, Object> searchParams);
 }

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

@@ -0,0 +1,70 @@
+package com.jpsoft.employment.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.employment.modules.base.dao.AboutUsDAO;
+import com.jpsoft.employment.modules.base.entity.AboutUs;
+import com.jpsoft.employment.modules.base.service.AboutUsService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="aboutUsService")
+public class AboutUsServiceImpl implements AboutUsService {
+	@Resource(name="aboutUsDAO")
+	private AboutUsDAO aboutUsDAO;
+
+	@Override
+	public AboutUs get(String id) {
+		// TODO Auto-generated method stub
+		return aboutUsDAO.get(id);
+	}
+
+	@Override
+	public int insert(AboutUs model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return aboutUsDAO.insert(model);
+	}
+
+	@Override
+	public int update(AboutUs model) {
+		// TODO Auto-generated method stub
+		return aboutUsDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return aboutUsDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = aboutUsDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<AboutUs> list() {
+		// TODO Auto-generated method stub
+		return aboutUsDAO.list();
+	}
+		
+	@Override
+	public Page<AboutUs> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<AboutUs> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            aboutUsDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

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

@@ -286,6 +286,11 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         return workOrderDAO.countByCustomerId(searchParams);
     }
 
+    @Override
+    public Integer countByTechnicianId(Map<String, Object> searchParams){
+        return workOrderDAO.countByTechnicianId(searchParams);
+    }
+
 
     @Override
     public List<String> findTopByCustomerId(String customerId) {

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

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

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

@@ -112,8 +112,8 @@
 		]]>
 		<where>
 			del_flag=false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -16,6 +16,7 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+			<result property="technicianId" column="technician_id" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.CommentInfo">
 	<!--
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_comment_info
-	    (id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,update_time,del_flag,create_by,update_by,technician_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{technicianId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -82,12 +84,14 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="technicianId!=null">
+				technician_id=#{technicianId,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="CommentInfoMap">
-		select 
-id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,update_time,del_flag,create_by,update_by		from base_comment_info where id_=#{0}
+		select * from base_comment_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_comment_info where id_=#{0}
@@ -98,15 +102,18 @@ id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,u
 	<select id="findByWorkOrderId" resultMap="CommentInfoMap">
 		select * from base_comment_info where del_flag=false and work_order_id=#{0}
 	</select>
-
 	<select id="search" parameterType="hashmap" resultMap="CommentInfoMap">
 		<![CDATA[
 			select * from base_comment_info
 		]]>
 		<where>
+			del_flag = false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>
+			<if test="searchParams.technicianId != null">
+				and technician_id = #{searchParams.technicianId}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -13,6 +13,10 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+			<result property="companyId" column="company_id" />
+			<result property="image" column="image_" />
+			<result property="type" column="type_" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.Feedback">
 	<!--
@@ -22,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_feedback
-	    (id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,update_by,company_id,image_,type_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -34,6 +38,9 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{image,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -67,12 +74,20 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="companyId!=null">
+				company_id=#{companyId,jdbcType=VARCHAR},
+			</if>
+			<if test="image!=null">
+				image_=#{image,jdbcType=VARCHAR},
+			</if>
+			<if test="type!=null">
+				type_=#{type,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="FeedbackMap">
-		select 
-id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,update_by		from base_feedback where id_=#{0}
+		select * from base_feedback where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_feedback where id_=#{0}
@@ -85,6 +100,7 @@ id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,upd
 			select * from base_feedback
 		]]>
 		<where>
+			del_flag=false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

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

@@ -112,8 +112,8 @@
 			select * from base_laborer_info
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -105,8 +105,9 @@
 			select * from base_transportation_info
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag=false
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -196,6 +196,18 @@
 			</if>
 		</where>
 	</select>
+	<select id="countByTechnicianId" resultType="java.lang.Integer">
+		select count(id_) from base_work_order
+		<where>
+			del_flag = false
+			<if test="searchParams.technicianId != null">
+				and technician_id = #{searchParams.technicianId}
+			</if>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+		</where>
+	</select>
 	<select id="findTopByCustomerId" resultType="java.lang.String">
 		select technician_id from base_work_order where del_flag = false and company_id = #{0}
 		order by create_time desc limit 3

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

@@ -112,8 +112,8 @@
 		]]>
 		<where>
 			del_flag=false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -16,6 +16,7 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+			<result property="technicianId" column="technician_id" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.CommentInfo">
 	<!--
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_comment_info
-	    (id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,update_time,del_flag,create_by,update_by,technician_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{technicianId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -82,12 +84,14 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="technicianId!=null">
+				technician_id=#{technicianId,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="CommentInfoMap">
-		select 
-id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,update_time,del_flag,create_by,update_by		from base_comment_info where id_=#{0}
+		select * from base_comment_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_comment_info where id_=#{0}
@@ -98,15 +102,18 @@ id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,u
 	<select id="findByWorkOrderId" resultMap="CommentInfoMap">
 		select * from base_comment_info where del_flag=false and work_order_id=#{0}
 	</select>
-
 	<select id="search" parameterType="hashmap" resultMap="CommentInfoMap">
 		<![CDATA[
 			select * from base_comment_info
 		]]>
 		<where>
+			del_flag = false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>
+			<if test="searchParams.technicianId != null">
+				and technician_id = #{searchParams.technicianId}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -23,6 +23,8 @@
 			<result property="companyName" column="company_name" />
 			<result property="status" column="status_" />
 			<result property="businessLicense" column="business_license" />
+			<result property="businessCode" column="business_code" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.CustomerInfo">
 	<!--
@@ -32,7 +34,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_,business_license)
+	    (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,business_code)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -54,6 +56,7 @@
 ,#{companyName,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{businessLicense,jdbcType=VARCHAR}
+,#{businessCode,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -117,6 +120,9 @@
 			<if test="businessLicense!=null">
 				business_license=#{businessLicense,jdbcType=VARCHAR},
 			</if>
+			<if test="businessCode!=null">
+				business_code=#{businessCode,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -13,6 +13,10 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+			<result property="companyId" column="company_id" />
+			<result property="image" column="image_" />
+			<result property="type" column="type_" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.Feedback">
 	<!--
@@ -22,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_feedback
-	    (id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,update_by,company_id,image_,type_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -34,6 +38,9 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{image,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -67,12 +74,20 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="companyId!=null">
+				company_id=#{companyId,jdbcType=VARCHAR},
+			</if>
+			<if test="image!=null">
+				image_=#{image,jdbcType=VARCHAR},
+			</if>
+			<if test="type!=null">
+				type_=#{type,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="FeedbackMap">
-		select 
-id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,update_by		from base_feedback where id_=#{0}
+		select * from base_feedback where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_feedback where id_=#{0}
@@ -85,6 +100,7 @@ id_,title_,content_,technician_id,create_time,update_time,del_flag,create_by,upd
 			select * from base_feedback
 		]]>
 		<where>
+			del_flag=false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

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

@@ -112,8 +112,8 @@
 			select * from base_laborer_info
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -170,7 +170,7 @@
 			select * from base_technician_info
 		]]>
 		<where>
-			del_flag = fasle
+			del_flag = false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

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

@@ -105,8 +105,9 @@
 			select * from base_transportation_info
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag=false
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -196,6 +196,18 @@
 			</if>
 		</where>
 	</select>
+	<select id="countByTechnicianId" resultType="java.lang.Integer">
+		select count(id_) from base_work_order
+		<where>
+			del_flag = false
+			<if test="searchParams.technicianId != null">
+				and technician_id = #{searchParams.technicianId}
+			</if>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+		</where>
+	</select>
 	<select id="findTopByCustomerId" resultType="java.lang.String">
 		select technician_id from base_work_order where del_flag = false and company_id = #{0}
 		order by create_time desc limit 3

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

@@ -59,9 +59,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/technician/wxLogin")
 				.excludePathPatterns("/generateCaptCha")
 				.excludePathPatterns("/mobile/customerInfoApi/findByOpenId")
-				.excludePathPatterns("/mobile/customerInfoApi/argonPartnerPageList")
-				.excludePathPatterns("/mobile/customerInfoApi/laborerPageList")
-				.excludePathPatterns("/mobile/customerInfoApi/transportationPageList")
+				.excludePathPatterns("/mobile/partnerApi/**")
 		;
 	}
 }

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

@@ -0,0 +1,227 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.base.entity.AboutUs;
+import com.jpsoft.employment.modules.base.service.AboutUsService;
+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.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/aboutUs")
+public class AboutUsController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private AboutUsService aboutUsService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<AboutUs> create(){
+        MessageResult<AboutUs> msgResult = new MessageResult<>();
+
+        AboutUs aboutUs = new AboutUs();
+
+        msgResult.setData(aboutUs);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<AboutUs> add(@RequestBody AboutUs aboutUs,@RequestAttribute String subject){
+        MessageResult<AboutUs> msgResult = new MessageResult<>();
+
+        try {
+            aboutUs.setId(UUID.randomUUID().toString());
+			aboutUs.setDelFlag(false);
+            aboutUs.setCreateBy(subject);
+            aboutUs.setCreateTime(new Date());
+
+            int affectCount = aboutUsService.insert(aboutUs);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(aboutUs);
+            } 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<AboutUs> edit(@PathVariable("id") String id){
+        MessageResult<AboutUs> msgResult = new MessageResult<>();
+
+        try {
+            AboutUs aboutUs = aboutUsService.get(id);
+
+            if (aboutUs != null) {
+                msgResult.setResult(true);
+                msgResult.setData(aboutUs);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<AboutUs> update(@RequestBody AboutUs aboutUs,@RequestAttribute String subject){
+        MessageResult<AboutUs> msgResult = new MessageResult<>();
+
+        try {
+		    aboutUs.setUpdateBy(subject);
+            aboutUs.setUpdateTime(new Date());
+		
+            int affectCount = aboutUsService.update(aboutUs);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(aboutUs);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<AboutUs> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<AboutUs> msgResult = new MessageResult<>();
+
+        try {
+			
+			AboutUs aboutUs = aboutUsService.get(id);
+            aboutUs.setDelFlag(true);
+            aboutUs.setUpdateBy(subject);
+            aboutUs.setUpdateTime(new Date());
+			
+			int affectCount = aboutUsService.update(aboutUs);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                AboutUs aboutUs = aboutUsService.get(id);
+                aboutUs.setDelFlag(true);
+                aboutUs.setUpdateBy(subject);
+                aboutUs.setUpdateTime(new Date());
+
+                affectCount += aboutUsService.update(aboutUs);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } 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 = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            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("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<AboutUs> page = aboutUsService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

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

@@ -3,10 +3,7 @@ package com.jpsoft.employment.modules.mobile.controller;
 
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.exception.CustomException;
-import com.jpsoft.employment.modules.base.dto.CustomerDetailDTO;
-import com.jpsoft.employment.modules.base.dto.PersonalCenterDTO;
-import com.jpsoft.employment.modules.base.dto.WorkOrderAllDataDTO;
-import com.jpsoft.employment.modules.base.dto.WorkOrderSubDataDTO;
+import com.jpsoft.employment.modules.base.dto.*;
 import com.jpsoft.employment.modules.base.entity.*;
 import com.jpsoft.employment.modules.base.service.*;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
@@ -63,6 +60,15 @@ public class CustomerInfoApiController {
     @Autowired
     private TechnicianInfoService technicianInfoService;
 
+    @Autowired
+    private CommentInfoService commentInfoService;
+
+    @Autowired
+    private FeedbackService feedbackService;
+
+    @Autowired
+    private AboutUsService aboutUsService;
+
     @ApiOperation(value = "个人中心")
     @RequestMapping(value = "personalCenter", method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -164,10 +170,18 @@ public class CustomerInfoApiController {
 
     @ApiOperation(value = "修改企业信息")
     @PostMapping("update")
-    public MessageResult<CustomerInfo> update(@RequestBody CustomerInfo customerInfo, @RequestAttribute String subject) {
+    public MessageResult<CustomerInfo> update(@RequestBody EnterInfoDTO dto, @RequestAttribute String subject) {
         MessageResult<CustomerInfo> msgResult = new MessageResult<>();
 
         try {
+            CustomerInfo customerInfo = customerInfoService.get(dto.getId());
+
+            customerInfo.setImage(dto.getImage());
+            customerInfo.setPhone(dto.getPhone());
+            customerInfo.setRealName(dto.getRealName());
+            customerInfo.setRegion(dto.getRegion());
+            customerInfo.setBusinessCode(dto.getBusinessCode());
+            customerInfo.setCompanyName(dto.getCompanyName());
             customerInfo.setUpdateBy(subject);
             customerInfo.setUpdateTime(new Date());
 
@@ -192,16 +206,25 @@ public class CustomerInfoApiController {
 
 
     @ApiOperation(value = "获取企业信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<CustomerInfo> edit(@PathVariable("id") String id) {
-        MessageResult<CustomerInfo> msgResult = new MessageResult<>();
+    @GetMapping("edit")
+    public MessageResult<EnterInfoDTO> edit(String token, @RequestAttribute String subject) {
+        MessageResult<EnterInfoDTO> msgResult = new MessageResult<>();
 
         try {
-            CustomerInfo customerInfo = customerInfoService.get(id);
+            CustomerInfo customerInfo = customerInfoService.get(subject);
 
             if (customerInfo != null) {
+                EnterInfoDTO dto = new EnterInfoDTO();
+                dto.setId(customerInfo.getId());
+                dto.setImage(customerInfo.getImage());
+                dto.setPhone(customerInfo.getPhone());
+                dto.setRealName(customerInfo.getRealName());
+                dto.setRegion(customerInfo.getRegion());
+                dto.setBusinessCode(customerInfo.getBusinessCode());
+                dto.setCompanyName(customerInfo.getCompanyName());
+
                 msgResult.setResult(true);
-                msgResult.setData(customerInfo);
+                msgResult.setData(dto);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
@@ -372,10 +395,13 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value = "氩气合作方列表")
-    @RequestMapping(value = "argonPartnerPageList", method = RequestMethod.POST)
-    public MessageResult<Map> argonPartnerPageList(
-            String id,
+
+
+
+    @ApiOperation(value = "工单列表")
+    @RequestMapping(value = "workOrderPageList", method = RequestMethod.POST)
+    public MessageResult<Map> workOrderPageList(
+            String status,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
             HttpServletRequest request) {
@@ -391,12 +417,19 @@ public class CustomerInfoApiController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time", "desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id", "%" + id + "%");
+        if (StringUtils.isNotEmpty(status)) {
+            searchParams.put("status", status);
         }
 
 
-        Page<ArgonPartner> page = argonPartnerService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+        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);
@@ -406,17 +439,19 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value = "氩气合作方详情")
-    @GetMapping("argonPartnerEdit/{id}")
-    public MessageResult<ArgonPartner> argonPartnerEdit(@PathVariable("id") String id) {
-        MessageResult<ArgonPartner> msgResult = new MessageResult<>();
+    @ApiOperation(value = "获取工单详情")
+    @GetMapping("workOrderEdit/{id}")
+    public MessageResult<WorkOrderAllDataDTO> workOrderEdit(@PathVariable("id") String id) {
+        MessageResult<WorkOrderAllDataDTO> msgResult = new MessageResult<>();
 
         try {
-            ArgonPartner argonPartner = argonPartnerService.get(id);
+            WorkOrder workOrder = workOrderService.get(id);
+
+            if (workOrder != null) {
+                WorkOrderAllDataDTO dto = workOrderService.getDtoList(workOrder);
 
-            if (argonPartner != null) {
                 msgResult.setResult(true);
-                msgResult.setData(argonPartner);
+                msgResult.setData(dto);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
@@ -432,54 +467,21 @@ public class CustomerInfoApiController {
     }
 
 
-    @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<>();
+    @ApiOperation(value = "工单提交")
+    @PostMapping("workOrderAdd")
+    public MessageResult<Integer> workOrderAdd(@RequestBody WorkOrderSubDataDTO dto, String token, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
-            LaborerInfo laborerInfo = laborerInfoService.get(id);
 
-            if (laborerInfo != null) {
+            int affectCount = workOrderService.insertDTO(dto, subject);
+
+            if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData(laborerInfo);
+                msgResult.setData(affectCount);
             } else {
                 msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
+                msgResult.setMessage("数据库添加失败");
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
@@ -492,10 +494,10 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value = "运输方列表")
-    @RequestMapping(value = "transportationPageList", method = RequestMethod.POST)
-    public MessageResult<Map> transportationPageList(
-            String id,
+    @ApiOperation(value = "师傅列表")
+    @RequestMapping(value = "technicianPageList", method = RequestMethod.POST)
+    public MessageResult<Map> technicianPageList(
+            String status,String token,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
             HttpServletRequest request) {
@@ -511,12 +513,12 @@ public class CustomerInfoApiController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time", "desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id", "%" + id + "%");
+        if (StringUtils.isNotEmpty(status)) {
+            searchParams.put("status", status);
         }
 
 
-        Page<TransportationInfo> page = transportationInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+        Page<TechnicianInfo> page = technicianInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
 
 
         msgResult.setResult(true);
@@ -526,17 +528,33 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value = "运输方信息详情")
-    @GetMapping("transportationEdit/{id}")
-    public MessageResult<TransportationInfo> transportationEdit(@PathVariable("id") String id) {
-        MessageResult<TransportationInfo> msgResult = new MessageResult<>();
+
+    @ApiOperation(value = "主页师傅详情")
+    @GetMapping("technicianDetail/{id}")
+    public MessageResult<TechnicianDTO> technicianDetail(@PathVariable("id") String id) {
+        MessageResult<TechnicianDTO> msgResult = new MessageResult<>();
 
         try {
-            TransportationInfo transportationInfo = transportationInfoService.get(id);
+            TechnicianInfo technicianInfo = technicianInfoService.get(id);
+
+            if (technicianInfo != null) {
+                TechnicianDTO dto = new TechnicianDTO();
+                dto.setId(technicianInfo.getId());
+                dto.setLevel(technicianInfo.getLevel());
+                dto.setName(technicianInfo.getRealName());
+                dto.setRegion(technicianInfo.getRegion());
+                dto.setIsVerified(technicianInfo.getIsVerified());
+                dto.setServiceInfo(technicianInfo.getServiceInfo());
+
+                Map<String, Object> searchParams = new HashMap<>();
+                searchParams.put("technicianId",id);
+
+                Integer completeOrderNum =  workOrderService.countByTechnicianId(searchParams);
+
+                dto.setCompleteOrderNum(completeOrderNum);
 
-            if (transportationInfo != null) {
                 msgResult.setResult(true);
-                msgResult.setData(transportationInfo);
+                msgResult.setData(dto);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
@@ -552,38 +570,30 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value = "工单列表")
-    @RequestMapping(value = "workOrderPageList", method = RequestMethod.POST)
-    public MessageResult<Map> workOrderPageList(
-            String status,
-            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
-            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
-            HttpServletRequest request) {
-        String subject = (String) request.getAttribute("subject");
+    @ApiOperation(value="师傅主页评价列表")
+    @RequestMapping(value = "commentPageList",method = RequestMethod.POST)
+    public MessageResult<Map> commentPageList(
+            String technicianid,
+            @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<>();
+        Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time", "desc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status", status);
+        if (StringUtils.isNotEmpty(technicianid)) {
+            searchParams.put("technicianid",technicianid);
         }
 
-
-        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());
-            }
-        }
+        Page<CommentInfo> page = commentInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
 
         msgResult.setResult(true);
@@ -593,49 +603,90 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value = "获取工单详情")
-    @GetMapping("workOrderEdit/{id}")
-    public MessageResult<WorkOrderAllDataDTO> workOrderEdit(@PathVariable("id") String id) {
-        MessageResult<WorkOrderAllDataDTO> msgResult = new MessageResult<>();
+    @GetMapping("findByOpenId")
+    public MessageResult<Map> findByOpenId(String openId) {
+        MessageResult<Map> msgResult = new MessageResult<>();
 
         try {
-            WorkOrder workOrder = workOrderService.get(id);
 
-            if (workOrder != null) {
-                WorkOrderAllDataDTO dto = workOrderService.getDtoList(workOrder);
+            CustomerInfo customerInfo = customerInfoService.findByOpenId(openId);
 
+            if (customerInfo != null) {
+                String token = JwtUtil.createToken(jwtSecret, customerInfo.getId(), DateTime.now().plusDays(7).toDate());
+
+                Map<String, Object> dataMap = new HashMap<String, Object>();
+                dataMap.put("customerInfo", customerInfo);
+                dataMap.put("token", token);
+                msgResult.setData(dataMap);
                 msgResult.setResult(true);
-                msgResult.setData(dto);
             } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
+                throw new CustomException("openid不存在");
             }
         } catch (Exception ex) {
-            logger.error(ex.getMessage(), ex);
+            if (ex instanceof CustomException) {
+                logger.error(ex.getMessage());
+            } else {
+                logger.error(ex.getMessage(), ex);
+            }
 
-            msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
+            msgResult.setResult(false);
         }
 
         return msgResult;
     }
 
+    @ApiOperation(value = "水箱材质列表")
+    @RequestMapping(value = "materialList", method = RequestMethod.POST)
+    public MessageResult<List<Map<String, String>>> materialList(String token,HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<List<Map<String, String>>> msgResult = new MessageResult<>();
+
+        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("水箱材质");
+
+        List<Map<String, String>> list = new ArrayList<>();
+
+        for (DataDictionary dataDictionary : dataDictionaryList) {
+            Map<String, String> map = new HashMap<>();
+            map.put("value",dataDictionary.getValue());
+            map.put("name",dataDictionary.getName());
+
+            list.add(map);
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
+        return msgResult;
+    }
+
 
-    @ApiOperation(value = "工单提交")
-    @PostMapping("workOrderAdd")
-    public MessageResult<Integer> workOrderAdd(@RequestBody WorkOrderSubDataDTO dto, String token, @RequestAttribute String subject) {
-        MessageResult<Integer> msgResult = new MessageResult<>();
+
+    @ApiOperation(value = "企业认证")
+    @PostMapping("enterCertification")
+    public MessageResult<CustomerInfo> enterCertification(@RequestBody EnterCertificationDTO dto, @RequestAttribute String subject) {
+        MessageResult<CustomerInfo> msgResult = new MessageResult<>();
 
         try {
+            CustomerInfo customerInfo = customerInfoService.get(dto.getId());
+            customerInfo.setUpdateBy(subject);
+            customerInfo.setUpdateTime(new Date());
+            customerInfo.setCompanyName(dto.getCompanyName());
+            customerInfo.setBusinessLicense(dto.getBusinessLicense());
+            customerInfo.setBusinessCode(dto.getBusinessCode());
 
-            int affectCount = workOrderService.insertDTO(dto, subject);
+            int affectCount = customerInfoService.update(customerInfo);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData(affectCount);
+                msgResult.setData(customerInfo);
             } else {
                 msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
+                msgResult.setMessage("数据库更新失败");
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
@@ -648,31 +699,27 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value = "师傅列表")
-    @RequestMapping(value = "technicianPageList", method = RequestMethod.POST)
-    public MessageResult<Map> technicianPageList(
-            String status,String token,
-            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
-            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
-            HttpServletRequest request) {
-        String subject = (String) request.getAttribute("subject");
+
+    @ApiOperation(value="问题反馈列表")
+    @RequestMapping(value = "feedbackPageList",method = RequestMethod.POST)
+    public MessageResult<Map> feedbackPageList(
+            @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<>();
+        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);
-        }
+        sortList.add(new Sort("create_time","desc"));
 
 
-        Page<TechnicianInfo> page = technicianInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+        Page<Feedback> page = feedbackService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
 
         msgResult.setResult(true);
@@ -682,64 +729,73 @@ public class CustomerInfoApiController {
     }
 
 
-    @GetMapping("findByOpenId")
-    public MessageResult<Map> findByOpenId(String openId) {
-        MessageResult<Map> msgResult = new MessageResult<>();
+    @ApiOperation(value="意见反馈提交")
+    @PostMapping("feedbackSubmit")
+    public MessageResult<Feedback> feedbackSubmit(@RequestBody Feedback feedback,@RequestAttribute String subject){
+        MessageResult<Feedback> msgResult = new MessageResult<>();
 
         try {
+            feedback.setId(UUID.randomUUID().toString());
+            feedback.setDelFlag(false);
+            feedback.setCreateBy(subject);
+            feedback.setCreateTime(new Date());
 
-            CustomerInfo customerInfo = customerInfoService.findByOpenId(openId);
-
-            if (customerInfo != null) {
-                String token = JwtUtil.createToken(jwtSecret, customerInfo.getId(), DateTime.now().plusDays(7).toDate());
+            int affectCount = feedbackService.insert(feedback);
 
-                Map<String, Object> dataMap = new HashMap<String, Object>();
-                dataMap.put("customerInfo", customerInfo);
-                dataMap.put("token", token);
-                msgResult.setData(dataMap);
+            if (affectCount > 0) {
                 msgResult.setResult(true);
+                msgResult.setData(feedback);
             } else {
-                throw new CustomException("openid不存在");
-            }
-        } catch (Exception ex) {
-            if (ex instanceof CustomException) {
-                logger.error(ex.getMessage());
-            } else {
-                logger.error(ex.getMessage(), ex);
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
             }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
 
-            msgResult.setMessage(ex.getMessage());
             msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
         }
 
         return msgResult;
     }
 
 
-    @ApiOperation(value = "水箱材质列表")
-    @RequestMapping(value = "materialList", method = RequestMethod.POST)
-    public MessageResult<List<Map<String, String>>> materialList(String token,HttpServletRequest request) {
-        String subject = (String) request.getAttribute("subject");
+    @ApiOperation(value = "关于我们")
+    @RequestMapping(value = "aboutUs", method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型（1：用户协议，2：隐私协议，3：免责条款）", paramType = "form"),
+    })
+    public MessageResult<Map> aboutUs(String token,String type,@RequestAttribute String subject) {
 
         //当前用户ID
         System.out.println(subject);
 
-        MessageResult<List<Map<String, String>>> msgResult = new MessageResult<>();
+        MessageResult<Map> msgResult = new MessageResult<>();
 
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("水箱材质");
+        List<AboutUs> aboutUsList = aboutUsService.list();
 
-        List<Map<String, String>> list = new ArrayList<>();
+        Map map = new HashMap();
 
-        for (DataDictionary dataDictionary : dataDictionaryList) {
-            Map<String, String> map = new HashMap<>();
-            map.put("value",dataDictionary.getValue());
-            map.put("name",dataDictionary.getName());
+        String content="";
 
-            list.add(map);
+        if(aboutUsList!=null){
+            AboutUs aboutUs = aboutUsList.get(0);
+            if("1".equals(type)){
+                content = aboutUs.getUserAgreement();
+            }
+            else if("2".equals(type)){
+                content = aboutUs.getPrivacyPolicy();
+            }
+            else if("3".equals(type)){
+                content = aboutUs.getDisclaimer();
+            }
         }
 
+        map.put("content",content);
+
         msgResult.setResult(true);
-        msgResult.setData(list);
+        msgResult.setData(map);
 
         return msgResult;
     }

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

@@ -0,0 +1,220 @@
+package com.jpsoft.employment.modules.mobile.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.ArgonPartner;
+import com.jpsoft.employment.modules.base.entity.LaborerInfo;
+import com.jpsoft.employment.modules.base.entity.TransportationInfo;
+import com.jpsoft.employment.modules.base.service.ArgonPartnerService;
+import com.jpsoft.employment.modules.base.service.LaborerInfoService;
+import com.jpsoft.employment.modules.base.service.TransportationInfoService;
+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 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.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/mobile/partnerApi")
+public class PartnerApiController {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ArgonPartnerService argonPartnerService;
+
+    @Autowired
+    private LaborerInfoService laborerInfoService;
+
+    @Autowired
+    private TransportationInfoService transportationInfoService;
+
+
+    @ApiOperation(value = "氩气合作方列表")
+    @RequestMapping(value = "argonPartnerPageList", method = RequestMethod.POST)
+    public MessageResult<Map> argonPartnerPageList(
+            String name,
+            @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(name)) {
+            searchParams.put("name", "%" + name + "%");
+        }
+
+
+        Page<ArgonPartner> page = argonPartnerService.pageSearchMobile(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 name,
+            @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(name)) {
+            searchParams.put("name", "%" + name + "%");
+        }
+
+
+        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 name,
+            @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(name)) {
+            searchParams.put("name", "%" + name + "%");
+        }
+
+
+        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;
+    }
+}