|
@@ -369,7 +369,7 @@ public class NeiYeController {
|
|
if(info!=null){
|
|
if(info!=null){
|
|
if(info.indexOf("优良")>=0){
|
|
if(info.indexOf("优良")>=0){
|
|
vo1.setGoodCount(1);
|
|
vo1.setGoodCount(1);
|
|
- vo1.setPassCount(0);
|
|
|
|
|
|
+ vo1.setPassCount(1);
|
|
vo1.setGoodRate("100%");
|
|
vo1.setGoodRate("100%");
|
|
}else {
|
|
}else {
|
|
vo1.setGoodCount(0);
|
|
vo1.setGoodCount(0);
|
|
@@ -427,7 +427,7 @@ public class NeiYeController {
|
|
if(info.indexOf("优良")>=0){
|
|
if(info.indexOf("优良")>=0){
|
|
if(type==2){
|
|
if(type==2){
|
|
vo2.setGoodCount(1);
|
|
vo2.setGoodCount(1);
|
|
- vo2.setPassCount(0);
|
|
|
|
|
|
+ vo2.setPassCount(1);
|
|
vo2.setGoodRate("100%");
|
|
vo2.setGoodRate("100%");
|
|
}else {
|
|
}else {
|
|
goodCount++;
|
|
goodCount++;
|
|
@@ -454,7 +454,7 @@ public class NeiYeController {
|
|
else if(type==1){
|
|
else if(type==1){
|
|
vo1.setUnitCount(unitCount);
|
|
vo1.setUnitCount(unitCount);
|
|
vo1.setGoodCount(goodCount);
|
|
vo1.setGoodCount(goodCount);
|
|
- vo1.setPassCount(passCount);
|
|
|
|
|
|
+ vo1.setPassCount(passCount + goodCount);
|
|
vo1.setGoodRate(calculatePercentage(goodCount,unitCount));
|
|
vo1.setGoodRate(calculatePercentage(goodCount,unitCount));
|
|
vo1.setId(SnowFlakeUtil.getId());
|
|
vo1.setId(SnowFlakeUtil.getId());
|
|
voList.add(vo1);
|
|
voList.add(vo1);
|