|
|
@@ -4,36 +4,17 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="1.氩气合作方功能,搬运小工管理功能,运输方功能, 2.客户中心手机端接口 3.客户首页数据接口">
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" afterDir="false" />
|
|
|
+ <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="客户端移动端接口 1.客户主页 2.客户发布工单详情 3.客户合作方列表">
|
|
|
<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/CustomerInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/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/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CustomerInfo.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/CustomerInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/CustomerInfoService.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TechnicianInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TechnicianInfoService.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/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/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>
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -49,95 +30,92 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="CustomerInfoApiController.java" pinned="false" current-in-tab="false">
|
|
|
+ <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="286">
|
|
|
- <caret line="495" column="51" selection-start-line="495" selection-start-column="29" selection-end-line="495" selection-end-column="51" />
|
|
|
- <folding>
|
|
|
- <element signature="e#22862#22878#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state 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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="WebMvcConfig.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java">
|
|
|
+ <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">
|
|
|
<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="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>
|
|
|
</file>
|
|
|
- <file leaf-file-name="ArgonPartnerController.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.java">
|
|
|
+ <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">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="541">
|
|
|
- <caret line="218" column="19" lean-forward="true" selection-start-line="218" selection-start-column="19" selection-end-line="218" selection-end-column="19" />
|
|
|
+ <state 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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="ArgonPartner.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java">
|
|
|
+ <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">
|
|
|
<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="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>
|
|
|
</file>
|
|
|
- <file leaf-file-name="LaborerInfo.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java">
|
|
|
+ <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">
|
|
|
<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="299">
|
|
|
+ <caret line="84" column="93" selection-start-line="84" selection-start-column="93" selection-end-line="84" selection-end-column="93" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="TransportationInfo.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java">
|
|
|
+ <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">
|
|
|
<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="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="ArgonPartner.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml">
|
|
|
+ <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="330">
|
|
|
- <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
+ <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="LaborerInfo.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml">
|
|
|
+ <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="352">
|
|
|
- <caret line="73" column="13" selection-start-line="73" selection-start-column="13" selection-end-line="73" selection-end-column="13" />
|
|
|
+ <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="TechnicianInfo.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml">
|
|
|
+ <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="373">
|
|
|
- <caret line="141" column="17" lean-forward="true" selection-start-line="141" selection-start-column="17" selection-end-line="141" selection-end-column="17" />
|
|
|
+ <state 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="TransportationInfo.xml" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml">
|
|
|
+ <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="1245">
|
|
|
- <caret line="72" column="47" lean-forward="true" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
|
|
|
+ <state 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>
|
|
|
@@ -151,6 +129,12 @@
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
+ <component name="FindInProjectRecents">
|
|
|
+ <findStrings>
|
|
|
+ <find>count</find>
|
|
|
+ <find>main</find>
|
|
|
+ </findStrings>
|
|
|
+ </component>
|
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
@@ -169,11 +153,13 @@
|
|
|
<option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.java" />
|
|
|
<option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/CustomerInfoService.java" />
|
|
|
- <option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" />
|
|
|
<option value="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" />
|
|
|
<option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java" />
|
|
|
- <option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java" />
|
|
|
<option value="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java" />
|
|
|
+ <option value="$PROJECT_DIR$/common/src/main/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" />
|
|
|
@@ -197,6 +183,15 @@
|
|
|
<component name="MavenProjectNavigator">
|
|
|
<treeState>
|
|
|
<expand>
|
|
|
+ <path>
|
|
|
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
|
|
|
+ <item name="common" type="9519ce18:MavenProjectsStructure$ProjectNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
|
|
|
+ <item name="common" type="9519ce18:MavenProjectsStructure$ProjectNode" />
|
|
|
+ <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
|
|
|
+ </path>
|
|
|
<path>
|
|
|
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
|
|
|
<item name="web" type="9519ce18:MavenProjectsStructure$ProjectNode" />
|
|
|
@@ -287,18 +282,6 @@
|
|
|
<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="entity" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
<path>
|
|
|
<item name="water-tank-installation-server" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="water-tank-installation-server" type="462c0819:PsiDirectoryNode" />
|
|
|
@@ -343,6 +326,9 @@
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/../floorlock-server" />
|
|
|
+ <property name="project.structure.last.edited" value="Modules" />
|
|
|
+ <property name="project.structure.proportion" value="0.0" />
|
|
|
+ <property name="project.structure.side.proportion" value="0.0" />
|
|
|
<property name="settings.editor.selected.configurable" value="MavenSettings" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
@@ -399,7 +385,7 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1758679290408</updated>
|
|
|
<workItem from="1760314946411" duration="4437000" />
|
|
|
- <workItem from="1760319444506" duration="2500000" />
|
|
|
+ <workItem from="1760319444506" duration="14205000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="1.氩气合作方功能,搬运小工管理功能,运输方功能, 2.客户中心手机端接口 3.客户首页数据接口">
|
|
|
<created>1760164729546</created>
|
|
|
@@ -408,11 +394,18 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1760164729546</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="2" />
|
|
|
+ <task id="LOCAL-00002" summary="客户端移动端接口 1.客户主页 2.客户发布工单详情 3.客户合作方列表">
|
|
|
+ <created>1760322172000</created>
|
|
|
+ <option name="number" value="00002" />
|
|
|
+ <option name="presentableId" value="LOCAL-00002" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1760322172000</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="3" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="25321000" />
|
|
|
+ <option name="totallyTimeSpent" value="37026000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
|
|
|
@@ -428,7 +421,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.39891452" />
|
|
|
+ <window_info anchor="bottom" id="Debug" order="4" weight="0.6282225" />
|
|
|
<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	" order="6" />
|
|
|
@@ -439,7 +432,7 @@
|
|
|
<window_info anchor="bottom" id="Run" order="3" weight="0.5468114" />
|
|
|
<window_info anchor="bottom" id="Spring" order="8" />
|
|
|
<window_info anchor="bottom" id="Terminal" order="9" />
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25899744" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" weight="0.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" />
|
|
|
@@ -451,6 +444,40 @@
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Find" order="2" />
|
|
|
</layout>
|
|
|
+ <layout-to-restore>
|
|
|
+ <window_info id="Designer" order="2" />
|
|
|
+ <window_info anchor="right" id="Palette" order="3" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="3" weight="0.5468114" />
|
|
|
+ <window_info anchor="bottom" id="Spring" order="8" />
|
|
|
+ <window_info id="Image Layers" order="3" />
|
|
|
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
+ <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
|
|
|
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
+ <window_info id="UI Designer" order="4" />
|
|
|
+ <window_info id="Favorites" order="5" side_tool="true" />
|
|
|
+ <window_info anchor="bottom" id="Terminal" order="9" />
|
|
|
+ <window_info id="Capture Tool" order="7" />
|
|
|
+ <window_info anchor="right" id="Capture Analysis" order="4" />
|
|
|
+ <window_info anchor="bottom" id="Event Log" order="13" side_tool="true" weight="0.32971507" />
|
|
|
+ <window_info anchor="bottom" id="Messages" order="0" weight="0.32971507" />
|
|
|
+ <window_info anchor="bottom" id="TODO" order="7" />
|
|
|
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
+ <window_info anchor="bottom" id="Java Enterprise" order="10" />
|
|
|
+ <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
|
|
|
+ <window_info anchor="bottom" id="Version Control" order="12" weight="0.32971507" />
|
|
|
+ <window_info anchor="right" id="Maven Projects" order="9" weight="0.32969153" />
|
|
|
+ <window_info anchor="bottom" id="Find" order="2" />
|
|
|
+ <window_info 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	" 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" />
|
|
|
@@ -496,75 +523,19 @@
|
|
|
</component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="1.氩气合作方功能,搬运小工管理功能,运输方功能, 2.客户中心手机端接口 3.客户首页数据接口" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="1.氩气合作方功能,搬运小工管理功能,运输方功能, 2.客户中心手机端接口 3.客户首页数据接口" />
|
|
|
+ <MESSAGE value="客户端移动端接口 1.客户主页 2.客户发布工单详情 3.客户合作方列表" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="客户端移动端接口 1.客户主页 2.客户发布工单详情 3.客户合作方列表" />
|
|
|
+ </component>
|
|
|
+ <component name="XDebuggerManager">
|
|
|
+ <breakpoint-manager>
|
|
|
+ <option name="time" value="1" />
|
|
|
+ </breakpoint-manager>
|
|
|
</component>
|
|
|
<component name="antWorkspaceConfiguration">
|
|
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="14410">
|
|
|
- <caret line="676" column="20" selection-start-line="676" selection-start-column="20" selection-end-line="676" selection-end-column="20" />
|
|
|
- <folding>
|
|
|
- <element signature="e#22862#22878#0" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="198">
|
|
|
- <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="132">
|
|
|
- <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="88">
|
|
|
- <caret line="5" selection-start-line="5" selection-end-line="5" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1078">
|
|
|
- <caret line="76" selection-start-line="76" selection-end-line="76" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="484">
|
|
|
- <caret line="25" column="29" lean-forward="true" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1298">
|
|
|
- <caret line="59" column="29" selection-start-line="59" selection-start-column="29" selection-end-line="59" selection-end-column="29" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="264">
|
|
|
- <caret line="15" column="41" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="41" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1012">
|
|
|
@@ -628,13 +599,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1012">
|
|
|
- <caret line="63" selection-start-line="63" selection-end-line="91" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="264">
|
|
|
@@ -642,13 +606,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="176">
|
|
|
- <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1342">
|
|
|
@@ -656,13 +613,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1122">
|
|
|
- <caret line="64" column="12" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="264">
|
|
|
@@ -782,78 +732,259 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="286">
|
|
|
- <caret line="495" column="51" selection-start-line="495" selection-start-column="29" selection-end-line="495" selection-end-column="51" />
|
|
|
+ <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$/common/src/main/java/com/jpsoft/employment/modules/base/entity/ArgonPartner.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="445">
|
|
|
+ <caret line="53" column="28" selection-start-line="53" selection-start-column="28" selection-end-line="53" selection-end-column="28" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TransportationInfo.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="511">
|
|
|
+ <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/LaborerInfo.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="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$/web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="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/service/WorkOrderService.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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="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#22862#22878#0" expanded="true" />
|
|
|
+ <element signature="e#8497#8498#0" expanded="true" />
|
|
|
+ <element signature="e#8564#8565#0" expanded="true" />
|
|
|
</folding>
|
|
|
</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/dao/WorkOrderDAO.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="242">
|
|
|
+ <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
|
|
|
</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/resources/mapper/base/WorkOrder.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="541">
|
|
|
- <caret line="218" column="19" lean-forward="true" selection-start-line="218" selection-start-column="19" selection-end-line="218" selection-end-column="19" />
|
|
|
+ <state 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>
|
|
|
</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/service/ArgonPartnerService.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="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/entity/LaborerInfo.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="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="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>
|
|
|
</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/dao/ArgonPartnerDAO.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="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/resources/mapper/base/ArgonPartner.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
+ <state 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/java/com/jpsoft/employment/modules/base/service/LaborerInfoService.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="220">
|
|
|
+ <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="281">
|
|
|
+ <caret line="58" column="32" lean-forward="true" selection-start-line="58" selection-start-column="32" selection-end-line="58" selection-end-column="32" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="242">
|
|
|
+ <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="352">
|
|
|
- <caret line="73" column="13" selection-start-line="73" selection-start-column="13" selection-end-line="73" selection-end-column="13" />
|
|
|
+ <state 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>
|
|
|
- <entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.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="373">
|
|
|
- <caret line="141" column="17" lean-forward="true" selection-start-line="141" selection-start-column="17" selection-end-line="141" selection-end-column="17" />
|
|
|
+ <state 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/service/impl/TransportationInfoServiceImpl.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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="242">
|
|
|
+ <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1245">
|
|
|
- <caret line="72" column="47" lean-forward="true" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
|
|
|
+ <state 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>
|
|
|
</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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </component>
|
|
|
+ <component name="masterDetails">
|
|
|
+ <states>
|
|
|
+ <state key="ArtifactsStructureConfigurable.UI">
|
|
|
+ <settings>
|
|
|
+ <artifact-editor />
|
|
|
+ <last-edited>web:war</last-edited>
|
|
|
+ <splitter-proportions>
|
|
|
+ <option name="proportions">
|
|
|
+ <list>
|
|
|
+ <option value="0.2" />
|
|
|
+ <option value="0.5" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </splitter-proportions>
|
|
|
+ </settings>
|
|
|
+ </state>
|
|
|
+ <state key="FacetStructureConfigurable.UI">
|
|
|
+ <settings>
|
|
|
+ <last-edited>Spring</last-edited>
|
|
|
+ <splitter-proportions>
|
|
|
+ <option name="proportions">
|
|
|
+ <list>
|
|
|
+ <option value="0.2" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </splitter-proportions>
|
|
|
+ </settings>
|
|
|
+ </state>
|
|
|
+ <state key="GlobalLibrariesConfigurable.UI">
|
|
|
+ <settings>
|
|
|
+ <splitter-proportions>
|
|
|
+ <option name="proportions">
|
|
|
+ <list>
|
|
|
+ <option value="0.2" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </splitter-proportions>
|
|
|
+ </settings>
|
|
|
+ </state>
|
|
|
+ <state key="JdkListConfigurable.UI">
|
|
|
+ <settings>
|
|
|
+ <last-edited>1.8</last-edited>
|
|
|
+ <splitter-proportions>
|
|
|
+ <option name="proportions">
|
|
|
+ <list>
|
|
|
+ <option value="0.2" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </splitter-proportions>
|
|
|
+ </settings>
|
|
|
+ </state>
|
|
|
+ <state key="ModuleStructureConfigurable.UI">
|
|
|
+ <settings>
|
|
|
+ <last-edited>web</last-edited>
|
|
|
+ <splitter-proportions>
|
|
|
+ <option name="proportions">
|
|
|
+ <list>
|
|
|
+ <option value="0.2" />
|
|
|
+ <option value="0.6" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </splitter-proportions>
|
|
|
+ </settings>
|
|
|
+ </state>
|
|
|
+ <state key="ProjectLibrariesConfigurable.UI">
|
|
|
+ <settings>
|
|
|
+ <last-edited>Maven: ch.qos.logback:logback-classic:1.2.3</last-edited>
|
|
|
+ <splitter-proportions>
|
|
|
+ <option name="proportions">
|
|
|
+ <list>
|
|
|
+ <option value="0.2" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </splitter-proportions>
|
|
|
+ </settings>
|
|
|
+ </state>
|
|
|
+ </states>
|
|
|
</component>
|
|
|
</project>
|