统计优化

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml

@@ -575,8 +575,13 @@
         IFNULL( sum( CASE WHEN lc.STATUS = '农户已签署' THEN 1 ELSE 0 END ), 0 ) nhyqs,
         IFNULL( sum( CASE WHEN lc.STATUS = '未签署' THEN 1 ELSE 0 END ), 0 ) wqs,
         IFNULL( SUM( CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END ), 0 ) AS kcwtg,
-        IFNULL( SUM( CASE WHEN ps.process_status != '不通过' and ps.process_status != '完成' THEN 1 ELSE 0 END ), 0 ) AS kcjxz,
         IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END ), 0 ) AS kcywc,
+        IFNULL( SUM( CASE WHEN ps.process_status = '设计待审核' THEN 1 ELSE 0 END ), 0 ) AS sjdsh,
+        IFNULL( SUM( CASE WHEN ps.process_status = '投融待审核' THEN 1 ELSE 0 END ), 0 ) AS trdsh,
+        IFNULL( SUM( CASE WHEN ps.process_status = '法务待审核' THEN 1 ELSE 0 END ), 0 ) AS fwdsh,
+        IFNULL( SUM( CASE WHEN ps.process_status = '典设图纸待上传' THEN 1 ELSE 0 END ), 0 ) AS dstzsc,
+        IFNULL( SUM( CASE WHEN ps.process_status = '施工图纸待上传' THEN 1 ELSE 0 END ), 0 ) AS sgtzsc,
+        IFNULL( SUM( CASE WHEN ps.process_status = '图纸待审校' THEN 1 ELSE 0 END ), 0 ) AS tzdsj,
         IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS kcywcrl
         FROM
         hygf_power_station ps

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-kingbase8.properties

 ## DB properties:
 spring.datasource.dynamic.primary= mysql-service
 spring.datasource.mysql-service.driver-class-name=com.kingbase8.Driver
-spring.datasource.mysql-service.jdbc-url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.mysql-service.jdbc-url=jdbc:kingbase8://192.168.0.68:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.mysql-service.username=root
 spring.datasource.mysql-service.password=Yeejoin@2020
 spring.datasource.mysql-service.type=com.alibaba.druid.pool.DruidDataSource
@@ -23,7 +23,7 @@ spring.datasource.mysql-service.connection-timeout: 30000
 
 
 spring.datasource.tdengine-service.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://10.20.0.169:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
+spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://192.168.0.61:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
 spring.datasource.tdengine-service.username=root
 spring.datasource.tdengine-service.password=taosdata
 spring.datasource.tdengine-service.type=com.zaxxer.hikari.HikariDataSource
@@ -50,11 +50,11 @@ spring.datasource.tdengine-service.connection-test-query: SELECT 1
 
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+eureka.instance.hostname=192.168.0.46
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=10.20.1.210
+spring.redis.host=192.168.0.70
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -90,7 +90,7 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://10.20.1.210:2883
+emqx.broker=tcp://192.168.0.70:2883
 emqx.user-name=admin
 emqx.password=public
 emqx.max-inflight=1000