anderx пре 4 година
родитељ
комит
0f6a83d388

+ 0 - 104
kede-server.eml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component LANGUAGE_LEVEL="JDK_1_8" jdk="1.8" jdk_type="JavaSDK">
-	<output-test url="file://$MODULE_DIR$/target/test-classes"/>
-	<contentEntry url="file://$MODULE_DIR$">
-		<testFolder url="file://$MODULE_DIR$/src/test/java"/>
-		<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes"/>
-		<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes"/>
-		<excludeFolder url="file://$MODULE_DIR$/target"/>
-	</contentEntry>
-	<lib name="Maven: javax.servlet:javax.servlet-api:3.1.0" scope="PROVIDED"/>
-	<lib name="Maven: junit:junit:4.12" scope="TEST"/>
-	<lib name="Maven: org.hamcrest:hamcrest-core:1.3" scope="TEST"/>
-	<lib name="Maven: org.springframework:spring-test:4.2.5.RELEASE" scope="TEST"/>
-	<levels>
-		<level name="Maven: org.springframework:spring-context:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-aop:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: aopalliance:aopalliance:1.0" value="project"/>
-		<level name="Maven: org.springframework:spring-beans:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-core:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-expression:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-web:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: javax.xml.bind:jaxb-api:2.3.0" value="project"/>
-		<level name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" value="project"/>
-		<level name="Maven: org.springframework:spring-webmvc:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-jdbc:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-tx:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-context-support:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-websocket:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-messaging:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: org.springframework.data:spring-data-redis:1.8.3.RELEASE" value="project"/>
-		<level name="Maven: org.springframework.data:spring-data-keyvalue:1.2.3.RELEASE" value="project"/>
-		<level name="Maven: org.springframework.data:spring-data-commons:1.13.3.RELEASE" value="project"/>
-		<level name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" value="project"/>
-		<level name="Maven: org.thymeleaf:thymeleaf-spring4:3.0.5.RELEASE" value="project"/>
-		<level name="Maven: org.thymeleaf:thymeleaf:3.0.5.RELEASE" value="project"/>
-		<level name="Maven: org.attoparser:attoparser:2.0.3.RELEASE" value="project"/>
-		<level name="Maven: org.unbescape:unbescape:1.1.4.RELEASE" value="project"/>
-		<level name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.2.1" value="project"/>
-		<level name="Maven: org.codehaus.groovy:groovy:2.4.6" value="project"/>
-		<level name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:1.1.2" value="project"/>
-		<level name="Maven: com.github.theborakompanioni:thymeleaf-extras-shiro:2.0.0" value="project"/>
-		<level name="Maven: redis.clients:jedis:2.9.0" value="project"/>
-		<level name="Maven: org.apache.commons:commons-pool2:2.4.2" value="project"/>
-		<level name="Maven: org.mybatis:mybatis:3.2.8" value="project"/>
-		<level name="Maven: org.mybatis:mybatis-spring:1.2.2" value="project"/>
-		<level name="Maven: com.alibaba:druid:1.0.25" value="project"/>
-		<level name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.2" value="project"/>
-		<level name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" value="project"/>
-		<level name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.2" value="project"/>
-		<level name="Maven: mysql:mysql-connector-java:5.1.40" value="project"/>
-		<level name="Maven: org.slf4j:slf4j-api:1.7.21" value="project"/>
-		<level name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" value="project"/>
-		<level name="Maven: org.slf4j:slf4j-log4j12:1.7.21" value="project"/>
-		<level name="Maven: log4j:log4j:1.2.17" value="project"/>
-		<level name="Maven: org.apache.commons:commons-lang3:3.4" value="project"/>
-		<level name="Maven: commons-codec:commons-codec:1.10" value="project"/>
-		<level name="Maven: commons-fileupload:commons-fileupload:1.3.1" value="project"/>
-		<level name="Maven: commons-io:commons-io:2.2" value="project"/>
-		<level name="Maven: org.quartz-scheduler:quartz:1.8.5" value="project"/>
-		<level name="Maven: javax.transaction:jta:1.1" value="project"/>
-		<level name="Maven: javax.servlet:javax.servlet-api:3.1.0" value="project"/>
-		<level name="Maven: org.apache.shiro:shiro-web:1.3.2" value="project"/>
-		<level name="Maven: org.apache.shiro:shiro-core:1.3.2" value="project"/>
-		<level name="Maven: commons-beanutils:commons-beanutils:1.8.3" value="project"/>
-		<level name="Maven: org.apache.shiro:shiro-quartz:1.3.2" value="project"/>
-		<level name="Maven: org.opensymphony.quartz:quartz:1.6.1" value="project"/>
-		<level name="Maven: org.apache.shiro:shiro-spring:1.3.2" value="project"/>
-		<level name="Maven: junit:junit:4.12" value="project"/>
-		<level name="Maven: org.hamcrest:hamcrest-core:1.3" value="project"/>
-		<level name="Maven: org.springframework:spring-test:4.2.5.RELEASE" value="project"/>
-		<level name="Maven: com.alibaba:fastjson:1.2.31" value="project"/>
-		<level name="Maven: org.aspectj:aspectjrt:1.6.10" value="project"/>
-		<level name="Maven: org.aspectj:aspectjweaver:1.6.10" value="project"/>
-		<level name="Maven: javax.validation:validation-api:1.1.0.Final" value="project"/>
-		<level name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" value="project"/>
-		<level name="Maven: com.fasterxml:classmate:1.1.0" value="project"/>
-		<level name="Maven: com.googlecode.json-simple:json-simple:1.1.1" value="project"/>
-		<level name="Maven: org.apache.poi:poi:3.17" value="project"/>
-		<level name="Maven: org.apache.commons:commons-collections4:4.1" value="project"/>
-		<level name="Maven: org.apache.poi:poi-ooxml:3.17" value="project"/>
-		<level name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" value="project"/>
-		<level name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" value="project"/>
-		<level name="Maven: stax:stax-api:1.0.1" value="project"/>
-		<level name="Maven: com.github.virtuald:curvesapi:1.04" value="project"/>
-		<level name="Maven: com.aliyun:aliyun-java-sdk-dysmsapi:1.0.0" value="project"/>
-		<level name="Maven: com.aliyun:aliyun-java-sdk-core:3.5.0" value="project"/>
-		<level name="Maven: org.json:json:20170516" value="project"/>
-		<level name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.3" value="project"/>
-		<level name="Maven: org.apache.httpcomponents:httpcore:4.4.6" value="project"/>
-		<level name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.6" value="project"/>
-		<level name="Maven: org.apache.httpcomponents:httpclient:4.5.3" value="project"/>
-		<level name="Maven: commons-logging:commons-logging:1.2" value="project"/>
-		<level name="Maven: cn.jpush.api:jiguang-common:1.0.8" value="project"/>
-		<level name="Maven: com.squareup.okhttp3:okhttp:3.3.1" value="project"/>
-		<level name="Maven: com.squareup.okio:okio:1.8.0" value="project"/>
-		<level name="Maven: io.netty:netty-all:4.1.6.Final" value="project"/>
-		<level name="Maven: com.google.code.gson:gson:2.3" value="project"/>
-		<level name="Maven: javax.mail:mail:1.4.7" value="project"/>
-		<level name="Maven: javax.activation:activation:1.1" value="project"/>
-		<level name="Maven: cglib:cglib:3.1" value="project"/>
-		<level name="Maven: org.ow2.asm:asm:4.2" value="project"/>
-		<level name="Maven: org.ehcache:ehcache:3.4.0" value="project"/>
-	</levels>
-</component>

+ 11 - 12
src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml

@@ -437,10 +437,10 @@
 	</select>
 
 
-	<select id="userFollowList" resultType="com.goafanti.user.bo.outUserFollowList">
-		select b.nickname,b.share_type ,b.channel,b.id,
+	<select id="userFollowList" resultType="com.goafanti.user.bo.outUserFollowList" >
+		select b.nickname,b.share_type shareType ,b.channel,b.id,
 			   date_format(b.transfer_time,'%Y-%m-%d %H:%i:%s')startTimes,
-			   a.contact_type,c.name followName ,d.name followDep,a.`result` ,a.follow_count followCount,
+			   a.contact_type contactType,c.name followName ,d.name followDep,a.`result` ,a.follow_count followCount,
 			   a.guidance ,date_format(a.guidance_time,'%Y-%m-%d %H:%i:%s') guidanceTimes
 		from user_follow a left join  `user`b on a.uid =b.id left join admin c on b.aid =c.id
 		left join department d on c.department_id =d.id where 1=1
@@ -462,9 +462,11 @@
 		<if test="dateType !=null and startTime !=null and endTime !=null">
 		<if test="dateType ==1">
 		  and a.create_time between #{startTime} and #{endTime}
-		</if><if test="dateType ==1">
+		</if>
+		<if test="dateType ==2">
 		and b.transfer_time between #{startTime} and #{endTime}
-		</if><if test="dateType ==1">
+		</if>
+		<if test="dateType ==3">
 		and a.guidance_time between #{startTime} and #{endTime}
 		</if>
 		</if>
@@ -473,11 +475,8 @@
 			${page_sql}
 		</if>
 	</select>
-	<select id="userFollowCount" resultType="java.lang.Integer">
-		select b.nickname,b.share_type ,b.channel,b.id,
-		date_format(b.transfer_time,'%Y-%m-%d %H:%i:%s')startTimes,
-		a.contact_type,c.name followName ,d.name followDep,a.`result` ,a.follow_count followCount,
-		a.guidance ,date_format(a.guidance_time,'%Y-%m-%d %H:%i:%s') guidanceTimes
+	<select id="userFollowCount" resultType="java.lang.Integer" >
+		select count(*)
 		from user_follow a left join  `user`b on a.uid =b.id left join admin c on b.aid =c.id
 		left join department d on c.department_id =d.id where 1=1
 		<if test="userName != null">
@@ -498,9 +497,9 @@
 		<if test="dateType !=null and startTime !=null and endTime !=null">
 			<if test="dateType ==1">
 				and a.create_time between #{startTime} and #{endTime}
-			</if><if test="dateType ==1">
+			</if><if test="dateType ==2">
 			and b.transfer_time between #{startTime} and #{endTime}
-		</if><if test="dateType ==1">
+		</if><if test="dateType ==3">
 			and a.guidance_time between #{startTime} and #{endTime}
 		</if>
 		</if>

+ 30 - 24
src/main/java/com/goafanti/user/bo/outUserFollowList.java

@@ -2,18 +2,42 @@ package com.goafanti.user.bo;
 
 public class outUserFollowList {
     private String nickname;
-    private String shareType;
-    private String channel;
+    private Integer shareType;
+    private Integer channel;
     private String id;
     private String startTimes;
-    private String contact_type;
+    private Integer contactType;
     private String followName;
     private String followDep;
     private String result;
-    private String followCount;
+    private Integer followCount;
     private String guidance;
     private String guidanceTimes;
 
+    public Integer getShareType() {
+        return shareType;
+    }
+
+    public void setShareType(Integer shareType) {
+        this.shareType = shareType;
+    }
+
+    public Integer getContactType() {
+        return contactType;
+    }
+
+    public void setContactType(Integer contactType) {
+        this.contactType = contactType;
+    }
+
+    public Integer getFollowCount() {
+        return followCount;
+    }
+
+    public void setFollowCount(Integer followCount) {
+        this.followCount = followCount;
+    }
+
     public String getNickname() {
         return nickname;
     }
@@ -22,19 +46,13 @@ public class outUserFollowList {
         this.nickname = nickname;
     }
 
-    public String getShareType() {
-        return shareType;
-    }
 
-    public void setShareType(String shareType) {
-        this.shareType = shareType;
-    }
 
-    public String getChannel() {
+    public Integer getChannel() {
         return channel;
     }
 
-    public void setChannel(String channel) {
+    public void setChannel(Integer channel) {
         this.channel = channel;
     }
 
@@ -54,13 +72,7 @@ public class outUserFollowList {
         this.startTimes = startTimes;
     }
 
-    public String getContact_type() {
-        return contact_type;
-    }
 
-    public void setContact_type(String contact_type) {
-        this.contact_type = contact_type;
-    }
 
     public String getFollowName() {
         return followName;
@@ -86,13 +98,7 @@ public class outUserFollowList {
         this.result = result;
     }
 
-    public String getFollowCount() {
-        return followCount;
-    }
 
-    public void setFollowCount(String followCount) {
-        this.followCount = followCount;
-    }
 
     public String getGuidance() {
         return guidance;