潘钊 / bsth_control · Commits

Commit f9a469fa35433111cecdb455ecd587c1234ad08c

Authored by 娄高锋
1 parent 47d423b5

update

Inline Side-by-side
Showing 3 changed files with 91 additions and 5 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @f9a469f
... ... @@ -1656,6 +1656,20 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1656 1656 keyMap.put(key, new ArrayList<ScheduleRealInfo>());
1657 1657 keyMap.get(key).add(schedule);
1658 1658 }
  1659 +
  1660 + Map<String, Object> temp = new HashMap<String, Object>();
  1661 + int jhbc_ = 0, sjbc_ = 0,
  1662 + lzbc_ = 0, dmbc_ = 0,
  1663 + gzbc_ = 0, jfbc_ = 0, zsbc_ = 0,
  1664 + qrbc_ = 0, qcbc_ = 0, kxbc_ = 0,
  1665 + qhbc_ = 0, wybc_ = 0, qtbc_ = 0;
  1666 + BigDecimal jhlc_ = new BigDecimal("0"), sjlc_ = new BigDecimal("0"),
  1667 + lzlc_ = new BigDecimal("0"), dmlc_ = new BigDecimal("0"),
  1668 + gzlc_ = new BigDecimal("0"), jflc_ = new BigDecimal("0"),
  1669 + zslc_ = new BigDecimal("0"), qrlc_ = new BigDecimal("0"),
  1670 + qclc_ = new BigDecimal("0"), kxlc_ = new BigDecimal("0"),
  1671 + qhlc_ = new BigDecimal("0"), wylc_ = new BigDecimal("0"),
  1672 + qtlc_ = new BigDecimal("0");
1659 1673 for(String key : keyMap.keySet()){
1660 1674 Map<String, Object> tempMap = new HashMap<String, Object>();
1661 1675 int jhbc = 0, sjbc = 0,
... ... @@ -1779,6 +1793,73 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1779 1793 tempMap.put("qtbfb", df.format(jhbc>0?(double)qtbc/jhbc*100:0)+"%");
1780 1794  
1781 1795 resList.add(tempMap);
  1796 +
  1797 +
  1798 + jhbc_ += jhbc; sjbc_ += sjbc;
  1799 + lzbc_ += lzbc; dmbc_ += dmbc;
  1800 + gzbc_ += gzbc; jfbc_ += jfbc; zsbc_ += zsbc;
  1801 + qrbc_ += qrbc; qcbc_ += qcbc; kxbc_ += kxbc;
  1802 + qhbc_ += qhbc; wybc_ += wybc; qtbc_ += qtbc;
  1803 + jhlc_ = jhlc_.add(jhlc); sjlc_ = sjlc_.add(sjlc);
  1804 + lzlc_ = lzlc_.add(lzlc); dmlc_ = dmlc_.add(dmlc);
  1805 + gzlc_ = gzlc_.add(gzlc); jflc_ = jflc_.add(jflc);
  1806 + zslc_ = zslc_.add(zslc); qrlc_ = qrlc_.add(qrlc);
  1807 + qclc_ = qclc_.add(qclc); kxlc_ = kxlc_.add(kxlc);
  1808 + qhlc_ = qhlc_.add(qhlc); wylc_ = wylc_.add(wylc);
  1809 + qtlc_ = qtlc_.add(qtlc);
  1810 + }
  1811 +
  1812 + if(resList.size() > 0){
  1813 + boolean flag = true;
  1814 + if(jhlc_.doubleValue() == 0d){
  1815 + flag = false;
  1816 + }
  1817 + temp.put("date", "");
  1818 + temp.put("company", "");
  1819 + temp.put("subCompany", "");
  1820 + temp.put("times", "");
  1821 + temp.put("line", "合计");
  1822 + temp.put("jhbc", jhbc_);
  1823 + temp.put("sjbc", sjbc_);
  1824 + temp.put("bcbfb", df.format(jhbc_>0?(double)sjbc_/jhbc_*100:0)+"%");
  1825 + temp.put("jhlc", jhlc_.doubleValue());
  1826 + temp.put("sjlc", sjlc_.doubleValue());
  1827 + temp.put("lcbfb", df.format(flag?sjlc_.divide(jhlc_, 4, BigDecimal.ROUND_HALF_UP).doubleValue()*100:0)+"%");
  1828 + temp.put("lzbc", lzbc_);
  1829 + temp.put("lzlc", lzlc_.doubleValue());
  1830 + temp.put("lzbfb", df.format(jhbc_>0?(double)lzbc_/jhbc_*100:0)+"%");
  1831 + temp.put("dmbc", dmbc_);
  1832 + temp.put("dmlc", dmlc_.doubleValue());
  1833 + temp.put("dmbfb", df.format(jhbc_>0?(double)dmbc_/jhbc_*100:0)+"%");
  1834 + temp.put("gzbc", gzbc_);
  1835 + temp.put("gzlc", gzlc_.doubleValue());
  1836 + temp.put("gzbfb", df.format(jhbc_>0?(double)gzbc_/jhbc_*100:0)+"%");
  1837 + temp.put("jfbc", jfbc_);
  1838 + temp.put("jflc", jflc_.doubleValue());
  1839 + temp.put("jfbfb", df.format(jhbc_>0?(double)jfbc_/jhbc_*100:0)+"%");
  1840 + temp.put("zsbc", zsbc_);
  1841 + temp.put("zslc", zslc_.doubleValue());
  1842 + temp.put("zsbfb", df.format(jhbc_>0?(double)zsbc_/jhbc_*100:0)+"%");
  1843 + temp.put("qrbc", qrbc_);
  1844 + temp.put("qrlc", qrlc_.doubleValue());
  1845 + temp.put("qrbfb", df.format(jhbc_>0?(double)qrbc_/jhbc_*100:0)+"%");
  1846 + temp.put("qcbc", qcbc_);
  1847 + temp.put("qclc", qclc_.doubleValue());
  1848 + temp.put("qcbfb", df.format(jhbc_>0?(double)qcbc_/jhbc_*100:0)+"%");
  1849 + temp.put("kxbc", kxbc_);
  1850 + temp.put("kxlc", kxlc_.doubleValue());
  1851 + temp.put("kxbfb", df.format(jhbc_>0?(double)kxbc_/jhbc_*100:0)+"%");
  1852 + temp.put("qhbc", qhbc_);
  1853 + temp.put("qhlc", qhlc_.doubleValue());
  1854 + temp.put("qhbfb", df.format(jhbc_>0?(double)qhbc_/jhbc_*100:0)+"%");
  1855 + temp.put("wybc", wybc_);
  1856 + temp.put("wylc", wylc_.doubleValue());
  1857 + temp.put("wybfb", df.format(jhbc_>0?(double)wybc_/jhbc_*100:0)+"%");
  1858 + temp.put("qtbc", qtbc_);
  1859 + temp.put("qtlc", qtlc_.doubleValue());
  1860 + temp.put("qtbfb", df.format(jhbc_>0?(double)qtbc_/jhbc_*100:0)+"%");
  1861 +
  1862 + resList.add(temp);
1782 1863 }
1783 1864  
1784 1865 if(type != null && type.length() != 0 && type.equals("export")){
... ...
src/main/resources/static/pages/forms/mould/lbStatuAnaly.xls
View file @f9a469f
No preview for this file type
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
  View file @f9a469f
... ... @@ -515,11 +515,16 @@
515 515 <tbody>
516 516 {{each list as obj i}}
517 517 <tr>
518   - <td>{{obj.date}}</td>
519   - <td>{{obj.times}}</td>
520   - <td>{{obj.company}}</td>
521   - <td>{{obj.subCompany}}</td>
522   - <td>{{obj.line}}</td>
  518 + {{if obj.line!='合计'}}
  519 + <td>{{obj.date}}</td>
  520 + <td>{{obj.times}}</td>
  521 + <td>{{obj.company}}</td>
  522 + <td>{{obj.subCompany}}</td>
  523 + <td>{{obj.line}}</td>
  524 + {{/if}}
  525 + {{if obj.line=='合计'}}
  526 + <td colspan="5">{{obj.line}}</td>
  527 + {{/if}}
523 528 <td>{{obj.jhbc}}</td><td>{{obj.sjbc}}</td><td>{{obj.bcbfb}}</td>
524 529 <td>{{obj.jhlc}}</td><td>{{obj.sjlc}}</td><td>{{obj.lcbfb}}</td>
525 530 {{if reason[0].checked==true}}<td>{{obj.lzbc}}</td><td>{{obj.lzlc}}</td><td>{{obj.lzbfb}}</td>{{/if}}
... ...