Skip to content

R
renren-fast
Commit 8092c765 authored by 张俊's avatar 张俊
Browse files
Options

基本信息-科目查询优化

parent 527094e8
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 192 deletions
src/main/java/io/renren/modules/app/service/impl/FwwxdshServiceImpl.java
View file @ 8092c765
...@@ -576,24 +576,24 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im ...@@ -576,24 +576,24 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
sqwxzqEntitys.get(i).setJsbzhu(s.getBz()); sqwxzqEntitys.get(i).setJsbzhu(s.getBz());
// 已决算，则下方房屋信息分摊列表通过jsdbh查询ywpzmx表 // 已决算，则下方房屋信息分摊列表通过jsdbh查询ywpzmx表
List<FwxxEntity> f = baseMapper.selectfwbyftqc(sqwxzqEntitys.get(i).getSqdbh()); List<FwxxEntity> f = baseMapper.selectfwbyftqc(sqwxzqEntitys.get(i).getSqdbh());
List<String> djbhs=baseMapper.selectdjbhbysqdbh2(sqwxzqEntitys.get(i).getSqdbh()); List<String> djbhs = baseMapper.selectdjbhbysqdbh2(sqwxzqEntitys.get(i).getSqdbh());
String djbhss="("; String djbhss = "(";
for(String djbh:djbhs){ for (String djbh : djbhs) {
if (djbh.equals(djbhs.get(0))) { if (djbh.equals(djbhs.get(0))) {
djbhss = djbhss + djbhs.get(0); djbhss = djbhss + djbhs.get(0);
} else if (djbhs.size() > 1) { } else if (djbhs.size() > 1) {
djbhss = djbhss + "," + djbh; djbhss = djbhss + "," + djbh;
} }
} }
djbhss = djbhss + ")"; djbhss = djbhss + ")";
List<YwpzmxEntity> listft=baseMapper.selectftqcsc2(djbhss); List<YwpzmxEntity> listft = baseMapper.selectftqcsc2(djbhss);
for (FwxxEntity fEntity : f) { for (FwxxEntity fEntity : f) {
//-------------------------------- //--------------------------------
for(YwpzmxEntity m:listft){ for (YwpzmxEntity m : listft) {
if(fEntity.getFwbm().equals(m.getFwbm())){ if (fEntity.getFwbm().equals(m.getFwbm())) {
fEntity.setDwje(m.getQdwje()); fEntity.setDwje(m.getQdwje());
fEntity.setGrje(m.getQgrje()); fEntity.setGrje(m.getQgrje());
fEntity.setDqye((double) Math.round((m.getQdwje()+m.getQgrje()) * 100) / 100); fEntity.setDqye((double) Math.round((m.getQdwje() + m.getQgrje()) * 100) / 100);
} }
} }
//-------------------------------- //--------------------------------
...@@ -634,14 +634,14 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im ...@@ -634,14 +634,14 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
// 计算每个维修单这个项目下所有房屋的sum(grje)+sum(dwje)(首次拨付前的账户金额和首次拨付后的账户金额) // 计算每个维修单这个项目下所有房屋的sum(grje)+sum(dwje)(首次拨付前的账户金额和首次拨付后的账户金额)
// 先计算余额拨付前的账户金额： // 先计算余额拨付前的账户金额：
SqwxzqEntity s1 = baseMapper.selectscbfqxmje(xmbms); SqwxzqEntity s1 = baseMapper.selectscbfqxmje(xmbms);
Double je=baseMapper.selectscwca(sqwxzqEntitys.get(i).getSqrq(), xmbms); Double je = baseMapper.selectscwca(sqwxzqEntitys.get(i).getSqrq(), xmbms);
// 再计算余额拨付后的账户金额： // 再计算余额拨付后的账户金额：
// SqwxzqEntity s2 = baseMapper.selectscbfhxmje2(xmbms); // SqwxzqEntity s2 = baseMapper.selectscbfhxmje2(xmbms);
sqwxzqEntitys.get(i).setScbfqxmje(s1.getScbfqxmje()-je-sqwxzqEntitys.get(i).getSpje()); sqwxzqEntitys.get(i).setScbfqxmje(s1.getScbfqxmje() - je - sqwxzqEntitys.get(i).getSpje());
if(sqwxzqEntitys.get(i).getYebfje()!=null){ if (sqwxzqEntitys.get(i).getYebfje() != null) {
sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje()-je-sqwxzqEntitys.get(i).getSpje()-sqwxzqEntitys.get(i).getYebfje()); sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje() - je - sqwxzqEntitys.get(i).getSpje() - sqwxzqEntitys.get(i).getYebfje());
}else{ } else {
sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje()-je-sqwxzqEntitys.get(i).getSpje()); sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje() - je - sqwxzqEntitys.get(i).getSpje());
} }
FjEntity js2 = baseMapper.selectwjdxbyfjid(sqwxzqEntitys.get(i).getFjid()); FjEntity js2 = baseMapper.selectwjdxbyfjid(sqwxzqEntitys.get(i).getFjid());
if (js2 != null || !"".equals(js2)) { if (js2 != null || !"".equals(js2)) {
......
src/main/java/io/renren/modules/app/service/impl/HKmServiceImpl.java
View file @ 8092c765
...@@ -72,6 +72,8 @@ public class HKmServiceImpl extends ServiceImpl<HKmDao, HKmEntity> implements HK ...@@ -72,6 +72,8 @@ public class HKmServiceImpl extends ServiceImpl<HKmDao, HKmEntity> implements HK
list=baseMapper.selectsjcd10222(hKmEntity); list=baseMapper.selectsjcd10222(hKmEntity);
}else if("4001".equals(hKmEntity.getKm())){ }else if("4001".equals(hKmEntity.getKm())){
list=baseMapper.selectsjcd102222(hKmEntity); list=baseMapper.selectsjcd102222(hKmEntity);
}else if("4101".equals(hKmEntity.getKm())){
list=baseMapper.selectsjcd102222(hKmEntity);
} }
}else if(res<=0){//旧科目 }else if(res<=0){//旧科目
if("101".equals(hKmEntity.getKm())){ if("101".equals(hKmEntity.getKm())){
......
src/main/resources/application-dev.yml
View file @ 8092c765
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
druid: druid:
first: #数据源1 first: #主要数据库
url: jdbc:mysql://192.168.101.231:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.101.152:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
username: root username: root
password: mysql123 password: root
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
max-wait: 60000 max-wait: 60000
pool-prepared-statements: true pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000 time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000 min-evictable-idle-time-millis: 300000
#validation-query: SELECT 1 FROM DUAL #validation-query: SELECT 1 FROM DUAL
test-while-idle: true test-while-idle: true
test-on-borrow: false test-on-borrow: false
test-on-return: false test-on-return: false
filter: filter:
stat: stat:
log-slow-sql: true log-slow-sql: true
slow-sql-millis: 1000 slow-sql-millis: 1000
merge-sql: false merge-sql: false
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
second: #数据源2 second: #数据源2
url: jdbc:mysql://192.168.101.145:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://192.168.101.145:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: root username: root
password: Cd@85617711 password: Cd@85617711
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
max-wait: 60000 max-wait: 60000
pool-prepared-statements: true pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000 time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000 min-evictable-idle-time-millis: 300000
#validation-query: SELECT 1 FROM DUAL #validation-query: SELECT 1 FROM DUAL
test-while-idle: true test-while-idle: true
test-on-borrow: false test-on-borrow: false
test-on-return: false test-on-return: false
filter: filter:
stat: stat:
log-slow-sql: true log-slow-sql: true
slow-sql-millis: 1000 slow-sql-millis: 1000
merge-sql: false merge-sql: false
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
stat-view-servlet: stat-view-servlet:
enabled: true enabled: true
url-pattern: /druid/* url-pattern: /druid/*
login-username: admin login-username: admin
login-password: j9iAirlFm7XYZcf1 login-password: j9iAirlFm7XYZcf1
\ No newline at end of file \ No newline at end of file
src/main/resources/application-prod.yml
View file @ 8092c765
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
druid: druid:
first: first:
url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: root username: root
password: root password: root
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
max-wait: 60000 max-wait: 60000
pool-prepared-statements: true pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000 time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000 min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL validation-query: SELECT 1 FROM DUAL
test-while-idle: true test-while-idle: true
test-on-borrow: false test-on-borrow: false
test-on-return: false test-on-return: false
filter: filter:
stat: stat:
log-slow-sql: true log-slow-sql: true
slow-sql-millis: 1000 slow-sql-millis: 1000
merge-sql: true merge-sql: true
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
second: second:
url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: renren username: renren
password: 123456 password: 123456
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
max-wait: 60000 max-wait: 60000
pool-prepared-statements: true pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000 time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000 min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL validation-query: SELECT 1 FROM DUAL
test-while-idle: true test-while-idle: true
test-on-borrow: false test-on-borrow: false
test-on-return: false test-on-return: false
filter: filter:
stat: stat:
log-slow-sql: true log-slow-sql: true
slow-sql-millis: 1000 slow-sql-millis: 1000
merge-sql: true merge-sql: true
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
stat-view-servlet: stat-view-servlet:
enabled: true enabled: true
url-pattern: /druid/* url-pattern: /druid/*
login-username: admin login-username: admin
login-password: j9iAirlFm7XYZcf1 login-password: j9iAirlFm7XYZcf1
\ No newline at end of file \ No newline at end of file
src/main/resources/application-test.yml
View file @ 8092c765
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
druid: druid:
first: first:
url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: renren username: renren
password: 123456 password: 123456
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
max-wait: 60000 max-wait: 60000
pool-prepared-statements: true pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000 time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000 min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL validation-query: SELECT 1 FROM DUAL
test-while-idle: true test-while-idle: true
test-on-borrow: false test-on-borrow: false
test-on-return: false test-on-return: false
filter: filter:
stat: stat:
log-slow-sql: true log-slow-sql: true
slow-sql-millis: 1000 slow-sql-millis: 1000
merge-sql: true merge-sql: true
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
second: second:
url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: renren username: renren
password: 123456 password: 123456
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
max-wait: 60000 max-wait: 60000
pool-prepared-statements: true pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000 time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000 min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL validation-query: SELECT 1 FROM DUAL
test-while-idle: true test-while-idle: true
test-on-borrow: false test-on-borrow: false
test-on-return: false test-on-return: false
filter: filter:
stat: stat:
log-slow-sql: true log-slow-sql: true
slow-sql-millis: 1000 slow-sql-millis: 1000
merge-sql: true merge-sql: true
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
stat-view-servlet: stat-view-servlet:
enabled: true enabled: true
url-pattern: /druid/* url-pattern: /druid/*
login-username: admin login-username: admin
login-password: j9iAirlFm7XYZcf1 login-password: j9iAirlFm7XYZcf1
\ No newline at end of file \ No newline at end of file
src/main/resources/application.yml
View file @ 8092c765
...@@ -87,8 +87,8 @@ renren: ...@@ -87,8 +87,8 @@ renren:
# token有效时长， 3600 * 12，单位秒 # token有效时长， 3600 * 12，单位秒
#expire: 604800 #expire: 604800
header: token header: token
myprops: #自定义的属性和值（上传文件保存到本地磁盘的地址配置）（2020-06-12加） myprops: #自定义的属性和值（上传文件保存到本地磁盘的地址配置）（2020-06-12加）
simpleprop: D:/wxzjwjk/wxdwj simpleprop: D:/wxzjwjk/wxdwj
src/main/resources/mapper/app/HKmDao.xml
View file @ 8092c765
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<select id="selectsjcd102222" parameterType="io.renren.modules.app.entity.HKmEntity" <select id="selectsjcd102222" parameterType="io.renren.modules.app.entity.HKmEntity"
resultType="io.renren.modules.app.entity.HKmEntity"> resultType="io.renren.modules.app.entity.HKmEntity">
select km,kmmc,pydm,kmlbbm,kmsx,djkm,jbh from h_km where km select km,kmmc,pydm,kmlbbm,kmsx,djkm,jbh from h_km where km
LIKE '4001%' and LENGTH(km)=6 and ztbm='0003' LIKE concat(#{km},'%') and LENGTH(km)=6 and ztbm='0003'
</select> </select>
<select id="selectsjcd110" parameterType="io.renren.modules.app.entity.HKmEntity" <select id="selectsjcd110" parameterType="io.renren.modules.app.entity.HKmEntity"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment