Parcourir la source

客户资料维护修改

anderx il y a 4 ans
Parent
commit
e5bd122f2e

+ 12 - 8
.idea/workspace.xml

@@ -9,14 +9,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="催款列表修改">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/bo/InputMainProductsList.java" afterDir="false" />
+    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="客户资料维护修改">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/bo/OutUserMianProducts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/bo/OutUserMianProducts.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/CustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/CustomerService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" afterDir="false" />
     </list>
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -235,7 +231,7 @@
       <workItem from="1630656368650" duration="64000" />
       <workItem from="1630656901862" duration="33000" />
       <workItem from="1630888067668" duration="852000" />
-      <workItem from="1630893291690" duration="9569000" />
+      <workItem from="1630893291690" duration="10570000" />
     </task>
     <task id="LOCAL-00001" summary="修改客户跟进列表">
       <created>1630486551669</created>
@@ -328,7 +324,14 @@
       <option name="project" value="LOCAL" />
       <updated>1630907402214</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="客户资料维护修改">
+      <created>1630917905043</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1630917905043</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -353,7 +356,8 @@
     <MESSAGE value="1、修改修改客户信息接口&#10;2、开发客户资料列表&#10;3、开发客户资料日志列表" />
     <MESSAGE value="updateConfig" />
     <MESSAGE value="催款列表修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="催款列表修改" />
+    <MESSAGE value="客户资料维护修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="客户资料维护修改" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
   </component>
   <component name="XDebuggerManager">

+ 2 - 1
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1768,7 +1768,7 @@
     select oi.id ,u.id uid, u.nickname userName, oi.business_scope businessScope,
     um.update_name updateName,um.update_aid updateAid,
      <if test="shiroType ==2">
-     a.name adminName,d.name depName,u.share_type shareType,
+     a.name adminName,d.name depName,u.share_type shareType,dg.name province,
      </if>
     date_format(u.transfer_time ,'%Y-%m-%d %H:%i:%s')transferTimes,
     date_format(um.date_update_time,'%Y-%m-%d %H:%i:%s')dateUpdateTimes
@@ -1781,6 +1781,7 @@
     left join organization_identity oi on u.id = oi.uid left join user_mid um on u.id=um.uid
     <if test="shiroType==2">
       left join admin a on u.aid=a.id left join department d on a.department_id =d.id
+      left join district_glossory dg on oi.location_province =dg.id
     </if>
     where u.share_type in (0, 2, 3) and u.source in(1,2,3)
       <if test="shiroType==1">

+ 9 - 0
src/main/java/com/goafanti/customer/bo/OutUserMianProducts.java

@@ -10,9 +10,18 @@ public class OutUserMianProducts {
     private String depName;
     private String updateAid;
     private Integer shareType;
+    private String province;
     private String transferTimes;
     private String dateUpdateTimes;
 
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
     public Integer getShareType() {
         return shareType;
     }