客户主页后台提交工单接口修改

.idea/workspace.xml

@@ -4,16 +4,33 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="客户端移动端接口&#10;1.客户主页&#10;2.客户发布工单详情&#10;3.客户合作方列表">
+    <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" />
       <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/entity/LaborerInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/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/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/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/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/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/entity/LaborerInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/LaborerInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/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/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/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/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/modules/mobile/controller/CustomerInfoApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" afterDir="false" />
     </list>
@@ -33,89 +50,53 @@
       <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="395">
-              <caret line="339" column="13" lean-forward="true" selection-start-line="339" selection-start-column="13" selection-end-line="339" selection-end-column="13" />
+            <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>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TransportationInfoService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TransportationInfoService.java">
+      <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">
           <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="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>
       </file>
-      <file leaf-file-name="TransportationInfoServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="281">
-              <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="557">
+              <caret line="79" selection-start-line="79" selection-end-line="80" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TransportationInfoDAO.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.java">
+      <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">
           <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="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>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TransportationInfo.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="299">
-              <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="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>
       </file>
-      <file leaf-file-name="LaborerInfoService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/LaborerInfoService.java">
+      <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">
           <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>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LaborerInfoServiceImpl.java" pinned="false" current-in-tab="false">
-        <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>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LaborerInfoDAO.java" pinned="false" current-in-tab="false">
-        <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>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LaborerInfo.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="91" column="86" selection-start-line="91" selection-start-column="86" selection-end-line="91" selection-end-column="86" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArgonPartner.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="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" />
+              <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>
@@ -133,6 +114,9 @@
     <findStrings>
       <find>count</find>
       <find>main</find>
+      <find>add</find>
+      <find>companyInformation</find>
+      <find>technicianPageList</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -141,15 +125,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" />
-        <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" />
-        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" />
@@ -157,12 +137,25 @@
         <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/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$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.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$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" />
       </list>
     </option>
   </component>
@@ -206,7 +199,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-5" />
+    <option name="x" value="-8" />
     <option name="width" value="1616" />
     <option name="height" value="876" />
   </component>
@@ -219,6 +212,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -282,6 +278,30 @@
               <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" />
@@ -309,13 +329,85 @@
               <item name="mapper" type="462c0819:PsiDirectoryNode" />
               <item name="base" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="employment" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="employment" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="employment" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="employment" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
+              <item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -385,7 +477,8 @@
       <option name="presentableId" value="Default" />
       <updated>1758679290408</updated>
       <workItem from="1760314946411" duration="4437000" />
-      <workItem from="1760319444506" duration="14205000" />
+      <workItem from="1760319444506" duration="21323000" />
+      <workItem from="1760401405905" duration="17444000" />
     </task>
     <task id="LOCAL-00001" summary="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口">
       <created>1760164729546</created>
@@ -401,11 +494,18 @@
       <option name="project" value="LOCAL" />
       <updated>1760322172000</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表">
+      <created>1760340817161</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1760340817161</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="37026000" />
+    <option name="totallyTimeSpent" value="61588000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
@@ -421,7 +521,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.6282225" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.3772049" />
       <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" />
@@ -432,7 +532,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 content_ui="combo" id="Project" order="0" weight="0.25899744" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25899744" />
       <window_info anchor="right" id="Bean Validation" order="8" weight="0.32969153" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info anchor="right" id="Theme Preview" order="7" />
@@ -444,40 +544,6 @@
       <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 content_ui="combo" id="Project" order="0" visible="true" weight="0.25899744" />
-      <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.7842605" />
-      <window_info anchor="right" id="Bean Validation" order="8" weight="0.32969153" />
-    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -524,11 +590,12 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="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="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
+    <option name="LAST_COMMIT_MESSAGE" value="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="1" />
+      <option name="time" value="6" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -536,375 +603,363 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="63" selection-start-line="63" selection-end-line="91" selection-end-column="5" />
+        <state relative-caret-position="242">
+          <caret line="15" column="45" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java">
+    <entry file="file://$PROJECT_DIR$/common/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
+        <state relative-caret-position="242">
+          <caret line="11" column="23" lean-forward="true" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.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="1122">
-          <caret line="64" column="12" lean-forward="true" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
+        <state relative-caret-position="248">
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java">
+    <entry file="file://$PROJECT_DIR$/web/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1342">
-          <caret line="71" column="19" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
+        <state relative-caret-position="330">
+          <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1452">
-          <caret line="93" column="42" lean-forward="true" selection-start-line="93" selection-start-column="42" selection-end-line="93" selection-end-column="42" />
+        <state relative-caret-position="270">
+          <caret line="22" column="48" lean-forward="true" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/pom.xml">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="242">
+          <caret line="86" column="13" lean-forward="true" selection-start-line="86" selection-start-column="13" selection-end-line="86" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/TechnicianInfoController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <caret line="201" selection-start-line="201" selection-end-line="201" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/resources/application-dev.yml">
+    <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="12" column="45" lean-forward="true" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" />
+        <state relative-caret-position="183">
+          <caret line="49" column="42" selection-start-line="49" selection-start-column="42" selection-end-line="49" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="45" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" />
+        <state relative-caret-position="445">
+          <caret line="53" column="28" selection-start-line="53" selection-start-column="28" selection-end-line="53" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="15" column="41" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="41" />
+        <state relative-caret-position="511">
+          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java">
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1342">
-          <caret line="71" column="19" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.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="264">
-          <caret line="16" column="4" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="135" />
+        <state 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>
       </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$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="64" column="33" selection-start-line="64" selection-start-column="33" selection-end-line="64" selection-end-column="33" />
+        <state 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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java">
+    <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="37" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="37" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java">
+    <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="88">
-          <caret line="5" selection-start-line="5" selection-end-line="5" selection-end-column="5" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.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="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <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>
       </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/resources/mapper/base/ArgonPartner.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state 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>
       </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/LaborerInfoService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="303">
-          <caret line="131" column="28" selection-start-line="131" selection-start-column="16" selection-end-line="131" selection-end-column="28" />
+        <state 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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java">
+    <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="264">
-          <caret line="16" column="45" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="45" />
+        <state 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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java">
+    <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="447">
-          <caret line="63" column="51" selection-start-line="63" selection-start-column="11" selection-end-line="63" selection-end-column="51" />
-          <folding>
-            <element signature="e#1716#1717#0" expanded="true" />
-            <element signature="e#1752#1753#0" expanded="true" />
-          </folding>
+        <state 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>
       </provider>
     </entry>
-    <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/LaborerInfo.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="2002">
+          <caret line="91" column="86" selection-start-line="91" selection-start-column="86" selection-end-line="91" selection-end-column="86" />
         </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/service/TransportationInfoService.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="220">
+          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java">
+    <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="248">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/pom.xml">
+    <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="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="242">
+          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" 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/TransportationInfo.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="1848">
+          <caret line="84" column="93" selection-start-line="84" selection-start-column="93" selection-end-line="84" selection-end-column="93" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
+    <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">
       <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="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>
       </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/CustomerDetailDTO.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="550">
+          <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
         </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/dto/WorkOrderAllDataDTO.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="154">
+          <caret line="11" selection-start-line="11" selection-end-line="18" selection-end-column="42" />
         </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/entity/WorkOrder.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="-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>
       </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/entity/TechnicianInfo.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="1408">
+          <caret line="90" column="25" selection-start-line="90" selection-start-column="20" selection-end-line="90" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml">
+    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ReceiveRequire.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="373">
-          <caret line="141" column="17" selection-start-line="141" selection-start-column="17" selection-end-line="141" selection-end-column="17" />
+        <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>
       </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/entity/ReceiveRequire.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="1039">
+          <caret line="59" column="25" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="25" />
         </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/sys/service/DataDictionaryService.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="352">
+          <caret line="22" column="24" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
+    <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">
       <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="563">
+          <caret line="205" selection-start-line="205" selection-end-line="205" />
         </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/service/TechnicianInfoService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="22" column="8" selection-start-line="22" selection-start-column="8" selection-end-line="22" selection-end-column="8" />
+        <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" />
         </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$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="240" column="39" selection-start-line="240" selection-start-column="39" selection-end-line="240" selection-end-column="39" />
-          <folding>
-            <element signature="e#8497#8498#0" expanded="true" />
-            <element signature="e#8564#8565#0" expanded="true" />
-          </folding>
+        <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>
       </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/TechnicianInfoDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <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/WorkOrder.xml">
+    <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="74">
-          <caret line="183" column="48" selection-start-line="183" selection-start-column="48" selection-end-line="183" selection-end-column="48" />
+        <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/src/main/java/com/jpsoft/employment/modules/base/service/ArgonPartnerService.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="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="176">
+          <caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
         </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/entity/InstallationRequirement.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" />
-          <folding>
-            <element signature="e#1730#1731#0" expanded="true" />
-            <element signature="e#1788#1789#0" expanded="true" />
-          </folding>
+        <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/dao/ArgonPartnerDAO.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="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="132">
+          <caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
         </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/WorkOrder.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="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="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/LaborerInfoService.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="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="30">
+          <caret line="220" selection-start-line="220" selection-end-line="220" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.java">
+    <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="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="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$/common/src/main/java/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.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="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="955">
+          <caret line="66" column="36" selection-start-line="66" selection-start-column="36" selection-end-line="66" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.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="374">
-          <caret line="91" column="86" selection-start-line="91" selection-start-column="86" selection-end-line="91" selection-end-column="86" />
+          <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TransportationInfoService.java">
+    <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="220">
-          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
+          <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$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.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="281">
-          <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="557">
+          <caret line="79" selection-start-line="79" selection-end-line="80" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.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="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
+        <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$/common/src/main/resources/mapper/base/TransportationInfo.xml">
+    <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="299">
-          <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="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/modules/mobile/controller/CustomerInfoApiController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="395">
-          <caret line="339" column="13" lean-forward="true" selection-start-line="339" selection-start-column="13" selection-end-line="339" selection-end-column="13" />
+        <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>
       </provider>
     </entry>

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

@@ -22,6 +22,8 @@ public interface WorkOrderDAO {
 
 	List<WorkOrder> list();
 
+	WorkOrder findLastByCompanyId(String companyId);
+
 	List<WorkOrder> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 
 	List<WorkOrder> search(Map<String, Object> searchParams, List<Sort> sortList);

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

@@ -22,4 +22,7 @@ public class CustomerDetailDTO {
 
     @ApiModelProperty(value = "管理员电话")
     private String phone;
+
+    @ApiModelProperty(value = "审核状态（0：未审核，1：已审核）")
+    private String status;
 }

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

@@ -24,4 +24,10 @@ public class PersonalCenterDTO {
 
     @ApiModelProperty(value = "发单金额")
     private BigDecimal amount;
+
+    @ApiModelProperty(value = "审核状态（0：未审核，1：已审核）")
+    private String status;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String businessCode;
 }

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

@@ -1,16 +1,27 @@
 package com.jpsoft.employment.modules.base.dto;
 
 import com.jpsoft.employment.modules.base.entity.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class WorkOrderAllDataDTO {
+
+    @ApiModelProperty(value = "工单实体")
     private WorkOrder workOrder;
+
+    @ApiModelProperty(value = "水箱施工要求")
     private InstallationRequirement installationRequirement;
+
+    @ApiModelProperty(value = "接单要求")
     private ReceiveRequire receiveRequire;
+
+    @ApiModelProperty(value = "客户姓名")
     private String customerName;
+
+    @ApiModelProperty(value = "客户电话")
     private String customerPhone;
     private List<CommentInfo> commentInfoList;
     private TechnicianInfo technicianInfo;

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

@@ -0,0 +1,97 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class WorkOrderSubDataDTO {
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "工单号")
+    private String number;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "施工场地位置")
+    private String location;
+
+    @ApiModelProperty(value = "施工场地图片")
+    private String image;
+
+    @ApiModelProperty(value = "施工位置")
+    private String constructionLocation;
+
+    @ApiModelProperty(value = "施工环境")
+    private String environment;
+
+    @ApiModelProperty(value = "水箱材质")
+    private String material;
+
+    @ApiModelProperty(value = "水箱尺寸单位")
+    private String sizeUnit;
+
+    @ApiModelProperty(value = "水箱尺寸")
+    private BigDecimal size;
+
+    @ApiModelProperty(value = "是否不规则水箱")
+    private Boolean isIrregular;
+
+    @ApiModelProperty(value = "施工难度（1：容易，2：中等，3：困难）")
+    private String difficulty;
+
+    @ApiModelProperty(value = "工程总预算")
+    private BigDecimal budget;
+
+    @ApiModelProperty(value = "最晚入场日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    private Date latestEntryDate;
+
+    @ApiModelProperty(value = "自动解保期限")
+    private Integer terminationPeriod;
+
+    @ApiModelProperty(value = "最迟完工日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    private Date latestCompletionDate;
+
+    @ApiModelProperty(value = "逾期入场补偿金")
+    private Boolean isSubsidy;
+
+    @ApiModelProperty(value = "补贴金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "驻地条件要求")
+    private String requirement;
+
+    @ApiModelProperty(value = "施工阶段要求")
+    private String stageRequirements;
+
+    @ApiModelProperty(value = "验收标准")
+    private String acceptanceCriteria;
+
+    @ApiModelProperty(value = "售后要求")
+    private String salesRequirement;
+
+    @ApiModelProperty(value = "会员等级")
+    private Integer level;
+
+    @ApiModelProperty(value = "师傅完成工单量")
+    private Integer completedNum;
+
+    @ApiModelProperty(value = "订单发布模式（1：客户自选师傅，2：由师傅抢单）")
+    private String orderModel;
+}

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

@@ -77,5 +77,8 @@ public class CustomerInfo {
 	@ApiModelProperty(value = "营业执照")
 	private String businessLicense;
 
+	@ApiModelProperty(value = "统一社会信用代码")
+	private String businessCode;
+
 	
 		}

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

@@ -43,25 +43,25 @@ public class InstallationRequirement {
 				@ApiModelProperty(value = "是否不规则水箱")
 	private Boolean isIrregular;
 	
-				@ApiModelProperty(value = "金额")
-	private BigDecimal amount;
-	
 				@ApiModelProperty(value = "施工难度（1：容易，2：中等，3：困难）")
 	private String difficulty;
 	
-				@ApiModelProperty(value = "是否补贴")
+				@ApiModelProperty(value = "逾期入场补偿金")
 	private Boolean isSubsidy;
+
+	@ApiModelProperty(value = "金额")
+	private BigDecimal amount;
 	
 				@ApiModelProperty(value = "补贴类型（1：交通补贴，2：餐饮补贴，3：住宿补贴）")
 	private String subsidyType;
 	
-				@ApiModelProperty(value = "预算")
+				@ApiModelProperty(value = "工程总预算")
 	private BigDecimal budget;
 	
 				@ApiModelProperty(value = "工期")
 	private String period;
 	
-				@ApiModelProperty(value = "自动终止期限")
+				@ApiModelProperty(value = "自动解保期限")
 	private Integer terminationPeriod;
 	
 				@ApiModelProperty(value = "完成后打款比例")
@@ -117,5 +117,25 @@ public class InstallationRequirement {
 	@ApiModelProperty(value = "补贴金额")
 	private BigDecimal subsidyAmount;
 
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "水箱尺寸单位")
+	private String sizeUnit;
+
+	@ApiModelProperty(value = "最晚入场日期")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	private Date latestEntryDate;
+
+
+	@ApiModelProperty(value = "最迟完工日期")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	private Date latestCompletionDate;
+
 	
 		}

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

@@ -55,5 +55,8 @@ public class ReceiveRequire {
 	
 				@ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+	@ApiModelProperty(value = "会员等级")
+	private Integer level;
 	
 		}

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.jpsoft.employment.modules.base.dto.WorkOrderAllDataDTO;
+import com.jpsoft.employment.modules.base.dto.WorkOrderSubDataDTO;
 import com.jpsoft.employment.modules.base.entity.WorkOrder;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -12,7 +13,7 @@ public interface WorkOrderService {
 	WorkOrder get(String id);
 	boolean exist(String id);
 	int insert(WorkOrder model);
-	int insertDTO(WorkOrderAllDataDTO dto);
+	int insertDTO(WorkOrderSubDataDTO dto,String createBy);
 	int update(WorkOrder model);
 	int delete(String id);
 	List<WorkOrder> list();

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

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 
 import com.jpsoft.employment.modules.base.dao.*;
 import com.jpsoft.employment.modules.base.dto.WorkOrderAllDataDTO;
+import com.jpsoft.employment.modules.base.dto.WorkOrderSubDataDTO;
 import com.jpsoft.employment.modules.base.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -54,59 +55,103 @@ public class WorkOrderServiceImpl implements WorkOrderService {
     }
 
     @Override
-    public int insertDTO(WorkOrderAllDataDTO dto) {
+    public int insertDTO(WorkOrderSubDataDTO dto, String createBy) {
         // TODO Auto-generated method stub
         //model.setId(UUID.randomUUID().toString());
-        WorkOrder workOrder = dto.getWorkOrder();
+        WorkOrder workOrder = new WorkOrder();
         Date now = new Date();
         workOrder.setCreateTime(now);
-        String createBy = workOrder.getCreateBy();
+        workOrder.setId(UUID.randomUUID().toString());
+        workOrder.setDelFlag(false);
+        workOrder.setCreateBy(createBy);
+        workOrder.setPayStatus("0");
+        workOrder.setStatus("1");
+        workOrder.setCompanyId(createBy);
 
-        //图片
-        List<String> imageList = dto.getImageList();
-        String images="";
-        for (String image:imageList) {
-            images+=image+",";
-        }
+        //生成工单号
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+
+        String curDate = sdf.format(now);
+
+        String number;
+
+        WorkOrder lastItem = workOrderDAO.findLastByCompanyId(createBy);
+        if (lastItem != null) {
+            String lastNumber = lastItem.getNumber();
 
-        if(StringUtils.isNotEmpty(images)){
-            images = images.substring(0,images.lastIndexOf(","));
-            workOrder.setImage(images);
+            String yearMonthDay = lastNumber.substring(0, 8);
+            if (curDate.equals(yearMonthDay)) {
+                int tail = Integer.parseInt(lastNumber.substring(8));
+                tail += 1;
+                number = curDate + String.valueOf(tail);
+            } else {
+                number = curDate + "0001";
+            }
+        } else {
+            number = curDate + "0001";
         }
 
-        workOrder.setPayStatus("0");
-        workOrder.setStatus("1");
+        workOrder.setNumber(number);
 
         int affectCount = workOrderDAO.insert(workOrder);
 
         if (affectCount > 0) {
             //水箱需求
-            InstallationRequirement installationRequirement = dto.getInstallationRequirement();
+            InstallationRequirement installationRequirement = new InstallationRequirement();
             installationRequirement.setId(UUID.randomUUID().toString());
             installationRequirement.setCreateBy(createBy);
             installationRequirement.setDelFlag(false);
             installationRequirement.setCreateTime(now);
+            installationRequirement.setTitle(dto.getTitle());
+            installationRequirement.setLocation(dto.getLocation());
+            installationRequirement.setImage(dto.getImage());
+            installationRequirement.setConstructionLocation(dto.getConstructionLocation());
+            installationRequirement.setEnvironment(dto.getEnvironment());
+            installationRequirement.setMaterial(dto.getMaterial());
+            installationRequirement.setSizeUnit(dto.getSizeUnit());
+            installationRequirement.setSize(dto.getSize());
+            installationRequirement.setIsIrregular(dto.getIsIrregular());
+            installationRequirement.setDifficulty(dto.getDifficulty());
+            installationRequirement.setBudget(dto.getBudget());
+            installationRequirement.setLatestEntryDate(dto.getLatestEntryDate());
+            installationRequirement.setTerminationPeriod(dto.getTerminationPeriod());
+            installationRequirement.setLatestCompletionDate(dto.getLatestCompletionDate());
+            installationRequirement.setIsSubsidy(dto.getIsSubsidy());
+            installationRequirement.setAmount(dto.getAmount());
+            installationRequirement.setRequirement(dto.getRequirement());
+            installationRequirement.setStageRequirements(dto.getStageRequirements());
+            installationRequirement.setAcceptanceCriteria(dto.getAcceptanceCriteria());
+            installationRequirement.setSalesRequirement(dto.getSalesRequirement());
+            installationRequirement.setLongitude(dto.getLongitude());
+            installationRequirement.setLatitude(dto.getLatitude());
+            installationRequirement.setWorkOrderId(workOrder.getId());
+
             installationRequirementDAO.insert(installationRequirement);
 
             //接单要求
-            ReceiveRequire receiveRequire = dto.getReceiveRequire();
+            ReceiveRequire receiveRequire = new ReceiveRequire();
             receiveRequire.setId(UUID.randomUUID().toString());
             receiveRequire.setCreateBy(createBy);
             receiveRequire.setDelFlag(false);
             receiveRequire.setCreateTime(now);
+            receiveRequire.setLevel(dto.getLevel());
+            receiveRequire.setCompletedNum(dto.getCompletedNum());
+            receiveRequire.setOrderModel(dto.getOrderModel());
+            receiveRequire.setWorkOrderId(workOrder.getId());
             receiveRequireDAO.insert(receiveRequire);
 
             //工程进度
-            ConstructionProgress constructionProgress=new ConstructionProgress();
+            ConstructionProgress constructionProgress = new ConstructionProgress();
             constructionProgress.setId(UUID.randomUUID().toString());
             constructionProgress.setCreateBy(createBy);
             constructionProgress.setDelFlag(false);
             constructionProgress.setCreateTime(now);
             constructionProgress.setIndex(1);
+            constructionProgress.setTitle("发布了工单");
+            constructionProgress.setWorkOrderId(workOrder.getId());
             constructionProgressDAO.insert(constructionProgress);
         }
 
-
         return affectCount;
     }
 

common/src/main/resources/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/src/main/resources/mapper/base/InstallationRequirement.xml

@@ -37,6 +37,11 @@
 			<result property="volume" column="volume_" />
 			<result property="material" column="material_" />
 			<result property="subsidyAmount" column="subsidy_amount" />
+			<result property="longitude" column="longitude_" />
+			<result property="latitude" column="latitude_" />
+			<result property="sizeUnit" column="size_unit" />
+			<result property="latestEntryDate" column="latest_entry_date" />
+			<result property="latestCompletionDate" column="latest_completion_date" />
 
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.InstallationRequirement">
@@ -47,8 +52,8 @@
 	-->
 	<![CDATA[
 		insert into base_installation_requirement
-	    (id_,title_,address_,image_,location_,material_,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budget_,period_,termination_period,completion_pay_prop,requirement,stage_requirements,acceptance _criteria,sales_requirement,work_order_id,create_time,update_time,del_flag,create_by,update_by,
-	    map_,construction_location,environment,volume_,subsidy_amount)
+	    (id_,title_,address_,image_,location_,material_,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budget_,period_,termination_period,completion_pay_prop,requirement,stage_requirements,acceptance_criteria,sales_requirement,work_order_id,create_time,update_time,del_flag,create_by,update_by,
+	    map_,construction_location,environment,volume_,subsidy_amount,longitude_,latitude_,size_unit,latest_entry_date,latest_completion_date)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -70,7 +75,7 @@
 ,#{completionPayProp,jdbcType= NUMERIC }
 ,#{requirement,jdbcType=VARCHAR}
 ,#{stageRequirements,jdbcType=VARCHAR}
-,#{acceptance Criteria,jdbcType=VARCHAR}
+,#{acceptanceCriteria,jdbcType=VARCHAR}
 ,#{salesRequirement,jdbcType=VARCHAR}
 ,#{workOrderId,jdbcType=VARCHAR}
 ,#{createTime,jdbcType= TIMESTAMP }
@@ -83,6 +88,11 @@
 ,#{environment,jdbcType=VARCHAR}
 ,#{volume,jdbcType= NUMERIC }
 ,#{subsidyAmount,jdbcType= NUMERIC }
+,#{longitude,jdbcType= NUMERIC }
+,#{latitude,jdbcType= NUMERIC }
+,#{sizeUnit,jdbcType=VARCHAR}
+,#{latestEntryDate,jdbcType= TIMESTAMP }
+,#{latestCompletionDate,jdbcType= TIMESTAMP }
 		)
 	]]>
 	</insert>
@@ -185,6 +195,21 @@
 		<if test="subsidyAmount!=null">
 			subsidy_amount=#{subsidyAmount,jdbcType= NUMERIC },
 		</if>
+			<if test="longitude!=null">
+				longitude_=#{longitude,jdbcType= NUMERIC },
+			</if>
+			<if test="latitude!=null">
+				latitude_=#{latitude,jdbcType= NUMERIC },
+			</if>
+			<if test="sizeUnit!=null">
+				size_unit=#{sizeUnit,jdbcType=VARCHAR},
+			</if>
+			<if test="latestEntryDate!=null">
+				latest_entry_date=#{latestEntryDate,jdbcType= TIMESTAMP },
+			</if>
+			<if test="latestCompletionDate!=null">
+				latest_completion_date=#{latestCompletionDate,jdbcType= TIMESTAMP },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/src/main/resources/mapper/base/ReceiveRequire.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="level" column="level_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.ReceiveRequire">
 	<!--
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_receive_require
-	    (id_,amount_,completed_num,is_qualification,is_insurance_certificate,order_model,work_order_id,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,amount_,completed_num,is_qualification,is_insurance_certificate,order_model,work_order_id,create_time,update_time,del_flag,create_by,update_by,level_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{level,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -82,6 +84,9 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="level!=null">
+				level_=#{level,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/src/main/resources/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/src/main/resources/mapper/base/WorkOrder.xml

@@ -30,9 +30,9 @@
 			<result property="customerPhone" column="customer_phone" />
 			<result property="viewNum" column="view_num" />
 			<result property="certificate" column="certificate_" />
-		<result property="cancelCauses" column="cancel_causes" />
-		<result property="cancelReasons" column="cancel_reasons" />
-		<result property="cancelImages" column="cancel_images" />
+			<result property="cancelCauses" column="cancel_causes" />
+			<result property="cancelReasons" column="cancel_reasons" />
+			<result property="cancelImages" column="cancel_images" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.WorkOrder">
 	<!--
@@ -180,8 +180,12 @@
 	<select id="list" resultMap="WorkOrderMap">
 		select * from base_work_order
 	</select>
+	<select id="findLastByCompanyId" resultMap="WorkOrderMap">
+		select * from base_work_order where del_flag=false and company_id=#{0}
+		order by create_time desc limit 1
+	</select>
 	<select id="countByCustomerId" resultType="java.util.Map">
-		select count(id_) as 'count_',sum(price_) as 'price' from base_work_order
+		select count(id_) as 'count_',sum(price_) as 'price_' from base_work_order
 		<where>
 			del_flag = false
 			<if test="searchParams.companyId != null">

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

@@ -87,7 +87,7 @@
 		select count(*) from base_argon_partner where id_=#{0}
 	</select>
 	<select id="list" resultMap="ArgonPartnerMap">
-		select * from base_argon_partner
+		select * from base_argon_partner where del_flag=false order by create_time desc
 	</select>
 	<select id="findByCustomerId" resultMap="ArgonPartnerMap">
 		select * from base_argon_partner where del_flag=false and customer_id=#{0}

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

@@ -37,6 +37,11 @@
 			<result property="volume" column="volume_" />
 			<result property="material" column="material_" />
 			<result property="subsidyAmount" column="subsidy_amount" />
+			<result property="longitude" column="longitude_" />
+			<result property="latitude" column="latitude_" />
+			<result property="sizeUnit" column="size_unit" />
+			<result property="latestEntryDate" column="latest_entry_date" />
+			<result property="latestCompletionDate" column="latest_completion_date" />
 
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.InstallationRequirement">
@@ -47,8 +52,8 @@
 	-->
 	<![CDATA[
 		insert into base_installation_requirement
-	    (id_,title_,address_,image_,location_,material_,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budget_,period_,termination_period,completion_pay_prop,requirement,stage_requirements,acceptance _criteria,sales_requirement,work_order_id,create_time,update_time,del_flag,create_by,update_by,
-	    map_,construction_location,environment,volume_,subsidy_amount)
+	    (id_,title_,address_,image_,location_,material_,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budget_,period_,termination_period,completion_pay_prop,requirement,stage_requirements,acceptance_criteria,sales_requirement,work_order_id,create_time,update_time,del_flag,create_by,update_by,
+	    map_,construction_location,environment,volume_,subsidy_amount,longitude_,latitude_,size_unit,latest_entry_date,latest_completion_date)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -70,7 +75,7 @@
 ,#{completionPayProp,jdbcType= NUMERIC }
 ,#{requirement,jdbcType=VARCHAR}
 ,#{stageRequirements,jdbcType=VARCHAR}
-,#{acceptance Criteria,jdbcType=VARCHAR}
+,#{acceptanceCriteria,jdbcType=VARCHAR}
 ,#{salesRequirement,jdbcType=VARCHAR}
 ,#{workOrderId,jdbcType=VARCHAR}
 ,#{createTime,jdbcType= TIMESTAMP }
@@ -83,6 +88,11 @@
 ,#{environment,jdbcType=VARCHAR}
 ,#{volume,jdbcType= NUMERIC }
 ,#{subsidyAmount,jdbcType= NUMERIC }
+,#{longitude,jdbcType= NUMERIC }
+,#{latitude,jdbcType= NUMERIC }
+,#{sizeUnit,jdbcType=VARCHAR}
+,#{latestEntryDate,jdbcType= TIMESTAMP }
+,#{latestCompletionDate,jdbcType= TIMESTAMP }
 		)
 	]]>
 	</insert>
@@ -185,6 +195,21 @@
 		<if test="subsidyAmount!=null">
 			subsidy_amount=#{subsidyAmount,jdbcType= NUMERIC },
 		</if>
+			<if test="longitude!=null">
+				longitude_=#{longitude,jdbcType= NUMERIC },
+			</if>
+			<if test="latitude!=null">
+				latitude_=#{latitude,jdbcType= NUMERIC },
+			</if>
+			<if test="sizeUnit!=null">
+				size_unit=#{sizeUnit,jdbcType=VARCHAR},
+			</if>
+			<if test="latestEntryDate!=null">
+				latest_entry_date=#{latestEntryDate,jdbcType= TIMESTAMP },
+			</if>
+			<if test="latestCompletionDate!=null">
+				latest_completion_date=#{latestCompletionDate,jdbcType= TIMESTAMP },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/target/classes/mapper/base/ReceiveRequire.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="level" column="level_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.ReceiveRequire">
 	<!--
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_receive_require
-	    (id_,amount_,completed_num,is_qualification,is_insurance_certificate,order_model,work_order_id,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,amount_,completed_num,is_qualification,is_insurance_certificate,order_model,work_order_id,create_time,update_time,del_flag,create_by,update_by,level_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{level,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -82,6 +84,9 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="level!=null">
+				level_=#{level,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -82,7 +82,7 @@
 		select count(*) from base_transportation_info where id_=#{0}
 	</select>
 	<select id="list" resultMap="TransportationInfoMap">
-		select * from base_transportation_info
+		select * from base_transportation_info where del_flag=false order by create_time desc
 	</select>
 	<select id="findByCustomerId" resultMap="TransportationInfoMap">
 		select * from base_transportation_info where del_flag=false and customer_id=#{0}

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

@@ -30,9 +30,9 @@
 			<result property="customerPhone" column="customer_phone" />
 			<result property="viewNum" column="view_num" />
 			<result property="certificate" column="certificate_" />
-		<result property="cancelCauses" column="cancel_causes" />
-		<result property="cancelReasons" column="cancel_reasons" />
-		<result property="cancelImages" column="cancel_images" />
+			<result property="cancelCauses" column="cancel_causes" />
+			<result property="cancelReasons" column="cancel_reasons" />
+			<result property="cancelImages" column="cancel_images" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.WorkOrder">
 	<!--
@@ -180,8 +180,12 @@
 	<select id="list" resultMap="WorkOrderMap">
 		select * from base_work_order
 	</select>
+	<select id="findLastByCompanyId" resultMap="WorkOrderMap">
+		select * from base_work_order where del_flag=false and company_id=#{0}
+		order by create_time desc limit 1
+	</select>
 	<select id="countByCustomerId" resultType="java.util.Map">
-		select count(id_) as 'count_',sum(price_) as 'price' from base_work_order
+		select count(id_) as 'count_',sum(price_) as 'price_' from base_work_order
 		<where>
 			del_flag = false
 			<if test="searchParams.companyId != null">

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

@@ -6,12 +6,14 @@ 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.entity.*;
 import com.jpsoft.employment.modules.base.service.*;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.JwtUtil;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.sys.entity.DataDictionary;
 import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -79,6 +81,7 @@ public class CustomerInfoApiController {
             PersonalCenterDTO dto = new PersonalCenterDTO();
             dto.setId(customerInfo.getId());
             dto.setCustomerName(customerInfo.getCompanyName());
+            dto.setBusinessCode(customerInfo.getBusinessCode());
 
             Map<String, Object> searchParams = new HashMap<>();
 
@@ -92,9 +95,11 @@ public class CustomerInfoApiController {
             if (totalMap != null) {
                 if (totalMap.get("count_") != null) {
                     total = Integer.parseInt(totalMap.get("count_").toString());
-                    amount = new BigDecimal(totalMap.get("price").toString());
                 }
 
+                if (totalMap.get("price_") != null) {
+                    amount = new BigDecimal(totalMap.get("price_").toString());
+                }
             }
 
             searchParams.put("status", "1");
@@ -112,6 +117,8 @@ public class CustomerInfoApiController {
             dto.setTotal(total);
             dto.setCompletedNum(completedNum);
             dto.setAmount(amount);
+            dto.setPhone(customerInfo.getPhone());
+            dto.setStatus(customerInfo.getStatus());
 
             messageResult.setData(dto);
             messageResult.setResult(true);
@@ -250,8 +257,8 @@ public class CustomerInfoApiController {
 
     @ApiOperation(value = "主页")
     @RequestMapping(value = "main", method = RequestMethod.POST)
-    public MessageResult<Map<String,Object>> main(String token, @RequestAttribute String subject) {
-        MessageResult<Map<String,Object>> msgResult = new MessageResult<>();
+    public MessageResult<Map<String, Object>> main(String token, @RequestAttribute String subject) {
+        MessageResult<Map<String, Object>> msgResult = new MessageResult<>();
 
         CustomerInfo customerInfo = customerInfoService.get(subject);
 
@@ -260,7 +267,7 @@ public class CustomerInfoApiController {
                 throw new Exception("请先登录系统！");
             }
 
-            Map<String,Object> dataMap = new HashMap();
+            Map<String, Object> dataMap = new HashMap();
 
             Map<String, Object> searchParams = new HashMap<>();
             searchParams.put("companyId", customerInfo.getId());
@@ -334,7 +341,7 @@ public class CustomerInfoApiController {
             for (String technicianId : technicianIdList) {
                 TechnicianInfo technicianInfo = technicianInfoService.get(technicianId);
 
-                if(technicianInfo!=null){
+                if (technicianInfo != null) {
                     technicianInfoList.add(technicianInfo);
                 }
             }
@@ -365,33 +372,31 @@ public class CustomerInfoApiController {
     }
 
 
-
-
-    @ApiOperation(value="氩气合作方列表")
-    @RequestMapping(value = "argonPartnerPageList",method = RequestMethod.POST)
+    @ApiOperation(value = "氩气合作方列表")
+    @RequestMapping(value = "argonPartnerPageList", method = RequestMethod.POST)
     public MessageResult<Map> argonPartnerPageList(
             String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            @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(id)) {
-            searchParams.put("id","%" + id + "%");
+            searchParams.put("id", "%" + id + "%");
         }
 
 
-        Page<ArgonPartner> page = argonPartnerService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<ArgonPartner> page = argonPartnerService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 
 
         msgResult.setResult(true);
@@ -401,10 +406,9 @@ public class CustomerInfoApiController {
     }
 
 
-
-    @ApiOperation(value="氩气合作方详情")
+    @ApiOperation(value = "氩气合作方详情")
     @GetMapping("argonPartnerEdit/{id}")
-    public MessageResult<ArgonPartner> argonPartnerEdit(@PathVariable("id") String id){
+    public MessageResult<ArgonPartner> argonPartnerEdit(@PathVariable("id") String id) {
         MessageResult<ArgonPartner> msgResult = new MessageResult<>();
 
         try {
@@ -417,9 +421,8 @@ public class CustomerInfoApiController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -429,32 +432,31 @@ public class CustomerInfoApiController {
     }
 
 
-
-    @ApiOperation(value="搬运小工列表")
-    @RequestMapping(value = "laborerPageList",method = RequestMethod.POST)
+    @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");
+            @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(id)) {
-            searchParams.put("id","%" + id + "%");
+            searchParams.put("id", "%" + id + "%");
         }
 
 
-        Page<LaborerInfo> page = laborerInfoService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
+        Page<LaborerInfo> page = laborerInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
 
 
         msgResult.setResult(true);
@@ -464,9 +466,9 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value="搬运小工信息详情")
+    @ApiOperation(value = "搬运小工信息详情")
     @GetMapping("laborerEdit/{id}")
-    public MessageResult<LaborerInfo> laborerEdit(@PathVariable("id") String id){
+    public MessageResult<LaborerInfo> laborerEdit(@PathVariable("id") String id) {
         MessageResult<LaborerInfo> msgResult = new MessageResult<>();
 
         try {
@@ -479,9 +481,8 @@ public class CustomerInfoApiController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -491,32 +492,31 @@ public class CustomerInfoApiController {
     }
 
 
-
-    @ApiOperation(value="运输方列表")
-    @RequestMapping(value = "transportationPageList",method = RequestMethod.POST)
+    @ApiOperation(value = "运输方列表")
+    @RequestMapping(value = "transportationPageList", method = RequestMethod.POST)
     public MessageResult<Map> transportationPageList(
             String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            @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(id)) {
-            searchParams.put("id","%" + id + "%");
+            searchParams.put("id", "%" + id + "%");
         }
 
 
-        Page<TransportationInfo> page = transportationInfoService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
+        Page<TransportationInfo> page = transportationInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
 
 
         msgResult.setResult(true);
@@ -526,9 +526,9 @@ public class CustomerInfoApiController {
     }
 
 
-    @ApiOperation(value="运输方信息详情")
+    @ApiOperation(value = "运输方信息详情")
     @GetMapping("transportationEdit/{id}")
-    public MessageResult<TransportationInfo> transportationEdit(@PathVariable("id") String id){
+    public MessageResult<TransportationInfo> transportationEdit(@PathVariable("id") String id) {
         MessageResult<TransportationInfo> msgResult = new MessageResult<>();
 
         try {
@@ -541,9 +541,8 @@ public class CustomerInfoApiController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -553,8 +552,6 @@ public class CustomerInfoApiController {
     }
 
 
-
-
     @ApiOperation(value = "工单列表")
     @RequestMapping(value = "workOrderPageList", method = RequestMethod.POST)
     public MessageResult<Map> workOrderPageList(
@@ -624,23 +621,18 @@ public class CustomerInfoApiController {
     }
 
 
-
     @ApiOperation(value = "工单提交")
     @PostMapping("workOrderAdd")
-    public MessageResult<WorkOrder> workOrderAdd(@RequestBody WorkOrderAllDataDTO dto, @RequestAttribute String subject) {
-        MessageResult<WorkOrder> msgResult = new MessageResult<>();
+    public MessageResult<Integer> workOrderAdd(@RequestBody WorkOrderSubDataDTO dto, String token, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
-            WorkOrder workOrder = dto.getWorkOrder();
-            workOrder.setId(UUID.randomUUID().toString());
-            workOrder.setDelFlag(false);
-            workOrder.setCreateBy(subject);
 
-            int affectCount = workOrderService.insertDTO(dto);
+            int affectCount = workOrderService.insertDTO(dto, subject);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData(workOrder);
+                msgResult.setData(affectCount);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");
@@ -656,11 +648,10 @@ public class CustomerInfoApiController {
     }
 
 
-
     @ApiOperation(value = "师傅列表")
     @RequestMapping(value = "technicianPageList", method = RequestMethod.POST)
     public MessageResult<Map> technicianPageList(
-            String status,
+            String status,String token,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
             HttpServletRequest request) {
@@ -684,7 +675,6 @@ public class CustomerInfoApiController {
         Page<TechnicianInfo> page = technicianInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
 
 
-
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 
@@ -692,7 +682,6 @@ public class CustomerInfoApiController {
     }
 
 
-
     @GetMapping("findByOpenId")
     public MessageResult<Map> findByOpenId(String openId) {
         MessageResult<Map> msgResult = new MessageResult<>();
@@ -726,4 +715,33 @@ public class CustomerInfoApiController {
         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;
+    }
+
 }