anderx 4 years ago
parent
commit
34ba2fbfd9
24 changed files with 305 additions and 154 deletions
  1. 104 0
      kede-server.eml
  2. 6 17
      pom.xml
  3. 3 3
      src/main/java/com/goafanti/achievement/bo/AchievementListBo.java
  4. 1 1
      src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java
  5. 1 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  6. 10 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  7. 1 2
      src/main/java/com/goafanti/common/dao/PatentNewMapper.java
  8. 34 34
      src/main/java/com/goafanti/common/dao/TOrderBonusMapper.java
  9. 3 0
      src/main/java/com/goafanti/common/dao/UserMapper.java
  10. 1 1
      src/main/java/com/goafanti/common/mapper/BusinessProjectModelMapper.xml
  11. 15 3
      src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml
  12. 2 2
      src/main/java/com/goafanti/common/mapper/TOrderBackMapper.xml
  13. 5 0
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  14. 71 71
      src/main/java/com/goafanti/common/model/TOrderBonus.java
  15. 6 6
      src/main/java/com/goafanti/demand/bo/DemandListBo.java
  16. 18 1
      src/main/java/com/goafanti/patent/bo/PatentNewBo.java
  17. 4 1
      src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java
  18. 3 0
      src/main/java/com/goafanti/user/service/UserService.java
  19. 6 0
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  20. 1 1
      src/main/java/com/goafanti/user/service/impl/UserServiceServiceImpl.java
  21. 1 1
      src/main/resources/props/config_dev.properties
  22. 6 6
      src/main/resources/props/config_local.properties
  23. 1 1
      src/main/webapp/WEB-INF/views/portal/financial/index.html
  24. 2 2
      src/main/webapp/WEB-INF/views/portal/service/projectDetails.html

+ 104 - 0
kede-server.eml

@@ -0,0 +1,104 @@
+<?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>

+ 6 - 17
pom.xml

@@ -70,24 +70,18 @@
 			<artifactId>spring-web</artifactId>
 			<version>${org.springframework-version}</version>
 		</dependency>
-
-
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<version>1.0</version>
-		</dependency>
+	<!-- Javax Annotation -->  
+<dependency>
+     <groupId>javax.xml.bind</groupId>
+     <artifactId>jaxb-api</artifactId>
+     <version>2.3.0</version>
+ </dependency>    
 		<!-- hibernate-validator -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<version>5.4.0.Final</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.0</version>
-		</dependency>
 		<!-- <dependency> <groupId>de.dfki.cos.basys.platform.wrapper-bundle-settings</groupId> 
 			<artifactId>javax.websocket-api</artifactId> <version>0.2.6</version> <scope>provided</scope> 
 			</dependency> -->
@@ -314,11 +308,6 @@
 			<artifactId>aspectjweaver</artifactId>
 			<version>${org.aspectj-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib</artifactId>
-			<version>2.2.2</version>
-		</dependency>
 		<!-- JSR-303 bean validator -->
 		<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
 		<dependency>

+ 3 - 3
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -406,7 +406,7 @@ public class AchievementListBo {
 		this.hot = hot;
 	}
 
-
+
 	public String getCountInterest() {
 		if (StringUtils.isBlank(countInterest)) countInterest = "20";
 			return String.valueOf(Integer.valueOf(countInterest)+20);
@@ -433,7 +433,7 @@ public class AchievementListBo {
 
 	public void setOwnerPostalAddress(String ownerPostalAddress) {
 		this.ownerPostalAddress = ownerPostalAddress;
-	}
+	}
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -447,7 +447,7 @@ public class AchievementListBo {
 		} else {
 			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
-
+
 	}
 
 	public String getBuyIntention() {

+ 1 - 1
src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java

@@ -107,7 +107,7 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	}
 
 	public String getCountInterest() {
-		if (StringUtils.isBlank(CountInterest)) CountInterest = "20";
+		if (StringUtils.isBlank(CountInterest)) CountInterest = "20";
 		return String.valueOf(Integer.valueOf(CountInterest)+20);
 	}
 

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -93,7 +93,7 @@ public interface AchievementService {
 	Pagination<AchievementPartnerListBo> listAppMyAchievement(Integer pNo, Integer pSize);
 
 	AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id);
-
+
 
 	int saveAppAchievement(Achievement a, String[] keywords);
 

+ 10 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -38,6 +38,7 @@ import org.springframework.web.socket.TextMessage;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.AttachmentService;
 import com.goafanti.common.bo.Error;
+import com.goafanti.common.bo.OutUser;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -54,8 +55,10 @@ import com.goafanti.common.utils.PictureUtils;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.common.utils.excel.FileUtils;
+import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.websocket.SystemWebSocketHandler;
+import com.goafanti.patent.bo.PatentNewBo;
 import com.goafanti.user.service.UserService;
 
 @Controller
@@ -737,6 +740,13 @@ public class PublicController extends CertifyApiController {
 			return res;
           }
           
+          @RequestMapping("/getUser")
+          public Result getUser() {
+        	  List<OutUser> list=userService.getuser();
+        	  NewExcelUtil<OutUser> excel=new NewExcelUtil<OutUser>(OutUser.class);
+      		return excel.exportExcel(list, "客户列表",uploadPath);
+          }
+          
 
 	
 }

+ 1 - 2
src/main/java/com/goafanti/common/dao/PatentNewMapper.java

@@ -52,11 +52,10 @@ public interface PatentNewMapper {
 	void updateAdmin(@Param("aid")String aid, @Param("transferId")String transferId);
 
 
-	void insertLogBatch(List<PatentNewLog> list);
 
 	void insertBatch(List<PatentNew> list2);
 
-	int selectByPatenNo(String patentNo);
+	Integer selectByPatenNo(String patentNo);
 
 	List<PatentNew> selectByYear(int i);
 

+ 34 - 34
src/main/java/com/goafanti/common/dao/TOrderBonusMapper.java

@@ -12,101 +12,101 @@ public interface TOrderBonusMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	long countByExample(TOrderBonusExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int deleteByExample(TOrderBonusExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int deleteByPrimaryKey(String id);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int insert(TOrderBonus record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int insertSelective(TOrderBonus record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	List<TOrderBonus> selectByExample(TOrderBonusExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	TOrderBonus selectByPrimaryKey(String id);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int updateByExampleSelective(@Param("record") TOrderBonus record, @Param("example") TOrderBonusExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int updateByExample(@Param("record") TOrderBonus record, @Param("example") TOrderBonusExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int updateByPrimaryKeySelective(TOrderBonus record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int updateByPrimaryKey(TOrderBonus record);
 	List<TOrderBonusBo> getDeptBySome(TOrderBonusBo bonusBo);
@@ -116,4 +116,4 @@ public interface TOrderBonusMapper {
 	int checkByOnoAndSub(TOrderBonus bonus);
 	
 	int checkNoPay(TOrderBonusBo bonusBo);
-}
+}

+ 3 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.app.bo.UserBasicInfo;
+import com.goafanti.common.bo.OutUser;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrganizationContactBook;
@@ -292,6 +293,8 @@ public interface UserMapper {
 
 	List<CustomerSimpleBo> getUserByName(String name);
 
+	List<OutUser> getAllUser();
+
 	
 	
 }

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

@@ -427,5 +427,5 @@ select  p.pname
 from business_project_model p
 where status=0  
 and  pid=#{pid,jdbcType=VARCHAR}
-  </select>
+  </select>
 </mapper>

+ 15 - 3
src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml

@@ -477,6 +477,12 @@
 		<if test="depName != null">
 			and tm.dep_name = #{depName}
 		</if>
+		<if test="inputDep != null">
+			and ia.department_id = #{inputDep}
+		</if>
+		<if test="followDep != null">
+			and b.department_id  = #{followDep}
+		</if>
 		<if test="salesmanRemind !=null">
 			and a.salesman_remind= #{salesmanRemind}
 		</if>
@@ -495,12 +501,12 @@
 			left join admin e on e.department_id=c.id
 		</if>
 		where 1=1
-			<if test="shiro ==0">
+		<if test="shiro ==0">
 			<if test="isFollow ==1">
-			and a.aid = #{aid,jdbcType=VARCHAR}
+				and a.aid = #{aid,jdbcType=VARCHAR}
 			</if>
 			<if test="isFollow ==0">
-			and a.input_id = #{aid,jdbcType=VARCHAR}
+				and a.input_id = #{aid,jdbcType=VARCHAR}
 			</if>
 		</if>
 		<if test="shiro ==1">
@@ -536,6 +542,12 @@
 		<if test="depName != null">
 			and tm.dep_name = #{depName}
 		</if>
+		<if test="inputDep != null">
+			and ia.department_id = #{inputDep}
+		</if>
+		<if test="followDep != null">
+			and b.department_id  = #{followDep}
+		</if>
 		<if test="salesmanRemind !=null">
 			and a.salesman_remind= #{salesmanRemind}
 		</if>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.goafanti.common.dao.TOrderBackMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderBack">
     <!--
-
+
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Nov 21 11:44:14 CST 2018.
@@ -423,6 +423,6 @@
   </update>
   <update id="updateByOrderNoAndBackStatus" parameterType="java.lang.String">
   update t_order_back set back_status=1 where  back_status=0 and order_no= #{orderNo,jdbcType=VARCHAR} 
-
+
   </update>
 </mapper>

+ 5 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2278,4 +2278,9 @@ inner join(
     <select id="getUserByNameCount" resultType="java.lang.Integer" >
   	select count(*) from `user` where nickname like concat('%',#{name},'%')
     </select>
+    <select id="getAllUser" resultType="com.goafanti.common.bo.OutUser">
+    select a.nickname userName,b.name ,b.mobile,b.`position`,d.name province from `user`  a  left join organization_contact_book b on a.id=b.uid
+	left join organization_identity c on a.id=c.uid  left join district_glossory d on c.location_province =d.id 
+	where a.`type` =1 and a.source in(1,2,3) and status =0 order by a.nickname 
+    </select>
 </mapper>

+ 71 - 71
src/main/java/com/goafanti/common/model/TOrderBonus.java

@@ -6,83 +6,83 @@ public class TOrderBonus {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.id
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.create_time
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.order_no
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.bonus_subject
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private Integer bonusSubject;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_status
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private Integer grantStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_target
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private String grantTarget;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_by
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private String grantBy;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_time
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private Date grantTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_type
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	private Integer grantType;
 	private Integer taskId;
@@ -90,11 +90,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.id
 	 * @return  the value of t_order_bonus.id
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public String getId() {
 		return id;
@@ -103,11 +103,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.id
 	 * @param id  the value for t_order_bonus.id
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -116,11 +116,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.create_time
 	 * @return  the value of t_order_bonus.create_time
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -129,11 +129,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.create_time
 	 * @param createTime  the value for t_order_bonus.create_time
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -142,11 +142,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.order_no
 	 * @return  the value of t_order_bonus.order_no
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -155,11 +155,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.order_no
 	 * @param orderNo  the value for t_order_bonus.order_no
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -168,11 +168,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.bonus_subject
 	 * @return  the value of t_order_bonus.bonus_subject
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public Integer getBonusSubject() {
 		return bonusSubject;
@@ -181,11 +181,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.bonus_subject
 	 * @param bonusSubject  the value for t_order_bonus.bonus_subject
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setBonusSubject(Integer bonusSubject) {
 		this.bonusSubject = bonusSubject;
@@ -194,11 +194,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_status
 	 * @return  the value of t_order_bonus.grant_status
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public Integer getGrantStatus() {
 		return grantStatus;
@@ -207,11 +207,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_status
 	 * @param grantStatus  the value for t_order_bonus.grant_status
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setGrantStatus(Integer grantStatus) {
 		this.grantStatus = grantStatus;
@@ -220,11 +220,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_target
 	 * @return  the value of t_order_bonus.grant_target
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public String getGrantTarget() {
 		return grantTarget;
@@ -233,11 +233,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_target
 	 * @param grantTarget  the value for t_order_bonus.grant_target
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setGrantTarget(String grantTarget) {
 		this.grantTarget = grantTarget;
@@ -264,11 +264,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_time
 	 * @return  the value of t_order_bonus.grant_time
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public Date getGrantTime() {
 		return grantTime;
@@ -277,11 +277,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_time
 	 * @param grantTime  the value for t_order_bonus.grant_time
-
+
 	 
-
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setGrantTime(Date grantTime) {
 		this.grantTime = grantTime;
@@ -300,7 +300,7 @@ public class TOrderBonus {
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_type
 	 * @param grantType  the value for t_order_bonus.grant_type
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-
+
 	 */
 	public void setGrantType(Integer grantType) {
 		this.grantType = grantType;
@@ -313,4 +313,4 @@ public class TOrderBonus {
 	public void setTaskId(Integer taskId) {
 		this.taskId = taskId;
 	}
-}
+}

+ 6 - 6
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -90,7 +90,7 @@ public class DemandListBo {
 	 */
 	private Integer	auditStatus;
 
-	/**
+	/**
 	 * 关注数量
 	 */
 	private String countInterest;
@@ -100,7 +100,7 @@ public class DemandListBo {
 	private Integer  urgentDays;
 	private BigDecimal urgentMoney;
 
-	
+	
 	private Date createTime;
 	
 	private String remark;
@@ -121,7 +121,7 @@ public class DemandListBo {
 	private String contactMobile;
 	
 
-	@JsonFormat(shape = Shape.STRING)
+	@JsonFormat(shape = Shape.STRING)
 	public String getIndustryCategory1() {
 		return industryCategory1;
 	}
@@ -318,7 +318,7 @@ public class DemandListBo {
 		this.demandTypeS = demandTypeS;
 	}
 
-
+
 	public String getCountInterest() {
 		if (StringUtils.isBlank(countInterest)) countInterest = "0";
 		return String.valueOf(Integer.valueOf(countInterest)+20);
@@ -369,7 +369,7 @@ public class DemandListBo {
 
 	public void setIndustryCategoryC(Integer industryCategoryC) {
 		this.industryCategoryC = industryCategoryC;
-	}
+	}
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -391,7 +391,7 @@ public class DemandListBo {
 
 	public void setRemark(String remark) {
 		this.remark = remark;
-
+
 	}
 
 	public Integer getBoutique() {

+ 18 - 1
src/main/java/com/goafanti/patent/bo/PatentNewBo.java

@@ -60,6 +60,8 @@ public class PatentNewBo extends PatentNew{
 	private String createTimes;
 	@Excel(name = "跟进人")
 	private String aname;
+	private String inputDep;
+	private String followDep;
 	private String updateTimes;
 	private String startDate;
 	private String endDates;
@@ -67,7 +69,22 @@ public class PatentNewBo extends PatentNew{
 	private String createStart;
 	private String createEnd;
 	private Integer isFollow;
-	
+
+	public String getFollowDep() {
+		return followDep;
+	}
+
+	public void setFollowDep(String followDep) {
+		this.followDep = followDep;
+	}
+	public String getInputDep() {
+		return inputDep;
+	}
+
+	public void setInputDep(String inputDep) {
+		this.inputDep = inputDep;
+	}
+
 	public Integer getCostReduction() {
 		return costReduction;
 	}

+ 4 - 1
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -221,6 +221,9 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		if(p.getAnnualFeeStatus()!=null)params.put("annualFeeStatus", p.getAnnualFeeStatus());
 		if(p.getUserName()!=null)params.put("userName", p.getUserName());
 		if(p.getSalesmanRemind()!=null)params.put("salesmanRemind", p.getSalesmanRemind());
+		if(p.getInputDep()!=null)params.put("inputDep", p.getInputDep());
+		if(p.getFollowDep()!=null)params.put("followDep", p.getFollowDep());
+
 		if(p.getIsFollow()!=null) {
 			params.put("isFollow", p.getIsFollow());
 		}else {
@@ -362,7 +365,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行"+cellNum+"列输入内容不正确。"));
 					}
 			    	if (cellNum==0&&trb.getPatentNo()!=null) {
-						int i=patentNewMapper.selectByPatenNo(trb.getPatentNo());
+						Integer i=patentNewMapper.selectByPatenNo(trb.getPatentNo());
 						if (i>0) {
 							throw new BusinessException(new Error("表格第"+(rowNum+1)+"行[专利编号]系统已存在。"));
 						}

+ 3 - 0
src/main/java/com/goafanti/user/service/UserService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.app.bo.UserBasicInfo;
+import com.goafanti.common.bo.OutUser;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -75,6 +76,8 @@ public interface UserService {
 	 * @param type 0回收 1释放
 	 */
 	void pushReleaseUserChannel(List<userDaysBo> newCList, Integer type);
+
+	List<OutUser> getuser();
 	
 	
 }

+ 6 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.goafanti.app.bo.UserBasicInfo;
+import com.goafanti.common.bo.OutUser;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.CopyrightInfoMapper;
@@ -378,6 +379,11 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		userMapper.updateReleaseUserChannel(newCList,type);
 		
 	}
+
+	@Override
+	public List<OutUser> getuser() {
+		return userMapper.getAllUser();
+	}
 	
 	
 }

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceServiceImpl.java

@@ -36,7 +36,7 @@ public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
 	@Override
 	public int addUseService(InputUserServiceFollow us) {
 		us.setAid(TokenManager.getAdminId());
-		if (us.getRenewal()==6) {
+		if (StringUtils.isNotBlank(us.getRenewalTimes())) {
 			us.setRenewalTime(DateUtils.StringToDate(us.getRenewalTimes(), AFTConstants.YYYYMMDD));	
 		}
 		Date date=new Date();

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.44
+static.host=//afts.hnzhiming.com/1.0.44
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 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

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/index.html

@@ -244,7 +244,7 @@
 		</div>
 		<div class="allproduct_bottom">
 			<div class="allproduct_cont">
-				<ul id="demandList_patent">
+				<ul id="demandList_patent">
 					
 				</ul>
 			</div>

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/service/projectDetails.html

@@ -47,7 +47,7 @@
 					<div class="guigethree" th:if="${#lists.size(projectDetail.projectSize) ge 3}" th:text="${projectDetail.projectSize[2]}">
 					</div>
 				</div>
-				<div id="cont">
+				<div id="cont">
 					<div class="miaoshu">
 						<div class="lineB">
 							项目描述
@@ -68,7 +68,7 @@
 						</div>
 						<div th:utext="${projectDetail.clientSize}">
 						</div>
-					</div>
+					</div>
 				</div>
 				<div class="lianxi">
 					<div class="fuwu">