guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修复煤炭隐患台账 隐患统计增加统计部门 并且在计算处罚金额时 因为汉字报错

0927cmt
dearLin 2024-07-16 14:40:24 +08:00
parent 90bcb91890
commit a450bcda16
2 changed files with 3703 additions and 3516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java
View File

@ -727,7 +727,9 @@ public class HiddenServiceImpl implements HiddenService{
if(!Tools.isEmpty(zcbZc)){ if(!Tools.isEmpty(zcbZc)){
map.put("zcbZcZs",zcbZc.size()); //总数 map.put("zcbZcZs",zcbZc.size()); //总数
List<PageData> zcbZcWc = zcbZc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList()); List<PageData> zcbZcWc = zcbZc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList());
int zijin = zcbZc.stream().mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum(); int zijin = zcbZc.stream()
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
if(!Tools.isEmpty(zcbZcWc)){ if(!Tools.isEmpty(zcbZcWc)){
map.put("zcbZcZg",zcbZcWc.size()); map.put("zcbZcZg",zcbZcWc.size());
map.put("zcbZcWwcZg",zcbZc.size()-zcbZcWc.size()); map.put("zcbZcWwcZg",zcbZc.size()-zcbZcWc.size());
@ -751,7 +753,9 @@ public class HiddenServiceImpl implements HiddenService{
if(!Tools.isEmpty(xcbZc)){ if(!Tools.isEmpty(xcbZc)){
map.put("xcbZcZs",xcbZc.size()); //总数 map.put("xcbZcZs",xcbZc.size()); //总数
List<PageData> xcbZcWc = xcbZc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList()); List<PageData> xcbZcWc = xcbZc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList());
int zijin = xcbZc.stream().mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum(); int zijin = xcbZc.stream()
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
if(!Tools.isEmpty(xcbZcWc)){ if(!Tools.isEmpty(xcbZcWc)){
map.put("xcbZcZg",xcbZcWc.size()); map.put("xcbZcZg",xcbZcWc.size());
map.put("xcbZcWwcZg",xcbZc.size()-xcbZcWc.size()); map.put("xcbZcWwcZg",xcbZc.size()-xcbZcWc.size());
@ -775,7 +779,9 @@ public class HiddenServiceImpl implements HiddenService{
if(!Tools.isEmpty(bzbZc)){ if(!Tools.isEmpty(bzbZc)){
map.put("bzbZcZs",bzbZc.size()); //总数 map.put("bzbZcZs",bzbZc.size()); //总数
List<PageData> bzbZcWc = bzbZc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList()); List<PageData> bzbZcWc = bzbZc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList());
int zijin = bzbZc.stream().mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum(); int zijin = bzbZc.stream()
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
if(!Tools.isEmpty(bzbZcWc)){ if(!Tools.isEmpty(bzbZcWc)){
map.put("bzbZcZg",bzbZcWc.size()); map.put("bzbZcZg",bzbZcWc.size());
map.put("bzbZcWwcZg",bzbZc.size()-bzbZcWc.size()); map.put("bzbZcWwcZg",bzbZc.size()-bzbZcWc.size());
@ -803,7 +809,9 @@ public class HiddenServiceImpl implements HiddenService{
if(!Tools.isEmpty(zcbGsc)){ if(!Tools.isEmpty(zcbGsc)){
map.put("zcbGscZs",zcbGsc.size()); //总数 map.put("zcbGscZs",zcbGsc.size()); //总数
List<PageData> zcbGscWc = zcbGsc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList()); List<PageData> zcbGscWc = zcbGsc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList());
int zijin = zcbGsc.stream().mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum(); int zijin = zcbGsc.stream()
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
if(!Tools.isEmpty(zcbGscWc)){ if(!Tools.isEmpty(zcbGscWc)){
map.put("zcbGscZg",zcbGscWc.size()); map.put("zcbGscZg",zcbGscWc.size());
map.put("zcbGscWwcZg",zcbGsc.size()-zcbGscWc.size()); map.put("zcbGscWwcZg",zcbGsc.size()-zcbGscWc.size());
@ -827,7 +835,9 @@ public class HiddenServiceImpl implements HiddenService{
if(!Tools.isEmpty(xcbGsc)){ if(!Tools.isEmpty(xcbGsc)){
map.put("xcbGscZs",xcbGsc.size()); //总数 map.put("xcbGscZs",xcbGsc.size()); //总数
List<PageData> xcbGscWc = xcbGsc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList()); List<PageData> xcbGscWc = xcbGsc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList());
int zijin = xcbGsc.stream().mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum(); int zijin = xcbGsc.stream()
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
if(!Tools.isEmpty(xcbGscWc)){ if(!Tools.isEmpty(xcbGscWc)){
map.put("xcbGscZg",xcbGscWc.size()); map.put("xcbGscZg",xcbGscWc.size());
map.put("xcbGscWwcZg",xcbGsc.size()-xcbGscWc.size()); map.put("xcbGscWwcZg",xcbGsc.size()-xcbGscWc.size());
@ -851,7 +861,9 @@ public class HiddenServiceImpl implements HiddenService{
if(!Tools.isEmpty(bzbGsc)){ if(!Tools.isEmpty(bzbGsc)){
map.put("bzbGscZs",bzbGsc.size()); //总数 map.put("bzbGscZs",bzbGsc.size()); //总数
List<PageData> bzbGscWc = bzbGsc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList()); List<PageData> bzbGscWc = bzbGsc.stream().filter(item-> StringUtils.equals("4",item.getString("STATE"))).collect(Collectors.toList());
int zijin = bzbGsc.stream().mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum(); int zijin = bzbGsc.stream()
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
if(!Tools.isEmpty(bzbGscWc)){ if(!Tools.isEmpty(bzbGscWc)){
map.put("bzbGscZg",bzbGscWc.size()); map.put("bzbGscZg",bzbGscWc.size());
map.put("bzbGscWwcZg",bzbGsc.size()-bzbGscWc.size()); map.put("bzbGscWwcZg",bzbGsc.size()-bzbGscWc.size());

7195
src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
View File

File diff suppressed because it is too large Load Diff