修改判断标识

ureport2-console/pom.xml

@@ -4,7 +4,7 @@
 	<artifactId>ureport2-console</artifactId>
 	<version>2.2.9</version>
 	<parent>
-		<groupId>com.spcp.ureport</groupId>
+		<groupId>com.bstek.ureport</groupId>
 		<artifactId>ureport2-parent</artifactId>
 		<version>2.0.6</version>
 	</parent>
@@ -20,7 +20,7 @@
 			<version>1.7</version>
 		</dependency>
 		<dependency>
-			<groupId>com.spcp.ureport</groupId>
+			<groupId>com.bstek.ureport</groupId>
 			<artifactId>ureport2-core</artifactId>
 			<version>2.2.9</version>
 		</dependency>		

ureport2-console/upload.bat

@@ -5,7 +5,7 @@ set repoUrl=http://192.168.31.188:8081/repository/maven-releases/
 call mvn clean install
 
 
-xcopy %mvn_repo_home%com\spcp\ureport\ureport2-console\2.2.9\ureport2-console-2.2.9* %deploy_tmp_folder% /y
+xcopy %mvn_repo_home%com\bstek\ureport\ureport2-console\2.2.9\ureport2-console-2.2.9* %deploy_tmp_folder% /y
-call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
+call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
-call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-console-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
+call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
-call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%
+call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%

ureport2-core/pom.xml

@@ -3,7 +3,7 @@
 	<artifactId>ureport2-core</artifactId>
 	<version>2.2.9</version>
 	<parent>
-		<groupId>com.spcp.ureport</groupId>
+		<groupId>com.bstek.ureport</groupId>
 		<artifactId>ureport2-parent</artifactId>
 		<version>2.0.6</version>
 	</parent>

ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java

@@ -36,7 +36,7 @@ public abstract class RangeDateUtils {
     /**
      * 多选结尾标志
      */
-    public static final String MULTIPLE_SELECT = "Multiple";
+    public static final String MULTIPLE_SELECT = "CheckBox";
     /**
      * 判断是否需要分组
      */

ureport2-core/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Jul 10 13:55:07 CST 2020
+#Fri Jul 10 15:27:50 CST 2020
 version=2.2.9
-groupId=com.spcp.ureport
+groupId=com.bstek.ureport
 artifactId=ureport2-core

ureport2-core/upload.bat

@@ -5,7 +5,7 @@ set repoUrl=http://192.168.31.188:8081/repository/maven-releases/
 call mvn clean install
 
 
-xcopy %mvn_repo_home%com\spcp\ureport\ureport2-core\2.2.9\ureport2-core-2.2.9* %deploy_tmp_folder% /y
+xcopy %mvn_repo_home%com\bstek\ureport\ureport2-core\2.2.9\ureport2-core-2.2.9* %deploy_tmp_folder% /y
-call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
+call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
-call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-core-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
+call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-core-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId%
-call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%
+call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%

ureport2-parent/pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.spcp.ureport</groupId>
+	<groupId>com.bstek.ureport</groupId>
 	<artifactId>ureport2-parent</artifactId>
 	<version>2.0.6</version>
 	<packaging>pom</packaging>

ureport2-parent/upload.bat

@@ -4,5 +4,5 @@ set repositoryId=maven-releases
 set repoUrl=http://192.168.31.188:8081/repository/maven-releases/
 call mvn clean install
 
-xcopy %mvn_repo_home%com\spcp\ureport\ureport2-parent\2.0.6\ureport2-parent-2.0.6* %deploy_tmp_folder% /y
+xcopy %mvn_repo_home%com\bstek\ureport\ureport2-parent\2.0.6\ureport2-parent-2.0.6* %deploy_tmp_folder% /y
-call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-parent -Dversion=2.0.6 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-parent-2.0.6.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%
+call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-parent -Dversion=2.0.6 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-parent-2.0.6.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%