油量电量设置不为0

廖磊
1 parent cdb2d69a
Showing 4 changed files with 71 additions and 21 deletions
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDailyQp.html
@@ -49,13 +49,13 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select * from bsth_c_ylb where to_days(?1) -to_days(rq) <30 "
 			+ " and rq< ?1 and ssgsdm like %?2%"
 			+ " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
-			+ " order by nbbm , rq desc,jcsx desc",nativeQuery=true)
+			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
 	List<Ylb> listByRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
  
 	@Query(value="select * from bsth_c_ylb where rq>=?1 "
 			+ " and rq<= ?2 and ssgsdm =?3"
 			+ " and fgsdm =?4 and xlbm like %?5%  "
-			+ " order by nbbm , rq desc,jcsx desc",nativeQuery=true)
+			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
 	List<Ylb> listByMonthJcsx(String rq,String rq2,String gsbm,String fgsbm,String xlbm);
  
 	/**
@@ -406,12 +406,12 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									}
 									nextJzyl =Arith.sub(zjzl,dh);
 									if(zlc>0){
-										long l=Math.round(nextJzyl);
-										double ylxs=l*100/100;
+//										long l=Math.round(nextJzyl);
+										double ylxs=nextJzyl;
 										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
 										if(dh<0){
-											t.setHd(dh);
-											t.setCdl(dh);
+											t.setHd(0.0);
+											t.setCdl(0.0);
 											nextJzyl=Arith.add(ylxs, dh);
 										}else{
 											t.setHd(dh);
@@ -429,21 +429,21 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									}
 									nextJzyl =Arith.sub( nextJzyl,dh);
 									if(zlc>0){
-										long l=0l;
+//										long l=0l;
 										double ylxs=0.0;
 										if(i==listpb.size()-1){
 //											ylxs=czyl;
 										}else{
 											if(listpb.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
-												l=Math.round(nextJzyl);
-												ylxs=l*100/100;
+//												l=Math.round(nextJzyl);
+												ylxs=nextJzyl;
 											}
  
 										}
 										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
 										if(dh<0){
-											t.setHd(dh);
-											t.setCdl(dh);
+											t.setHd(0.0);
+											t.setCdl(0.0);
 											nextJzyl=Arith.add(ylxs, dh);
 										}else{
 											t.setHd(dh);
@@ -468,15 +468,21 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 								t.setRq(sdf.parse(rq));
 								t.setLp(map.get("lpName").toString());
-								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-									 if(type.equals("add")){
-										 t.setCreatetime(date);
-										 addList.add(t); 
-									 }else{
-										 t.setUpdatetime(date);
-									     updateList.add(t); 
-									  }
-								 }
+								if (!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))) {
+									if (t.getHd() < 0) {
+										t.setHd(0.0);
+									}
+									if (t.getCdl() < 0) {
+										t.setCdl(0.0);
+									}
+									if (type.equals("add")) {
+										t.setCreatetime(date);
+										addList.add(t);
+									} else {
+										t.setUpdatetime(date);
+										updateList.add(t);
+									}
+								}
 								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
@@ -1204,6 +1210,14 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									 t.setUpdatetime(new Date());
 								 }
 							 }
+							
+							
+							if(t.getHd()<0){
+								t.setHd(0.0);
+							}
+							if(t.getCdl()<0){
+								t.setCdl(0.0);
+							}
 							updateDlb.add(t);
 						}
 					}
@@ -679,6 +679,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									t.setJzyl(nextJzyl);
 								}
 							}
+							if(t.getJzyl()<0){
+								t.setJzyl(0.0);
+							}
+							if(t.getCzyl()<0){
+								t.setCzyl(0.0);
+							}
+							if(t.getYh()<0){
+								t.setYh(0.0);
+							}
+							if(t.getSh()<0){
+								t.setSh(0.0);
+							}
 							repository.save(t);
 						}
 						map2.put("status", ResponseCode.SUCCESS);
@@ -1404,6 +1416,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								t.setJzyl(nextJzyl);
 							}
 					}
+					if(t.getJzyl()<0){
+						t.setJzyl(0.0);
+					}
+					if(t.getCzyl()<0){
+						t.setCzyl(0.0);
+					}
+					if(t.getYh()<0){
+						t.setYh(0.0);
+					}
+					if(t.getSh()<0){
+						t.setSh(0.0);
+					}
 					repository.save(t);
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
@@ -1879,6 +1903,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									t.setJzyl(nextJzyl);
 								}
 							}
+							if(t.getJzyl()<0){
+								t.setJzyl(0.0);
+							}
+							if(t.getCzyl()<0){
+								t.setCzyl(0.0);
+							}
+							if(t.getYh()<0){
+								t.setYh(0.0);
+							}
+							if(t.getSh()<0){
+								t.setSh(0.0);
+							}
 							repository.save(t);
 						}
 					}
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="month" value="按月查询"/>
+<!--                         <input class="btn btn-default" type="button" id="month" value="按月查询"/> -->
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>