Skip to content

M
manager
Commit c9169a52 by manxiaoqiang
Options

adi

parent 5e940cdf
Showing with 70 additions and 36 deletions
.idea/workspace.xml
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" afterPath="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -52,18 +52,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="ContractRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="21" column="44" lean-forward="false" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="44" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BPUContract.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/BPUContract.java">
<provider selected="true" editor-type-id="text-editor">
......@@ -126,16 +114,34 @@
</provider>
</entry>
</file>
<file leaf-file-name="ADIAccountServiceImpl.java" pinned="false" current-in-tab="true">
<file leaf-file-name="ADIAccountServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3963">
<caret line="319" column="5" lean-forward="true" selection-start-line="319" selection-start-column="5" selection-end-line="319" selection-end-column="5" />
<state relative-caret-position="76">
<caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ADIUser.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="51" column="31" lean-forward="false" selection-start-line="51" selection-start-column="31" selection-end-line="51" selection-end-column="31" />
<folding>
<element signature="e#1526#1527#0" expanded="true" />
<element signature="e#1569#1570#0" expanded="true" />
<element signature="e#1603#1604#0" expanded="true" />
<element signature="e#1640#1641#0" expanded="true" />
<element signature="e#1672#1673#0" expanded="true" />
<element signature="e#1723#1724#0" expanded="true" />
<element signature="e#1765#1766#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -199,7 +205,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/userio/model/App.java" />
<option value="$PROJECT_DIR$/src/main/resources/rest-servlet.xml" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java" />
......@@ -250,6 +255,7 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/BPUContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" />
</list>
</option>
</component>
......@@ -1043,13 +1049,6 @@
<workItem from="1526609390549" duration="37000" />
<workItem from="1528173363272" duration="91000" />
</task>
<task id="LOCAL-00093" summary="客户表&#10;&#10;&#10;">
<created>1522053490663</created>
<option name="number" value="00093" />
<option name="presentableId" value="LOCAL-00093" />
<option name="project" value="LOCAL" />
<updated>1522053490664</updated>
</task>
<task id="LOCAL-00094" summary="客户表&#10;&#10;&#10;">
<created>1522059374814</created>
<option name="number" value="00094" />
......@@ -1386,11 +1385,18 @@
<option name="project" value="LOCAL" />
<updated>1528271859868</updated>
</task>
<option name="localTasksCounter" value="142" />
<task id="LOCAL-00142" summary="adi">
<created>1528275338074</created>
<option name="number" value="00142" />
<option name="presentableId" value="LOCAL-00142" />
<option name="project" value="LOCAL" />
<updated>1528275338074</updated>
</task>
<option name="localTasksCounter" value="143" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="542435000" />
<option name="totallyTimeSpent" value="543062000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1527,7 +1533,8 @@
<MESSAGE value="Merge remote-tracking branch 'remotes/origin/20180328_sale' into 20180411&#10;&#10;* remotes/origin/20180328_sale:&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;" />
<MESSAGE value="2&#10;" />
<MESSAGE value="Merge remote-tracking branch 'remotes/origin/20180525_adi' into 20180530_bpu&#10;&#10;* remotes/origin/20180525_adi:&#10; adi&#10; adi&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/java/common/service/impl/ContractServiceImpl.java&#10;" />
<option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'remotes/origin/20180525_adi' into 20180530_bpu&#10;&#10;* remotes/origin/20180525_adi:&#10; adi&#10; adi&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/java/common/service/impl/ContractServiceImpl.java&#10;" />
<MESSAGE value="adi" />
<option name="LAST_COMMIT_MESSAGE" value="adi" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1547,13 +1554,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/resources/common.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="18" lean-forward="true" selection-start-line="0" selection-start-column="18" selection-end-line="0" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
......@@ -1927,12 +1927,28 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3963">
<caret line="319" column="5" lean-forward="true" selection-start-line="319" selection-start-column="5" selection-end-line="319" selection-end-column="5" />
<state relative-caret-position="76">
<caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="51" column="31" lean-forward="false" selection-start-line="51" selection-start-column="31" selection-end-line="51" selection-end-column="31" />
<folding>
<element signature="e#1526#1527#0" expanded="true" />
<element signature="e#1569#1570#0" expanded="true" />
<element signature="e#1603#1604#0" expanded="true" />
<element signature="e#1640#1641#0" expanded="true" />
<element signature="e#1672#1673#0" expanded="true" />
<element signature="e#1723#1724#0" expanded="true" />
<element signature="e#1765#1766#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/adi/model/ADIUser.java
......@@ -46,6 +46,24 @@ public class ADIUser implements Serializable{
private Long money;
private Integer backTime;
private String pastDate;
private Boolean sitOn=false;//是否坐席
private Boolean useStatus=true;//坐席启用
public Boolean getSitOn() {
return sitOn;
}
public void setSitOn(Boolean sitOn) {
this.sitOn = sitOn;
}
public Boolean getUseStatus() {
return useStatus;
}
public void setUseStatus(Boolean useStatus) {
this.useStatus = useStatus;
}
public Long getAccountId() {
return accountId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment