Explorar o código

1、资料列表修改

anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
33884f6368

+ 8 - 14
.idea/workspace.xml

@@ -9,7 +9,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、新增转交客户时转交资料" />
+    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、新增转交客户时转交资料">
+      <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/common/mapper/UserMapperExt.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapperExt.xml" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/props/config_local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/props/config_local.properties" afterDir="false" />
+    </list>
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -86,19 +92,6 @@
     </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="CLASS" />
-      <properties />
-      <listeners />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Tomcat 8.5.59" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.59" ALTERNATIVE_JRE_ENABLED="false" nameIsGenerated="true">
       <option name="OPEN_IN_BROWSER" value="false" />
       <option name="COMMON_VM_ARGUMENTS" value="-Dprofiles.activation=&quot;local&quot; -Djdbc.worker.id=&quot;1001&quot;" />
@@ -233,6 +226,7 @@
       <workItem from="1630888067668" duration="852000" />
       <workItem from="1630893291690" duration="11740000" />
       <workItem from="1630976664603" duration="14614000" />
+      <workItem from="1631062478856" duration="3480000" />
     </task>
     <task id="LOCAL-00001" summary="修改客户跟进列表">
       <created>1630486551669</created>

+ 12 - 10
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1769,9 +1769,9 @@
   </select>
   <select id="findMainProductsList" resultType="com.goafanti.customer.bo.OutUserMianProducts">
     select oi.id ,u.id uid, u.nickname userName, oi.business_scope businessScope,
-    um.update_name updateName,um.update_aid updateAid,
+    um.update_name updateName,um.update_aid updateAid,u.share_type shareType,
      <if test="shiroType ==2">
-     a.name adminName,d.name depName,u.share_type shareType,dg.name province,
+     a.name adminName,d.name depName,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
@@ -1786,7 +1786,7 @@
       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)
+    where  u.`type` =1 and u.status=0
       <if test="shiroType==1">
       and u.information_maintainer = #{aid}
       </if>
@@ -1797,9 +1797,10 @@
     <if test="depId !=null">
       and d.id= #{depId}
     </if>
-      <if test="shareType !=null">
-        and u.share_type = #{shareType}
-      </if>
+
+    </if>
+    <if test="shareType !=null">
+      and u.share_type = #{shareType}
     </if>
       <if test="userName != null">
     and u.nickname like concat('%',#{userName},'%')
@@ -1825,7 +1826,7 @@
     <if test="shiroType==2">
       left join admin a on u.aid=a.id left join department d on a.department_id =d.id
     </if>
-  where u.share_type in (0, 2, 3) and u.source in(1,2,3)
+  where  u.`type` =1 and u.status=0
     <if test="shiroType==1">
       and u.information_maintainer = #{aid}
     </if>
@@ -1836,9 +1837,10 @@
       <if test="depId !=null">
         and d.id= #{depId}
       </if>
-      <if test="shareType !=null">
-        and u.share_type = #{shareType}
-      </if>
+
+    </if>
+    <if test="shareType !=null">
+      and u.share_type = #{shareType}
     </if>
     <if test="userName != null">
       and u.nickname like concat('%',#{userName},'%')

+ 4 - 3
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1589,7 +1589,7 @@
 			<if test="follow !=null and follow!=''">
 			left join (select aid,uid,contact_type from user_follow where aid= #{aid,jdbcType=VARCHAR} and contact_type=0 GROUP by uid) e on a.id=e.uid and a.aid=e.aid
 			</if>
-			where  a.status=0
+			where  a.status=0  and a.`type` =1
 			and a.information_maintainer = #{aid,jdbcType=VARCHAR}
 			<if test="type !=null and type!=''">
 			and a.`type`=#{type,jdbcType=VARCHAR}
@@ -1636,13 +1636,14 @@
    		 </if>
 	</select>
 	<select id="selectCustomerInformationCount" resultType="java.lang.Integer">
-		select count(0)
+		select count(*)
 			from user a left join organization_identity b
 			on a.id=b.uid
 			<if test="follow  !=null and follow!=''">
 			left join (select aid,uid,contact_type from user_follow where aid= #{aid,jdbcType=VARCHAR} and contact_type=0 GROUP by uid) e on a.id=e.uid and a.aid=e.aid
 			</if>
-			where  a.status=0 and a.information_maintainer = #{aid,jdbcType=VARCHAR}
+			where  a.status=0 and a.`type` =1
+			  and a.information_maintainer = #{aid,jdbcType=VARCHAR}
 			<if test="type !=null and type!=''">
 			and a.`type`=#{type,jdbcType=VARCHAR}
 			</if>

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2263,10 +2263,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if(in.getStartTime()!=null)map.put("startTime",in.getStartTime());
 		if(in.getEndTime()!=null)map.put("endTime",in.getEndTime()+" 23:59:59");
 		if(in.getShiroType()==null){in.setShiroType(0);}
+		if(in.getShareType()!=null)map.put("shareType",in.getShareType());
 		else if(in.getShiroType()==2){
 			if(in.getAdminName()!=null)map.put("adminName",in.getAdminName());
 			if(in.getDepId()!=null)map.put("depId",in.getDepId());
-			if(in.getShareType()!=null)map.put("shareType",in.getShareType());
 		}
 		map.put("shiroType",in.getShiroType());
 		return (Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -2,13 +2,13 @@ dev.name=local
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#•#
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+#•#
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570