潘钊 / bsth_control · Commits

Commit 3f8436ceb6a9a8fd35f2be206a9a127a267ed227

Authored by 廖磊
1 parent d343d965

1128

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @3f8436c
... ... @@ -1153,7 +1153,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS
1153 1153 Integer id =jsonObject.getInteger("id");
1154 1154 String nbbm =jsonObject.getString("nbbm");
1155 1155 String rq=jsonObject.getString("rq");
1156   - double yh = Arith.sub(Arith.add(czyl, jzl),sh);
  1156 + double yh = Arith.sub(Arith.add(czyl, jzl),jzyl);
1157 1157 if(yh<0){
1158 1158 yh=0.0;
1159 1159 }
... ...
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
  View file @3f8436c
... ... @@ -150,7 +150,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements
150 150 ylxxbUpdate.setNbbm(ylxxb.getNbbm());
151 151 ylxxbUpdate.setYyrq(ylxxb.getYyrq());
152 152 ylxxbUpdate.setCreatetime(new Date());
153   - ylxxbUpdate.setTj(ylxxb.getNbbm()+"_"+ylxxb.getJsy()+"_"+ylxxb.getJzl());
  153 + ylxxbUpdate.setTj(ylxxb.getNbbm()+"_"+ylxxb.getJsy()+"_"+String.valueOf(ylxxb.getJzl()));
154 154 ylxxbUpdate.setZt(3);
155 155 updateRepository.save(ylxxbUpdate);
156 156 ylxxb.setJsy(jsy);
... ... @@ -250,7 +250,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements
250 250 ylxxbUpdate.setNbbm(nbbm);
251 251 ylxxbUpdate.setYyrq(ylxxb.getYyrq());
252 252 ylxxbUpdate.setCreatetime(new Date());
253   - ylxxbUpdate.setTj(nbbm+"_"+ylxxb.getJsy()+"_"+ylxxb.getJzl());
  253 + ylxxbUpdate.setTj(nbbm+"_"+ylxxb.getJsy()+"_"+String.valueOf(ylxxb.getJzl()));
254 254 ylxxbUpdate.setZt(2);
255 255 updateRepository.save(ylxxbUpdate);
256 256 }
... ...