|
@@ -84,13 +84,13 @@ public List<JkxlDetailFee> findList(String id,String type){
|
|
|
if(jkxlDetailFee.getWbsCode().equals("20000000")){
|
|
|
jkxlDetailFee.setJzFee(jz2);
|
|
|
jkxlDetailFee.setAzFee(az2);
|
|
|
- jkxlDetailFee.setTotalFee(jz1+az1);
|
|
|
+ jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
|
|
|
jkxlDetailFee.setQtFee(qtTotal);
|
|
|
}
|
|
|
if(jkxlDetailFee.getWbsCode().equals("10000000")){
|
|
|
jkxlDetailFee.setJzFee(jz2);
|
|
|
jkxlDetailFee.setAzFee(az2);
|
|
|
- jkxlDetailFee.setTotalFee(jz1+az1);
|
|
|
+ jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
|
|
|
jkxlDetailFee.setQtFee(qtTotal);
|
|
|
}
|
|
|
if(jkxlDetailFee.getWbsCode().equals("24000000")){
|
|
@@ -119,13 +119,13 @@ public List<JkxlDetailFee> findList(String id,String type){
|
|
|
if(jkxlDetailFee.getWbsCode().equals("40000000")){
|
|
|
jkxlDetailFee.setJzFee(jz2);
|
|
|
jkxlDetailFee.setAzFee(az2);
|
|
|
- jkxlDetailFee.setTotalFee(jz1+az1);
|
|
|
+ jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
|
|
|
jkxlDetailFee.setQtFee(qtTotal);
|
|
|
}
|
|
|
if(jkxlDetailFee.getWbsCode().equals("10000000")){
|
|
|
jkxlDetailFee.setJzFee(jz2);
|
|
|
jkxlDetailFee.setAzFee(az2);
|
|
|
- jkxlDetailFee.setTotalFee(jz1+az1);
|
|
|
+ jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
|
|
|
jkxlDetailFee.setQtFee(qtTotal);
|
|
|
}
|
|
|
if(jkxlDetailFee.getWbsCode().equals("49100000")){
|
|
@@ -162,12 +162,12 @@ public List<JkxlDetailFee> findList(String id,String type){
|
|
|
}
|
|
|
for (JkxlDetailFee jkxlDetailFee : list) {
|
|
|
if(jkxlDetailFee.getWbsCode().equals("30000000")){
|
|
|
- jkxlDetailFee.setTotalFee(az1);
|
|
|
+ jkxlDetailFee.setTotalFee(az1+qtTotal);
|
|
|
jkxlDetailFee.setAzFee(az1);
|
|
|
jkxlDetailFee.setQtFee(qtTotal);
|
|
|
}
|
|
|
if(jkxlDetailFee.getWbsCode().equals("10000000")){
|
|
|
- jkxlDetailFee.setTotalFee(az1);
|
|
|
+ jkxlDetailFee.setTotalFee(az1+qtTotal);
|
|
|
jkxlDetailFee.setAzFee(az1);
|
|
|
jkxlDetailFee.setQtFee(qtTotal);
|
|
|
}
|