Skip to content

X
xzxt-qyxzpt-report
Commit 6bd9fff7 by liulianglang
Options

统计报表

parent 3a902288
Showing with 72 additions and 55 deletions
src/main/java/org/springblade/founder/tjfx/service/impl/AjtjServiceImpl.java
......@@ -24,7 +24,8 @@ public class AjtjServiceImpl implements AjtjService {
@Override
public List<AjtjResult> getFapafyuest(AjtjParam ajtjParam) {
List<AjtjResult> faan = ajtjMapper.getFapafyuest(ajtjParam);
List<AjtjResult> faans = ajtjMapper.getFapafyuest(ajtjParam);
List<AjtjResult> faan =NumberUtil.listToMap(faans,ajtjParam);
try {
if (faan.size() >= 2) {
AjtjResult lastnum = faan.get(faan.size() - 1);
......@@ -32,7 +33,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = faan.get(faan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
faan.get(faan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
faan.get(faan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// faan.get(faan.size() - 1).setName("环比下降" + format);
......@@ -51,13 +52,14 @@ public class AjtjServiceImpl implements AjtjService {
String qnrq = sdf.format(DateUtil.getDateBeforeToYear(sdf.parse(rq), 1));
Integer qnfa = ajtjMapper.getqnrqFaCount(qnrq,"");
//计算百分百
if (qnfa > lastfanum) {
String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
faan.get(faan.size() - 1).setName("同比下降" + format);
} else {
String format = String.format("%.2f", (((lastfanum - qnfa) / qnfa) * 100)) + "%";
faan.get(faan.size() - 1).setName("同比上升" + format);
}
faan.get(faan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// faan.get(faan.size() - 1).setName("同比下降" + format);
// } else {
// String format = String.format("%.2f", (((lastfanum - qnfa) / qnfa) * 100)) + "%";
// faan.get(faan.size() - 1).setName("同比上升" + format);
// }
}
} catch (Exception e) {
......@@ -72,7 +74,8 @@ public class AjtjServiceImpl implements AjtjService {
public List<AjtjResult> getPayuest(AjtjParam ajtjParam) {
List<AjtjResult> poan = ajtjMapper.getPayuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getPayuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -80,7 +83,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -99,7 +102,7 @@ public class AjtjServiceImpl implements AjtjService {
String qnrq = sdf.format(DateUtil.getDateBeforeToYear(sdf.parse(rq), 1));
Integer qnfa = ajtjMapper.getqnrqPaCount(qnrq,"");
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......@@ -121,7 +124,8 @@ public class AjtjServiceImpl implements AjtjService {
public List<AjtjResult> getGmrsqlFapafyuest(AjtjParam ajtjParam) {
String ajlbsql=" and asj.ajlbdm like '0400%' ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> faan = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faans = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faan =NumberUtil.listToMap(faans,ajtjParam);
try {
if (faan.size() >= 2) {
AjtjResult lastnum = faan.get(faan.size() - 1);
......@@ -129,7 +133,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = faan.get(faan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
faan.get(faan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
faan.get(faan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// faan.get(faan.size() - 1).setName("环比下降" + format);
......@@ -149,7 +153,7 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqFaCount(qnrq,ajlbsql);
//计算百分百
faan.get(faan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa.intValue()));
faan.get(faan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa.intValue()));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// faan.get(faan.size() - 1).setName("同比下降" + format);
......@@ -172,7 +176,8 @@ public class AjtjServiceImpl implements AjtjService {
String ajlbsql=" and asj.ajlbdm like '0400%' ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> poan = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -180,7 +185,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -200,7 +205,7 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqPaCount(qnrq,ajlbsql);
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......@@ -224,7 +229,8 @@ public class AjtjServiceImpl implements AjtjService {
" ,'02002202'\n" +
" ) ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> faan = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faans = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faan =NumberUtil.listToMap(faans,ajtjParam);
try {
if (faan.size() >= 2) {
AjtjResult lastnum = faan.get(faan.size() - 1);
......@@ -232,7 +238,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = faan.get(faan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
faan.get(faan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
faan.get(faan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// faan.get(faan.size() - 1).setName("环比下降" + format);
......@@ -252,7 +258,7 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqFaCount(qnrq,ajlbsql);
//计算百分百
faan.get(faan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
faan.get(faan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// faan.get(faan.size() - 1).setName("同比下降" + format);
......@@ -278,7 +284,8 @@ public class AjtjServiceImpl implements AjtjService {
" ) ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> poan = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -286,7 +293,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -306,7 +313,7 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqPaCount(qnrq,ajlbsql);
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......@@ -330,7 +337,8 @@ public class AjtjServiceImpl implements AjtjService {
" ,'040001000600' ,'040001009900' \n" +
" ) ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> faan = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faans = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faan =NumberUtil.listToMap(faans,ajtjParam);
try {
if (faan.size() >= 2) {
AjtjResult lastnum = faan.get(faan.size() - 1);
......@@ -338,7 +346,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = faan.get(faan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
faan.get(faan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
faan.get(faan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// faan.get(faan.size() - 1).setName("环比下降" + format);
......@@ -358,14 +366,14 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqFaCount(qnrq,ajlbsql);
//计算百分百
faan.get(faan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
if (qnfa > lastfanum) {
String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
faan.get(faan.size() - 1).setName("同比下降" + format);
} else {
String format = String.format("%.2f", (((lastfanum - qnfa) / qnfa) * 100)) + "%";
faan.get(faan.size() - 1).setName("同比上升" + format);
}
faan.get(faan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// faan.get(faan.size() - 1).setName("同比下降" + format);
// } else {
// String format = String.format("%.2f", (((lastfanum - qnfa) / qnfa) * 100)) + "%";
// faan.get(faan.size() - 1).setName("同比上升" + format);
// }
}
} catch (Exception e) {
......@@ -384,7 +392,8 @@ public class AjtjServiceImpl implements AjtjService {
" ) ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> poan = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -392,7 +401,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -412,7 +421,7 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqPaCount(qnrq,ajlbsql);
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......@@ -435,7 +444,8 @@ public class AjtjServiceImpl implements AjtjService {
" '02002601','02002604','02002607','02002610','02002613','02003101','02003103','03020100'\n" +
" ) ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> faan = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faans = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
List<AjtjResult> faan =NumberUtil.listToMap(faans,ajtjParam);
try {
if (faan.size() >= 2) {
AjtjResult lastnum = faan.get(faan.size() - 1);
......@@ -443,7 +453,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = faan.get(faan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
faan.get(faan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
faan.get(faan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// faan.get(faan.size() - 1).setName("环比下降" + format);
......@@ -463,7 +473,7 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqFaCount(qnrq,ajlbsql);
//计算百分百
faan.get(faan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
faan.get(faan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// faan.get(faan.size() - 1).setName("同比下降" + format);
......@@ -488,7 +498,8 @@ public class AjtjServiceImpl implements AjtjService {
" ) ";
ajtjParam.setAjlbsql(ajlbsql);
List<AjtjResult> poan = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getGmrsqlPayuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -496,7 +507,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -516,7 +527,7 @@ public class AjtjServiceImpl implements AjtjService {
Integer qnfa = ajtjMapper.getqnrqPaCount(qnrq,ajlbsql);
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......@@ -538,7 +549,8 @@ public class AjtjServiceImpl implements AjtjService {
public List<AjtjResult> getAjZarsyuest(AjtjParam ajtjParam) {
List<AjtjResult> poan = ajtjMapper.getAjZarsyuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getAjZarsyuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -546,7 +558,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -565,7 +577,7 @@ public class AjtjServiceImpl implements AjtjService {
String qnrq = sdf.format(DateUtil.getDateBeforeToYear(sdf.parse(rq), 1));
Integer qnfa = ajtjMapper.getqnrqZarsCount(qnrq);
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......@@ -586,7 +598,8 @@ public class AjtjServiceImpl implements AjtjService {
public List<AjtjResult> getAjPbrsyuest(AjtjParam ajtjParam) {
List<AjtjResult> poan = ajtjMapper.getAjPbrsyuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getAjPbrsyuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -594,7 +607,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -613,7 +626,7 @@ public class AjtjServiceImpl implements AjtjService {
String qnrq = sdf.format(DateUtil.getDateBeforeToYear(sdf.parse(rq), 1));
Integer qnfa = ajtjMapper.getqnrqPbrsCount(qnrq);
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......@@ -633,7 +646,8 @@ public class AjtjServiceImpl implements AjtjService {
public List<AjtjResult> getAjSwrsyuest(AjtjParam ajtjParam) {
List<AjtjResult> poan = ajtjMapper.getAjRybhSwrsyuest(ajtjParam);
List<AjtjResult> poans = ajtjMapper.getAjRybhSwrsyuest(ajtjParam);
List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
try {
if (poan.size() >= 2) {
AjtjResult lastnum = poan.get(poan.size() - 1);
......@@ -641,7 +655,7 @@ public class AjtjServiceImpl implements AjtjService {
AjtjResult lasternum = poan.get(poan.size() - 1);
Double lasterfanum = Double.parseDouble(lasternum.getFaNum());
//计算百分百
poan.get(poan.size() - 1).setName("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
poan.get(poan.size() - 1).setHb("环比"+NumberUtil.getTbhb(lastfanum.intValue(),lasterfanum.intValue()));
// if (lasterfanum > lastfanum) {
// String format = String.format("%.2f", (((lasterfanum - lastfanum) / lasterfanum) * 100)) + "%";
// poan.get(poan.size() - 1).setName("环比下降" + format);
......@@ -660,7 +674,7 @@ public class AjtjServiceImpl implements AjtjService {
String qnrq = sdf.format(DateUtil.getDateBeforeToYear(sdf.parse(rq), 1));
Integer qnfa = ajtjMapper.getqnrqAjYsdrCount(qnrq);
//计算百分百
poan.get(poan.size() - 1).setName("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
// if (qnfa > lastfanum) {
// String format = String.format("%.2f", (((qnfa - lastfanum) / qnfa) * 100)) + "%";
// poan.get(poan.size() - 1).setName("同比下降" + format);
......
src/main/java/org/springblade/founder/tjfx/service/impl/TjfxServiceImpl.java
......@@ -32,7 +32,8 @@ public class TjfxServiceImpl implements TjfxService {
@Override
public R getFafyuest(AjtjParam ajtjParam,String type) {
ajtjParam.setType(type);
List<AjtjResult> result = tjfxMapper.getFafyuest(ajtjParam);
List<AjtjResult> results = tjfxMapper.getFafyuest(ajtjParam);
List<AjtjResult> result =NumberUtil.listToMap(results,ajtjParam);
//计算同比环比数
if (result.size() > 0) {
//环比数
......@@ -58,7 +59,8 @@ public class TjfxServiceImpl implements TjfxService {
@Override
public R getPafyuest(AjtjParam ajtjParam,String type) {
ajtjParam.setType(type);
List<AjtjResult> result= tjfxMapper.getPafyuest(ajtjParam);
List<AjtjResult> results= tjfxMapper.getPafyuest(ajtjParam);
List<AjtjResult> result =NumberUtil.listToMap(results,ajtjParam);
//计算同比环比数
if (result.size() > 0) {
//环比数
......@@ -124,7 +126,8 @@ public class TjfxServiceImpl implements TjfxService {
@Override
public R getDxssjesfyuest(AjtjParam ajtjParam, String type) {
ajtjParam.setType(type);
List<AjtjResult> result= tjfxMapper.getDxssjesfyuest(ajtjParam);
List<AjtjResult> results= tjfxMapper.getDxssjesfyuest(ajtjParam);
List<AjtjResult> result =NumberUtil.listToMap(results,ajtjParam);
//计算同比环比数
if (result.size() > 0) {
//环比数
......
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