Browse Source

数据统计-接口调试程序完善

黄远 5 years ago
parent
commit
f8c74c0469

+ 19 - 0
lift-batch-service/pom.xml

@@ -32,4 +32,23 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>cn.com.ty.lift.batch.BatchApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

+ 2 - 0
lift-batch-service/src/main/resources/application.yml

@@ -1,5 +1,7 @@
 server:
   port: 20231
+  tomcat:
+    basedir: /Users/huangyuan/application/tomcat/data/tomcat_temp
 
 spring:
   application:

+ 4 - 4
lift-system-service/pom.xml

@@ -18,10 +18,10 @@
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>cn.com.xwy</groupId>
-            <artifactId>xwy-cloud-dependencies</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.com.xwy</groupId>-->
+<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
+<!--        </dependency>-->
 
         <!-- 添加公共模块依赖 -->
         <dependency>

+ 1 - 1
lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -147,7 +147,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             //设置维保公司人数
             setCompanyUserNum(maintenanceCompanyList);
             for(MaintenanceCompany maintenanceCompany : maintenanceCompanyList) {
-                if(maintenanceCompany.getId() == maintenanceCompanyRequest.getCompanyId()) {
+                if(maintenanceCompany.getId().equals(maintenanceCompanyRequest.getCompanyId())) {
                     maintenanceCompany.setCurrentTeamFlag(true);
                 }
             }