潘钊 / bsth_control · Commits

Commit 32fd47d470e1aa1fc655ff6fb2157b32a45731d6

Authored by 廖磊
1 parent bcf1dcf2

报表

Inline Side-by-side
Showing 7 changed files with 376 additions and 178 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @32fd47d
... ... @@ -63,7 +63,7 @@ public class YlbController extends BaseController<Ylb, Integer>{
63 63 }
64 64  
65 65  
66   - @RequestMapping(value = "/saveYlbList",method = RequestMethod.GET)
  66 + @RequestMapping(value = "/saveYlbList",method = RequestMethod.POST)
67 67 public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){
68 68 Map<String, Object> list=new HashMap<String, Object>();
69 69 try {
... ... @@ -79,7 +79,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
79 79 * @param map
80 80 * @return
81 81 */
82   - @RequestMapping(value = "/sort",method = RequestMethod.GET)
  82 + @RequestMapping(value = "/sort",method = RequestMethod.POST)
83 83 public Map<String, Object> sort(@RequestParam Map<String, Object> map){
84 84 Map<String, Object> list=new HashMap<String, Object>();
85 85 try {
... ... @@ -201,6 +201,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
201 201 return yblService.oilListMonth(line, date);
202 202 }
203 203  
  204 + @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
  205 + public String checkJsy(@RequestParam Map<String, Object> map){
  206 + String list=yblService.checkJsy(map);
  207 + return list;
  208 + }
  209 +
204 210 @RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
205 211 public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
206 212 Map<String, Object> list=yblService.sumYlb(map);
... ...
src/main/java/com/bsth/repository/oil/YlbRepository.java
  View file @32fd47d
... ... @@ -96,18 +96,21 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
96 96 + " and s.ssgsdm like %?2% "
97 97 + " and s.fgsdm like %?3%"
98 98 + " and s.xlbm like %?4% "
99   - + " and s.nbbm in ?5 ")
  99 + + " and s.nbbm in ?5 order by nbbm,jcsx")
100 100 List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
101 101  
102 102  
103 103 @Transactional
104 104 @Modifying
105 105 @Query(value="UPDATE bsth_c_ylb SET " +
106   - " jzyl = ?2, " +
107   - " sh = ?3," +
108   - " shyy = ?4," +
109   - " ns = ?5," +
110   - " rylx = ?6" +
  106 + " czyl= ?2,"+
  107 + " jzyl = ?3, " +
  108 + " yh = ?4,"+
  109 + " sh = ?5," +
  110 + " shyy = ?6," +
  111 + " ns = ?7," +
  112 + " rylx = ?8," +
  113 + " yhlx = ?9"+
111 114 " WHERE id = ?1", nativeQuery=true)
112   - public void ylbUpdate(Integer id,double jzyl,double sh,String shyy,double ns,String rylx);
  115 + public void ylbUpdate(Integer id,double czyl,double jzyl,double yh, double sh,String shyy,double ns,String rylx,int yhlx);
113 116 }
... ...
src/main/java/com/bsth/service/oil/YlbService.java
  View file @32fd47d
... ... @@ -9,6 +9,7 @@ import com.bsth.service.BaseService;
9 9 public interface YlbService extends BaseService<Ylb, Integer>{
10 10 Map<String, Object> obtain(Map<String, Object> map) throws Exception;
11 11 Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception;
  12 + Map<String, Object> saveYlb(Ylb t);
12 13 String obtainDsq() throws Exception;
13 14 Map<String, Object> sort(Map<String, Object> map) throws Exception;
14 15  
... ... @@ -17,8 +18,10 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
17 18 Map<String, Object> checkYl(Map<String, Object> map) throws Exception;
18 19  
19 20 Map<String, Object> sumYlb(Map<String, Object> map);
20   -
  21 + String checkJsy(Map<String, Object> map);
21 22 List<Ylb> oilListMonth(String line,String date);
22 23 List<Ylb> listYlb(Map<String, Object> map);
23 24 StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
  25 +
  26 +
24 27 }
... ...
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @32fd47d
... ... @@ -469,45 +469,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
469 469  
470 470 repository.save(t);
471 471 }
472   -
473   - // 设置存油量
474   - Cyl cyl = null;
475   - boolean fage = false;
476   - for (int z = 0; z < cylList.size(); z++) {
477   - cyl = cylList.get(z);
478   - if (t.getNbbm().equals(cyl.getNbbm())) {
479   - cyl.setCyl(t.getJzyl());
480   - cyl.setUpdatetime(t.getRq());
481   - fage = true;
482   - break;
483   - }
484   - }
485   - if (fage) {
486   - cylRepository.save(cyl);
487   - } else {
488   - if(cylMapAdd.get(t.getNbbm())!=null){
489   - for (int l = 0; l < cylListAdd.size(); l++) {
490   - cyl=cylListAdd.get(l);
491   - if(cyl.getNbbm().equals(t.getNbbm())){
492   - cyl.setNbbm(t.getNbbm());
493   - cyl.setCyl(t.getJzyl());
494   - cyl.setGsdm(t.getSsgsdm());
495   - cyl.setFgsdm(t.getFgsdm());
496   - cyl.setUpdatetime(t.getRq());
497   - }
498   - }
499   - }else{
500   - cyl = new Cyl();
501   - cyl.setNbbm(t.getNbbm());
502   - cyl.setCyl(t.getJzyl());
503   - cyl.setGsdm(t.getSsgsdm());
504   - cyl.setFgsdm(t.getFgsdm());
505   - cyl.setUpdatetime(t.getRq());
506   - cylListAdd.add(cyl);
507   - }
508   -
509   -
510   - }
511 472 map2.put("status", ResponseCode.SUCCESS);
512 473 }
513 474 }
... ... @@ -526,6 +487,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
526 487 /**
527 488 * 拆分
528 489 */
  490 + /*
529 491 @Transactional
530 492 @Override
531 493 public Map<String, Object> sort(Map<String, Object> map) throws Exception{
... ... @@ -669,7 +631,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
669 631 throw e;
670 632 }
671 633 return newMap;
672   - }
  634 + }*/
673 635  
674 636 /**
675 637 * 核对，有加注没里程
... ... @@ -727,32 +689,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
727 689 t.setSsgsdm(y1.getGsdm());
728 690 t.setXlbm(xlbm);
729 691 repository.save(t);
730   -
731   - //设置存油量
732   - Cyl cyl=null;
733   - boolean status=false;
734   - for(int z=0;z<cylList.size();z++){
735   - cyl=cylList.get(z);
736   - if(t.getNbbm().equals(cyl.getNbbm())){
737   -// cyl.setCyl(cyl.getCyl()+t.getJzl());
738   - cyl.setCyl(Arith.add(cyl.getCyl(),t.getJzl()));
739   - cyl.setUpdatetime(t.getRq());
740   - status=true;
741   - break;
742   - }
743   - }
744   - if(status){
745   - cylRepository.save(cyl);
746   - }else{
747   - cyl=new Cyl();
748   - cyl.setNbbm(t.getNbbm());
749   - cyl.setCyl(t.getJzl());
750   - cyl.setGsdm(t.getSsgsdm());
751   - cyl.setUpdatetime(t.getRq());
752   - cylRepository.save(cyl);
753   - }
754   -
755   -
756 692 }
757 693 }
758 694 newMap.put("status", ResponseCode.SUCCESS);
... ... @@ -965,20 +901,23 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
965 901 for (int i = 0; i < jsonArray.size(); i++) {
966 902 // Ylb t=new Ylb();
967 903 jsonObject=jsonArray.getJSONObject(i);
968   -
969   - Double jzyl =jsonObject.getDoubleValue("jzyl");
970   - Double sh =jsonObject.getDoubleValue("sh");
  904 + double czyl = jsonObject.getDoubleValue("czyl");
  905 + double jzl =jsonObject.getDoubleValue("jzl");
  906 + double jzyl =jsonObject.getDoubleValue("jzyl");
  907 + double sh =jsonObject.getDoubleValue("sh");
971 908 String shyy =jsonObject.getString("shyy");
972   - Double ns = jsonObject.getDoubleValue("ns");
  909 + double ns = jsonObject.getDoubleValue("ns");
973 910 String rylx =jsonObject.getString("rylx");
  911 + int yhlx =jsonObject.getIntValue("yhlx");
974 912 Integer id =jsonObject.getInteger("id");
  913 + double yh = Arith.sub(Arith.add(czyl, jzl), jzyl);
975 914 /*t.setJzyl(jzyl);
976 915 t.setSh(sh);
977 916 t.setShyy(shyy);
978 917 t.setNs(ns);
979 918 t.setRylx(rylx);
980 919 t.setId(jsonObject.getInteger("id"));*/
981   - repository.ylbUpdate(id, jzyl, sh, shyy, ns, rylx);
  920 + repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
982 921 }
983 922 // List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
984 923  
... ... @@ -991,5 +930,139 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
991 930 return newMap;
992 931 }
993 932  
  933 + /**
  934 + * 拆分
  935 + */
  936 + @Transactional
  937 + @Override
  938 + public Map<String, Object> sort(Map<String, Object> map) throws Exception{
  939 + // TODO Auto-generated method stub
  940 + Map<String, Object> newMap = new HashMap<String, Object>();
  941 + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
  942 +
  943 + try {
  944 + List<Cyl> cylList = cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
  945 + String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
  946 + JSONArray jsonArray=JSONArray.parseArray(json);
  947 + JSONObject jsonObject;
  948 + for (int x = 0; x < jsonArray.size(); x++) {
  949 + jsonObject=jsonArray.getJSONObject(x);
  950 + Double yl =jsonObject.getDoubleValue("jzyl");
  951 + Double sh =jsonObject.getDoubleValue("sh");
  952 + String shyy =jsonObject.getString("shyy");
  953 + Double ns = jsonObject.getDoubleValue("ns");
  954 + String rylx =jsonObject.getString("rylx");
  955 + Integer id =jsonObject.getInteger("id");
  956 + Ylb ylb = repository.findOne(id);
  957 + String nbbm_eq = ylb.getNbbm();
  958 + Date rq_eq = ylb.getRq();
  959 + // 得到一天总的加油和里程（根据车，时间）
  960 + List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
  961 + // 保存总的加油量
  962 + Double jzl = 0.0;
  963 + // 保存总的里程
  964 + Double zlc = 0.0;
  965 + //保存总的损耗
  966 + Double zsh = 0.0;
  967 + for (int j = 0; j < sumList.size(); j++) {
  968 + jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
  969 + zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
  970 + zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
  971 + }
  972 + jzl = Arith.sub(jzl, zsh);
  973 + //新的 损耗不等于 旧的损耗 总损耗从新算
  974 + if(Arith.sub(ylb.getSh(),sh )!=0){
  975 + zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
  976 + jzl =Arith.sub(jzl, zsh);
  977 + }else{
  978 + jzl =Arith.sub(jzl, zsh);
  979 + }
  980 + map.put("nbbm_eq", nbbm_eq);
  981 + map.put("rq_eq", rq_eq);
  982 +
  983 + List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),ylb.getXlbm(),
  984 + ylb.getNbbm(),"jcsx");
  985 + DecimalFormat df = new DecimalFormat("#.00");
  986 + Double zyl = 0.0;
  987 + Double nextJzyl = 0.0;
  988 + // 车的，进，出油量及耗油
  989 + Map<String, Object> cylMapAdd=new HashMap<String,Object>();
  990 + List<Cyl> cylListAdd=new ArrayList<Cyl>();
  991 + for (int i = 0; i < iterator2.size(); i++) {
  992 + Ylb t = iterator2.get(i);
  993 + if (t.getJcsx() == 1) {
  994 + if(t.getId()==id){
  995 + t.setSh(sh);
  996 + t.setShyy(shyy);
  997 + }
  998 + Double jcyl = t.getCzyl();
  999 + zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
  1000 + Double yh = 0.0;
  1001 + if (zlc > 0 && t.getZlc() > 0) {
  1002 + yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
  1003 + }
  1004 + nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
  1005 + long l=Math.round(nextJzyl);
  1006 + double ylxs=l*100/100;
  1007 +// nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
  1008 + yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
  1009 + t.setJzyl(ylxs);
  1010 + t.setYh(yh);
  1011 + nextJzyl=ylxs;
  1012 + } else {
  1013 + if(t.getId()==id){
  1014 + t.setSh(sh);
  1015 + t.setShyy(shyy);
  1016 + }
  1017 + t.setCzyl(nextJzyl);
  1018 + Double yh =0.0;
  1019 + if (t.getZlc() != 0) {
  1020 + yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
  1021 + }
  1022 + nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
  1023 + long l=Math.round(nextJzyl);
  1024 + double ylxs=l*100/100;
  1025 +// nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
  1026 + yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
  1027 + t.setJzyl(ylxs);
  1028 + t.setYh(yh);
  1029 + nextJzyl=ylxs;
  1030 + }
  1031 + repository.save(t);
  1032 + }
  1033 + for (int i = 0; i < cylListAdd.size(); i++) {
  1034 + cylRepository.save(cylListAdd.get(i));
  1035 + }
  1036 + newMap.put("status", ResponseCode.SUCCESS);
  1037 + }
  1038 + } catch (Exception e) {
  1039 + newMap.put("status", ResponseCode.ERROR);
  1040 + logger.error("save erro.", e);
  1041 + throw e;
  1042 + }
  1043 + return newMap;
  1044 + }
994 1045  
  1046 + @Override
  1047 + public String checkJsy(Map<String, Object> map) {
  1048 + // TODO Auto-generated method stub
  1049 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  1050 + String rq=map.get("date").toString();
  1051 + String nbbm=map.get("nbbm").toString();
  1052 + String jsy =map.get("jsy").toString();
  1053 + List<Ylb> list= repository.queryListYlb(rq, nbbm, jsy);
  1054 + String type="";
  1055 + if(list.size()>0){
  1056 + type="cunzai";
  1057 + }
  1058 + return type;
  1059 + }
  1060 +
  1061 + @Override
  1062 + public Map<String, Object> saveYlb(Ylb t) {
  1063 +
  1064 + String gsbm="";
  1065 + String fgsbm="";
  1066 + return null;
  1067 + }
995 1068 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @32fd47d
... ... @@ -1615,9 +1615,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1615 1615 else if (date.length() == 7)
1616 1616 list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
1617 1617  
  1618 +
1618 1619 List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
1619 1620 DecimalFormat format = new DecimalFormat("0.00");
1620   - double jhlc = 0, tempJhlc = 0, childMileage = 0;
  1621 + double jhlc = 0, tempJhlc = 0, childMileage = 0,jhlcOrig=0;
1621 1622 float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
1622 1623 //班次
1623 1624 int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
... ... @@ -1642,21 +1643,35 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1642 1643 int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
1643 1644 int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
1644 1645 Map<String, Object> map = null;
  1646 +
  1647 + double xgssgl=0,xgljgl=0,lj=0,cj=0;
1645 1648 for (int i = 0; i < list.size(); i++) {
1646 1649 ScheduleRealInfo scheduleRealInfo = list.get(i);
  1650 +
1647 1651 if (scheduleRealInfo != null) {
1648 1652 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
1649 1653 //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
  1654 + if(!scheduleRealInfo.isSflj()){
  1655 + jhlc += tempJhlc;
  1656 + jhlcZ += tempJhlc;
  1657 + }
1650 1658 if (childTaskPlans.isEmpty()) {
1651 1659 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
  1660 + jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0 : scheduleRealInfo.getJhlcOrig();
  1661 +
  1662 + if(jhlcOrig-tempJhlc>0){
  1663 + xgssgl +=jhlcOrig-tempJhlc;
  1664 + cj += jhlcOrig-tempJhlc;
  1665 + }else{
  1666 + xgljgl +=tempJhlc-jhlcOrig;
  1667 + lj +=tempJhlc-jhlcOrig;
  1668 + }
1652 1669 //临加公里
1653 1670 if (scheduleRealInfo.isSflj()) {
1654 1671 ljgl += tempJhlc;
1655 1672 ljglZ += tempJhlc;
1656   - } else {
1657   - jhlc += tempJhlc;
1658   - jhlcZ += tempJhlc;
1659   - }
  1673 + }
  1674 +
1660 1675 if (scheduleRealInfo.getStatus() == -1) {
1661 1676 ssgl += tempJhlc;
1662 1677 ssglZ += tempJhlc;
... ... @@ -1791,8 +1806,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1791 1806 ssbc_otherZ++;
1792 1807 }
1793 1808 } else {
1794   - sjgl += childMileage;
1795   - sjglZ += childMileage;
  1809 + if (scheduleRealInfo.isSflj()) {
  1810 + ljgl += tempJhlc;
  1811 + ljglZ += tempJhlc;
  1812 + } else{
  1813 + sjgl += childMileage;
  1814 + sjglZ += childMileage;
  1815 + }
1796 1816 }
1797 1817 }
1798 1818 }
... ... @@ -1849,7 +1869,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1849 1869 map.put("xlName", scheduleRealInfo.getXlName());
1850 1870 map.put("jhlc", format.format(jhlc));
1851 1871 map.put("sjgl", format.format(sjgl));
1852   - map.put("ssgl", format.format(ssgl));
  1872 + map.put("ssgl", format.format(ssgl+cj));
1853 1873 map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
1854 1874 map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
1855 1875 map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
... ... @@ -1873,7 +1893,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1873 1893 map.put("ssbc_qh", ssbc_qh);
1874 1894 map.put("ssbc_yw", ssbc_yw);
1875 1895 map.put("ssbc_other", ssbc_other);
1876   - map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
  1896 + map.put("ljgl", format.format(ljgl+lj));
1877 1897 map.put("jhbc", jhbc);
1878 1898 map.put("jhbc_m", jhbc_m);
1879 1899 map.put("jhbc_a", jhbc_a);
... ... @@ -1931,13 +1951,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1931 1951 djg_m = 0;
1932 1952 djg_a = 0;
1933 1953 djg_time = 0;
  1954 + lj=0;
  1955 + cj=0;
1934 1956 }
1935 1957 } else {
1936 1958 map = new HashMap<String, Object>();
1937 1959 map.put("xlName", scheduleRealInfo.getXlName());
1938 1960 map.put("jhlc", format.format(jhlc));
1939 1961 map.put("sjgl", format.format(sjgl));
1940   - map.put("ssgl", format.format(ssgl));
  1962 + map.put("ssgl", format.format(ssgl+cj));
1941 1963 map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
1942 1964 map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
1943 1965 map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
... ... @@ -1961,7 +1983,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1961 1983 map.put("ssbc_qh", ssbc_qh);
1962 1984 map.put("ssbc_yw", ssbc_yw);
1963 1985 map.put("ssbc_other", ssbc_other);
1964   - map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
  1986 + map.put("ljgl", format.format(ljgl+lj));
1965 1987 map.put("jhbc", jhbc);
1966 1988 map.put("jhbc_m", jhbc_m);
1967 1989 map.put("jhbc_a", jhbc_a);
... ... @@ -2019,6 +2041,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2019 2041 djg_m = 0;
2020 2042 djg_a = 0;
2021 2043 djg_time = 0;
  2044 + lj=0;
  2045 + cj=0;
2022 2046 }
2023 2047 }
2024 2048 }
... ... @@ -2026,7 +2050,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2026 2050 map.put("xlName", "合计");
2027 2051 map.put("jhlc", format.format(jhlcZ));
2028 2052 map.put("sjgl", format.format(sjglZ));
2029   - map.put("ssgl", format.format(ssglZ));
  2053 + map.put("ssgl", format.format(ssglZ+xgssgl));
2030 2054 map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
2031 2055 map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
2032 2056 map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
... ... @@ -2050,7 +2074,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2050 2074 map.put("ssbc_qh", ssbc_qhZ);
2051 2075 map.put("ssbc_yw", ssbc_ywZ);
2052 2076 map.put("ssbc_other", ssbc_otherZ);
2053   - map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
  2077 + map.put("ljgl", format.format(ljglZ+xgljgl));
2054 2078 map.put("jhbc", jhbcZ);
2055 2079 map.put("jhbc_m", jhbc_mZ);
2056 2080 map.put("jhbc_a", jhbc_aZ);
... ... @@ -2143,7 +2167,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2143 2167  
2144 2168 List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
2145 2169 DecimalFormat format = new DecimalFormat("0.00");
2146   - double jhlc = 0, tempJhlc = 0, childMileage = 0;
  2170 + double jhlc = 0, tempJhlc = 0, childMileage = 0,jhlcOrig=0;
2147 2171 float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
2148 2172 //班次
2149 2173 int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
... ... @@ -2168,21 +2192,35 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2168 2192 int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
2169 2193 int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
2170 2194 Map<String, Object> map = null;
  2195 +
  2196 + double xgssgl=0,xgljgl=0,lj=0,cj=0;
2171 2197 for (int i = 0; i < list.size(); i++) {
2172 2198 ScheduleRealInfo scheduleRealInfo = list.get(i);
  2199 +
2173 2200 if (scheduleRealInfo != null) {
2174 2201 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
2175 2202 //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
  2203 + if(!scheduleRealInfo.isSflj()){
  2204 + jhlc += tempJhlc;
  2205 + jhlcZ += tempJhlc;
  2206 + }
2176 2207 if (childTaskPlans.isEmpty()) {
2177 2208 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
  2209 + jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0 : scheduleRealInfo.getJhlcOrig();
  2210 +
  2211 + if(jhlcOrig-tempJhlc>0){
  2212 + xgssgl +=jhlcOrig-tempJhlc;
  2213 + cj += jhlcOrig-tempJhlc;
  2214 + }else{
  2215 + xgljgl +=tempJhlc-jhlcOrig;
  2216 + lj +=tempJhlc-jhlcOrig;
  2217 + }
2178 2218 //临加公里
2179 2219 if (scheduleRealInfo.isSflj()) {
2180 2220 ljgl += tempJhlc;
2181 2221 ljglZ += tempJhlc;
2182   - } else {
2183   - jhlc += tempJhlc;
2184   - jhlcZ += tempJhlc;
2185   - }
  2222 + }
  2223 +
2186 2224 if (scheduleRealInfo.getStatus() == -1) {
2187 2225 ssgl += tempJhlc;
2188 2226 ssglZ += tempJhlc;
... ... @@ -2317,8 +2355,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2317 2355 ssbc_otherZ++;
2318 2356 }
2319 2357 } else {
2320   - sjgl += childMileage;
2321   - sjglZ += childMileage;
  2358 + if (scheduleRealInfo.isSflj()) {
  2359 + ljgl += tempJhlc;
  2360 + ljglZ += tempJhlc;
  2361 + } else{
  2362 + sjgl += childMileage;
  2363 + sjglZ += childMileage;
  2364 + }
2322 2365 }
2323 2366 }
2324 2367 }
... ... @@ -2375,7 +2418,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2375 2418 map.put("xlName", scheduleRealInfo.getXlName());
2376 2419 map.put("jhlc", format.format(jhlc));
2377 2420 map.put("sjgl", format.format(sjgl));
2378   - map.put("ssgl", format.format(ssgl));
  2421 + map.put("ssgl", format.format(ssgl+cj));
2379 2422 map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
2380 2423 map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
2381 2424 map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
... ... @@ -2399,7 +2442,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2399 2442 map.put("ssbc_qh", ssbc_qh);
2400 2443 map.put("ssbc_yw", ssbc_yw);
2401 2444 map.put("ssbc_other", ssbc_other);
2402   - map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
  2445 + map.put("ljgl", (ljgl+lj) == 0 ? 0 : format.format(ljgl+lj));
2403 2446 map.put("jhbc", jhbc);
2404 2447 map.put("jhbc_m", jhbc_m);
2405 2448 map.put("jhbc_a", jhbc_a);
... ... @@ -2457,12 +2500,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2457 2500 djg_m = 0;
2458 2501 djg_a = 0;
2459 2502 djg_time = 0;
  2503 + lj=0;
  2504 + cj=0;
2460 2505 }
2461 2506 } else {
2462 2507 map = new HashMap<String, Object>();
2463 2508 map.put("xlName", scheduleRealInfo.getXlName());
2464 2509 map.put("jhlc", format.format(jhlc));
2465   - map.put("sjgl", format.format(sjgl));
  2510 + map.put("sjgl", format.format(sjgl+cj));
2466 2511 map.put("ssgl", format.format(ssgl));
2467 2512 map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
2468 2513 map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
... ... @@ -2487,7 +2532,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2487 2532 map.put("ssbc_qh", ssbc_qh);
2488 2533 map.put("ssbc_yw", ssbc_yw);
2489 2534 map.put("ssbc_other", ssbc_other);
2490   - map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
  2535 + map.put("ljgl", format.format(ljgl+lj));
2491 2536 map.put("jhbc", jhbc);
2492 2537 map.put("jhbc_m", jhbc_m);
2493 2538 map.put("jhbc_a", jhbc_a);
... ... @@ -2545,6 +2590,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2545 2590 djg_m = 0;
2546 2591 djg_a = 0;
2547 2592 djg_time = 0;
  2593 + lj=0;
  2594 + cj=0;
2548 2595 }
2549 2596 }
2550 2597 }
... ... @@ -2552,7 +2599,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2552 2599 map.put("xlName", "合计");
2553 2600 map.put("jhlc", format.format(jhlcZ));
2554 2601 map.put("sjgl", format.format(sjglZ));
2555   - map.put("ssgl", format.format(ssglZ));
  2602 + map.put("ssgl", format.format(ssglZ+xgssgl));
2556 2603 map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
2557 2604 map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
2558 2605 map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
... ... @@ -2576,7 +2623,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2576 2623 map.put("ssbc_qh", ssbc_qhZ);
2577 2624 map.put("ssbc_yw", ssbc_ywZ);
2578 2625 map.put("ssbc_other", ssbc_otherZ);
2579   - map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
  2626 + map.put("ljgl", format.format(ljglZ+xgljgl));
2580 2627 map.put("jhbc", jhbcZ);
2581 2628 map.put("jhbc_m", jhbc_mZ);
2582 2629 map.put("jhbc_a", jhbc_aZ);
... ... @@ -3548,7 +3595,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3548 3595 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
3549 3596 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
3550 3597 int jhbc = 0, cjbc = 0, ljbc = 0;
3551   - double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
  3598 + double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0;
3552 3599 float addMileage = 0l, remMileage = 0l, addgl = 0, remgl = 0;
3553 3600 Map<String, Object> map = new HashMap<String, Object>();
3554 3601 for (ScheduleRealInfo scheduleRealInfo : list) {
... ... @@ -3560,7 +3607,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3560 3607 double jh = 0, sj = 0;
3561 3608 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
3562 3609 if (scheduleRealInfo.isSflj()) {
3563   - ljbc++;
  3610 + if(!(scheduleRealInfo.getBcType().equals("in")
  3611 + || scheduleRealInfo.getBcType().equals("out"))){
  3612 + ljbc++;
  3613 + }
3564 3614 } else {
3565 3615 if (!(scheduleRealInfo.getBcType().equals("in")
3566 3616 || scheduleRealInfo.getBcType().equals("out"))) {
... ... @@ -3578,14 +3628,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3578 3628 if (childTaskPlans.isEmpty()) {
3579 3629 if (scheduleRealInfo.getBcType().equals("in") ||
3580 3630 scheduleRealInfo.getBcType().equals("out")) {
3581   - jcclc += tempJhlc;
3582   - }
3583   -
3584   - //主任务 放空班次属于营运
3585   -// else if(scheduleRealInfo.getBcType().equals("venting")){
3586   -// ksgl += tempJhlc;
3587   -// }
3588   - else {
  3631 + if(scheduleRealInfo.getStatus() != -1){
  3632 + if(scheduleRealInfo.isSflj()){
  3633 + ljjcclc += tempJhlc;
  3634 + }else{
  3635 + jcclc += tempJhlc;
  3636 + }
  3637 + }
  3638 + }else {
3589 3639 if (scheduleRealInfo.getStatus() != -1) {
3590 3640 if (scheduleRealInfo.isSflj()) {
3591 3641 addMileage += tempJhlc;
... ... @@ -3634,13 +3684,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3634 3684 map.put("ksgl", format.format(ksgl));
3635 3685 map.put("yyglsj", format.format(yygl));
3636 3686 map.put("jhbc", jhbc);
3637   - map.put("jcclc", jcclc);
  3687 + map.put("jcclc", format.format(jcclc+ljjcclc));
3638 3688  
3639 3689 map.put("ljgl", format.format(addMileage));
3640 3690 map.put("ssbc", cjbc);
3641 3691 map.put("ysgl", format.format(yygl));
3642 3692 map.put("sjbc", jhbc - cjbc + ljbc);
3643   - map.put("zgl", format.format(yygl + ksgl + jcclc));
  3693 + map.put("zgl", format.format(yygl + ksgl + jcclc+ljjcclc));
3644 3694 map.put("ljbc", ljbc);
3645 3695  
3646 3696 return map;
... ...
src/main/resources/static/pages/oil/add.html
  View file @32fd47d
... ... @@ -7,7 +7,7 @@
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
9 9 <li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
10   - <li><a href="list.html" data-pjax>进场场油量</a> <i class="fa fa-circle"></i></li>
  10 + <li><a href="list_ph.html" data-pjax>进场场油量</a> <i class="fa fa-circle"></i></li>
11 11 <li><span class="active">进场站油量信息编辑</span></li>
12 12 </ul>
13 13  
... ... @@ -46,7 +46,7 @@
46 46 <div class="form-group">
47 47 <label class="col-md-3 control-label">开始营运日期</label>
48 48 <div class="col-md-4">
49   - <input type="text" class="form-control" name="jhsj" >
  49 + <input type="time" class="form-control" name="jhsj" >
50 50 <span class="help-block"> 如：12:12</span>
51 51 </div>
52 52 </div>
... ... @@ -326,33 +326,26 @@
326 326 submitHandler : function(f) {
327 327 var params = form.serializeJSON();
328 328 error.hide();
329   -
  329 + var nbbm=$("#nbbm").val();
  330 + var date=$("#date").val();
  331 + var jsy=$("#jsy").val();
  332 + var map={};
  333 + map["nbbm"]=nbbm;
  334 + map["date"]=date;
  335 + map["jsy"]=jsy;
330 336 //检查一下用户是否存在
331   - $post('/ylb/saveYlb', params, function(){
332   - layer.msg('添加信息成功.');
333   - loadPage('list.html');
334   - });
335   -// $get('/user/all', {userName_eq: params.userName}, function(list){
336   -// if(!list || list.length == 0){
337   - /* console.log(params);
338   - $.ajax({
339   - url: '/ylb/saveYlb',
340   - type: 'POST',
341   - traditional: true,
342   - data: params,
343   - success: function(res){
344   - layer.msg('添加信息成功.');
345   - loadPage('list.html');
346   - }
347   - }); */
348   - /* $post('/user', params, function(res){
349   - layer.msg('添加用户成功.');
  337 + $get('/ylb/checkYl', map, function(fage){
  338 + console.log(fage);
  339 + if(fage!=""){
  340 + layer.msg('该驾驶员当天已存在.');
  341 + }else{
  342 + $post('/ylb/saveYlb', params, function(){
  343 + layer.msg('添加信息成功.');
350 344 loadPage('list.html');
351   - }); */
352   -// }
353   -// else
354   -// layer.alert('用户【' + params.userName + '】已存在', {icon: 2, title: '提交被拒绝'});
355   -// });
  345 + });
  346 + }
  347 +
  348 + });
356 349 }
357 350 });
358 351 });
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @32fd47d
... ... @@ -203,38 +203,46 @@
203 203 {{obj.xlname}}
204 204 </td>
205 205 <td>
206   - {{obj.nbbm}}
  206 + <lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
  207 +
207 208 </td>
208 209 <td>
209 210 {{obj.jsy}}
210 211 </td>
211 212 <td>
212   - {{obj.jzl}}
  213 +
  214 + <lable data-id="{{obj.id}}" class="in_carpark_jzl"> {{obj.jzl}}</lable>
213 215 </td>
214 216 <td>
215   - {{obj.czyl}}
  217 +
  218 + <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_czyl"
  219 + type="text" value=" {{obj.czyl}}" style=" width:40px"
  220 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  221 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
216 222 </td>
217 223 <td>
218 224 <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzyl"
219   -type="text" value=" {{obj.jzyl}}" style=" width:40px" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"
220   -onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
  225 + type="text" value=" {{obj.jzyl}}" style=" width:40px"
  226 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  227 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
221 228 </td>
222 229 <td>
223   - {{obj.yh}}
  230 + {{obj.yh}}
224 231 </td>
225 232 <td>
226   - <select data-id="{{obj.id}}" class="in_carpark_rylx">
  233 + <select data-id="{{obj.id}}" class="in_carpark_rylx" style=" width:80px" >
227 234 <option value='0' {{if obj.rylx==0}} selected = 'selected' {{/if}}>0号柴油</option>
228 235 <option value='1' {{if obj.rylx==1}} selected = 'selected' {{/if}}>负10号柴油</option>
229 236 </select>
230 237 </td>
231 238 <td>
232 239 <input data-id="{{obj.id}}" href="javascript:;"
233   -class="in_carpark_ns" type="text" value=" {{obj.ns}}" style=" width:40px" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"
234   -onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
  240 + class="in_carpark_ns" type="text" value=" {{obj.ns}}" style=" width:40px"
  241 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  242 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
235 243 </td>
236 244 <td>
237   - <select data-id="{{obj.id}}" class="in_carpark_shyy">
  245 + <select data-id="{{obj.id}}" class="in_carpark_shyy" style=" width:80px">
238 246 <option value='0' {{if obj.shyy==0}} selected = 'selected' {{/if}}>请选择</option>
239 247 <option value='1' {{if obj.shyy==1}} selected = 'selected' {{/if}}>票务用油</option>
240 248 <option value='2' {{if obj.shyy==2}} selected = 'selected' {{/if}}>保养用油</option>
... ... @@ -247,15 +255,20 @@ onafterpaste=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;)&quot;&gt;
247 255 </select>
248 256 </td>
249 257 <td>
250   - <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl" type="text"
251   -value=" {{obj.sh}}" style=" width:40px" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"
252   -onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')" >
253   - </td>
  258 + <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl"
  259 + value={{obj.sh}} style=" width:40px" type="text"
  260 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  261 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
  262 +
  263 +</td>
254 264 <td>
255 265 {{obj.zlc}}
256 266 </td>
257 267 <td>
258   - {{obj.yhlx}}
  268 + <select data-id="{{obj.id}}" class="in_carpark_yhlx">
  269 + <option value='0' {{if obj.yhlx==0}} selected = 'selected' {{/if}}>手录</option>
  270 + <option value='1' {{if obj.yhlx==1}} selected = 'selected' {{/if}}>拆分</option>
  271 + </select>
259 272 </td>
260 273 <td>
261 274 {{obj.bglyh}}
... ... @@ -307,48 +320,105 @@ onafterpaste=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;)&quot; &gt;
307 320 //保存
308 321 $("#saveButton").on('click',function(){
309 322 var ylArray = [];
310   - /* $('input.icheck:checked').each(function(){
311   - var map = {};
312   - var id=$(this).data('id');
313   - var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
314   - var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').html();
315   - var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
316   - map['id']=id;
317   - map['jzyl']=jzyl;
318   - map['sh']=sh;
319   - map['shyy']=shyy;
320   - ylArray.push(map);
321   - }) */
322   -
323 323 $('input.icheck').each(function(){
324 324 var map = {};
325 325 var id=$(this).data('id');
  326 + var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
  327 + if(jzl=="" || jzl ==null){
  328 + jzl=0;
  329 + }
  330 + var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
  331 + if(czyl=="" || czyl==null){
  332 + czyl=0;
  333 + }
326 334 var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
  335 + if(jzyl=="" || jzyl==null){
  336 + jzyl=0;
  337 + }
  338 +
327 339 var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
  340 + if(sh=="" || sh==null){
  341 + sh=0;
  342 + }
  343 +
328 344 var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
329 345 var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
  346 + if(ns=="" || ns==null){
  347 + ns=0;
  348 + }
  349 +
330 350 var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
  351 + var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();
  352 +
331 353 map['id']=id;
  354 + map['jzl']=jzl;
  355 + map['czyl']=czyl;
332 356 map['jzyl']=jzyl;
333 357 map['sh']=sh;
334 358 map['shyy']=shyy;
335 359 map['ns']=ns;
336 360 map['rylx']=rylx;
  361 + map['yhlx']=yhlx;
337 362 ylArray.push(map);
338 363 })
339 364 var params = {};
340 365 params['ylbList']=JSON.stringify(ylArray);
  366 + console.log(JSON.stringify(ylArray));
341 367 var i = layer.load(2);
342   - $get('/ylb/saveYlbList', params, function () {
  368 + $post('/ylb/saveYlbList', params, function () {
343 369 layer.close(i);
344 370 var params1 =getParamsList();
345 371 jsDoQuery(params1, true);
346   - });
  372 + });
347 373 })
348 374 //拆分
349 375 $("#sortButton").on('click', function () {
350 376 if ($("#rq").val() != "") {
351   - var id = $('input.icheck:checked').data('id');
  377 + var ylArray = [];
  378 + var nbbm="";
  379 + var msg="";
  380 + $('input.icheck:checked').each(function(){
  381 + var map = {};
  382 + var id=$(this).data('id');
  383 + var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
  384 + if(nbbm.indexOf(clzbh)>-1){
  385 + if(msg==""){
  386 + msg += clzbh;
  387 + }else{
  388 + msg += ","+clzbh;
  389 + }
  390 + }else{
  391 + nbbm +=clzbh;
  392 + var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
  393 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
  394 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
  395 + var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
  396 + var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
  397 + map['id']=id;
  398 + map['jzyl']=jzyl;
  399 + map['sh']=sh;
  400 + map['shyy']=shyy;
  401 + map['ns']=ns;
  402 + map['rylx']=rylx;
  403 + ylArray.push(map);
  404 + }
  405 +
  406 + }) ;
  407 + if(msg!=""){
  408 + layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');
  409 + }else{
  410 + var params = {};
  411 + params['ylbList']=JSON.stringify(ylArray);
  412 + var i = layer.load(2);
  413 + $post('/ylb/sort', params, function () {
  414 + layer.close(i);
  415 + var params1 =getParamsList();
  416 + jsDoQuery(params1, true);
  417 + });
  418 +
  419 + }
  420 +
  421 + /* var id = $('input.icheck:checked').data('id');
352 422  
353 423 if (typeof(id) == 'undefined') {
354 424 layer.msg("请选择一行进行拆分");
... ... @@ -370,7 +440,7 @@ onafterpaste=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;)&quot; &gt;
370 440 jsDoQuery(params1, true);
371 441 });
372 442  
373   - }
  443 + } */
374 444 } else {
375 445 layer.msg('请选择日期.');
376 446 }
... ...