3 years ago · 98a1346e87
--- a/web/analysis-web-hb/src/main/java/com/gyee/analysis/model/auto/Project.java
+++ b/web/analysis-web-hb/src/main/java/com/gyee/analysis/model/auto/Project.java
@@ -64,7 +64,7 @@ public class Project extends Model {
 
				     private String shiftforemanphone;
			
 
				 
			
 
				     @TableField("ORDERNUM")
			
 
				-    private Double ordernum;
			
 
				+    private Integer ordernum;
			
 
				 
			
 
				 
			
 
				 }
			
--- a/web/analysis-web-hb/src/main/java/com/gyee/analysis/service/AnalysisNewService.java
+++ b/web/analysis-web-hb/src/main/java/com/gyee/analysis/service/AnalysisNewService.java
@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 
				 import com.gyee.analysis.init.CacheContext;
			
 
				 import com.gyee.analysis.model.auto.*;
			
 
				 import com.gyee.analysis.service.auto.*;
			
 
				+
			
 
				 import com.gyee.common.model.StringUtils;
			
 
				 import com.gyee.common.util.ClassUtil;
			
 
				-import com.gyee.common.util.CopyUtils;
			
 
				 import com.gyee.common.util.DateUtils;
			
 
				 import com.gyee.common.util.DoubleUtils;
			
 
				 import com.gyee.common.vo.analysis.AnalysisMainVo;
			
--- a/web/analysis-web-hb/src/main/resources/application.yml
+++ b/web/analysis-web-hb/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 
				 spring:
			
 
				   profiles:
			
 
				-#    active: dev
			
 
				-    active: test
			
 
				+    active: dev
			
 
				+#    active: test
			
--- a/web/analysis-web-hb/target/analysis-web-hb-1.0-SNAPSHOT.jar
+++ b/web/analysis-web-hb/target/analysis-web-hb-1.0-SNAPSHOT.jar
--- a/web/analysis-web-hb/target/analysis-web-hb-1.0-SNAPSHOT.jar.original
+++ b/web/analysis-web-hb/target/analysis-web-hb-1.0-SNAPSHOT.jar.original
--- a/web/analysis-web-hb/target/classes/application.yml
+++ b/web/analysis-web-hb/target/classes/application.yml
@@ -1,4 +1,4 @@
 
				 spring:
			
 
				   profiles:
			
 
				-#    active: dev
			
 
				-    active: test
			
 
				+    active: dev
			
 
				+#    active: test
			
--- a/web/analysis-web-hb/target/classes/com/gyee/analysis/init/CacheContext.class
+++ b/web/analysis-web-hb/target/classes/com/gyee/analysis/init/CacheContext.class
--- a/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Analysissubtablebottom.class
+++ b/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Analysissubtablebottom.class
--- a/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Analysiswindtarget.class
+++ b/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Analysiswindtarget.class
--- a/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Meterpoint.class
+++ b/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Meterpoint.class
--- a/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Project.class
+++ b/web/analysis-web-hb/target/classes/com/gyee/analysis/model/auto/Project.class
--- a/web/analysis-web-hb/target/classes/com/gyee/analysis/service/AnalysisNewService.class
+++ b/web/analysis-web-hb/target/classes/com/gyee/analysis/service/AnalysisNewService.class
--- a/web/analysis-web-hb/target/maven-archiver/pom.properties
+++ b/web/analysis-web-hb/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 
				 #Generated by Maven
			
 
				-#Thu Dec 30 17:10:39 CST 2021
			
 
				+#Wed Feb 16 15:54:26 CST 2022
			
 
				 version=1.0-SNAPSHOT
			
 
				 groupId=com.gyee
			
 
				 artifactId=analysis-web-hb
			
--- a/web/analysis-web-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/web/analysis-web-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,6 +1,9 @@
 
				+com\gyee\analysis\mapper\auto\MeterpointMapper.class
			
 
				 com\gyee\analysis\service\auto\IAnalysissubstationwindService.class
			
 
				+com\gyee\analysis\config\Status.class
			
 
				 com\gyee\analysis\controller\AnalysissubprojectwindcannotController.class
			
 
				 com\gyee\analysis\controller\AnalysiswindtargetController.class
			
 
				+com\gyee\analysis\service\auto\IAnalysissubtablebottomService.class
			
 
				 com\gyee\analysis\service\auto\IAnalysissubstationpvService.class
			
 
				 com\gyee\analysis\controller\AnalysissubstationpvController.class
			
 
				 com\gyee\analysis\controller\AnalysissubstationwindController.class
			
@@ -9,11 +12,18 @@ com\gyee\analysis\model\auto\Project.class
 
				 com\gyee\analysis\mapper\auto\AnalysissubstationwindMapper.class
			
 
				 com\gyee\analysis\controller\ProjectController.class
			
 
				 com\gyee\analysis\mapper\auto\ProjectMapper.class
			
 
				+com\gyee\analysis\controller\AnalysissubtablebottomController.class
			
 
				 com\gyee\analysis\config\CorsConfig.class
			
 
				 com\gyee\analysis\controller\AnalysissubprojectwindcanController.class
			
 
				+com\gyee\analysis\mapper\auto\AnalysismainMapper.class
			
 
				 com\gyee\analysis\model\auto\Analysissubprojectpvcannot.class
			
 
				 com\gyee\analysis\mapper\auto\AnalysissubprojectpvcannotMapper.class
			
 
				+com\gyee\analysis\service\auto\impl\MeterpointServiceImpl.class
			
 
				+com\gyee\analysis\config\GeneratorCodeConfig.class
			
 
				+com\gyee\analysis\service\auto\IWindpowerstationService.class
			
 
				+com\gyee\analysis\model\auto\Meterpoint.class
			
 
				 com\gyee\analysis\service\auto\impl\AnalysissubprojectpvcannotServiceImpl.class
			
 
				+com\gyee\analysis\service\auto\IAnalysismainService.class
			
 
				 com\gyee\analysis\service\auto\impl\AnalysiswindtargetServiceImpl.class
			
 
				 com\gyee\analysis\service\auto\IAnalysissubprojectpvcannotService.class
			
 
				 com\gyee\analysis\service\auto\impl\ProjectServiceImpl.class
			
@@ -21,25 +31,42 @@ com\gyee\analysis\controller\AnalysissubprojectpvcannotController.class
 
				 com\gyee\analysis\service\auto\impl\AnalysissubprojectwindcanServiceImpl.class
			
 
				 com\gyee\analysis\model\auto\Analysissubprojectwindcan.class
			
 
				 com\gyee\analysis\service\auto\IAnalysiswindtargetService.class
			
 
				+com\gyee\analysis\service\auto\impl\AnalysissubtablebottomServiceImpl.class
			
 
				 com\gyee\analysis\service\AnalysisNewService.class
			
 
				 com\gyee\analysis\service\AnalysisNewService$1.class
			
 
				 com\gyee\analysis\service\auto\impl\AnalysissubprojectpvcanServiceImpl.class
			
 
				 com\gyee\analysis\mapper\auto\AnalysissubstationpvMapper.class
			
 
				+com\gyee\analysis\model\auto\Analysismain.class
			
 
				+com\gyee\analysis\config\R.class
			
 
				 com\gyee\analysis\mapper\auto\AnalysissubprojectwindcanMapper.class
			
 
				 com\gyee\analysis\model\auto\Analysissubprojectpvcan.class
			
 
				+com\gyee\analysis\service\auto\impl\AnalysismainServiceImpl.class
			
 
				+com\gyee\analysis\service\auto\impl\WindpowerstationServiceImpl.class
			
 
				 com\gyee\analysis\service\auto\impl\AnalysissubstationwindServiceImpl.class
			
 
				 com\gyee\analysis\model\auto\Analysissubstationwind.class
			
 
				+com\gyee\analysis\mapper\auto\WindpowerstationMapper.class
			
 
				 com\gyee\analysis\init\CacheContext.class
			
 
				 com\gyee\analysis\mapper\auto\AnalysissubprojectpvcanMapper.class
			
 
				+com\gyee\analysis\service\auto\IMeterpointService.class
			
 
				+com\gyee\analysis\AnalysisMain.class
			
 
				+com\gyee\analysis\config\ResultCode.class
			
 
				+com\gyee\analysis\mapper\auto\AnalysissubtablebottomMapper.class
			
 
				+com\gyee\analysis\model\auto\Analysissubtablebottom.class
			
 
				 com\gyee\analysis\service\auto\IAnalysissubprojectpvcanService.class
			
 
				+com\gyee\analysis\config\MybatisPlusConfig.class
			
 
				 com\gyee\analysis\service\auto\IProjectService.class
			
 
				 com\gyee\analysis\service\auto\impl\AnalysissubstationpvServiceImpl.class
			
 
				+com\gyee\analysis\controller\AnalysismainController.class
			
 
				 com\gyee\analysis\controller\analysis\AnalysisNewController.class
			
 
				+com\gyee\analysis\config\ResultInfo.class
			
 
				+com\gyee\analysis\controller\WindpowerstationController.class
			
 
				 com\gyee\analysis\service\auto\IAnalysissubprojectwindcanService.class
			
 
				 com\gyee\analysis\mapper\auto\AnalysiswindtargetMapper.class
			
 
				 com\gyee\analysis\controller\AnalysissubprojectpvcanController.class
			
 
				 com\gyee\analysis\model\auto\Analysissubstationpv.class
			
 
				 com\gyee\analysis\service\auto\IAnalysissubprojectwindcannotService.class
			
 
				 com\gyee\analysis\service\auto\impl\AnalysissubprojectwindcannotServiceImpl.class
			
 
				+com\gyee\analysis\model\auto\Windpowerstation.class
			
 
				 com\gyee\analysis\model\auto\Analysissubprojectwindcannot.class
			
 
				+com\gyee\analysis\controller\MeterpointController.class
			
 
				 com\gyee\analysis\model\auto\Analysiswindtarget.class
			
--- a/web/analysis-web-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/web/analysis-web-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,4 +1,5 @@
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\IAnalysissubprojectwindcanService.java
			
 
				+D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\util\DynamicBean.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\controller\AnalysiswindtargetController.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\GeneratorCodeConfig.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\IAnalysissubprojectpvcannotService.java
			
@@ -25,6 +26,7 @@ D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\ini
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\model\auto\Analysissubtablebottom.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\MybatisPlusConfig.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\model\auto\Analysismain.java
			
 
				+D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\util\ClassUtil.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\model\auto\Analysissubprojectwindcan.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\WindpowerstationServiceImpl.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\mapper\auto\AnalysiswindtargetMapper.java
			
@@ -49,6 +51,7 @@ D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\con
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\AnalysissubprojectwindcannotServiceImpl.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\ProjectServiceImpl.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\AnalysissubprojectpvcannotServiceImpl.java
			
 
				+D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\util\DeskObject.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\R.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\ResultInfo.java
			
 
				 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\mapper\auto\AnalysissubprojectwindcannotMapper.java
			
--- a/web/analysis-web-hb/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/web/analysis-web-hb/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst