|
|
@ -88,20 +88,18 @@ public class EnforcementRegistrationController extends BaseController |
|
|
model.addAttribute("total",list.size()); |
|
|
model.addAttribute("total",list.size()); |
|
|
model.addAttribute("unite",uniteList.size()); |
|
|
model.addAttribute("unite",uniteList.size()); |
|
|
/*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/ |
|
|
/*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/ |
|
|
String uniteDouble=str1.format((double)uniteList.size()/list.size()); |
|
|
if(uniteList.size()>0){ |
|
|
if(uniteDouble.equals("NaN")){ |
|
|
model.addAttribute("uniteDouble",str1.format((double)uniteList.size()/list.size())); |
|
|
model.addAttribute("uniteDouble","-"); |
|
|
|
|
|
}else { |
|
|
}else { |
|
|
model.addAttribute("uniteDouble", uniteDouble); |
|
|
model.addAttribute("uniteDouble", "0.00%"); |
|
|
} |
|
|
} |
|
|
model.addAttribute("check",checkName);//!!
|
|
|
model.addAttribute("check",checkName);//!!
|
|
|
model.addAttribute("checkNumber",checkList.size()); |
|
|
model.addAttribute("checkNumber",checkList.size()); |
|
|
/*model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));*/ |
|
|
/*model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));*/ |
|
|
String checkDouble=str1.format((double)checkList.size()/list.size()); |
|
|
if(checkList.size()>0){ |
|
|
if(checkDouble.equals("NaN")){ |
|
|
model.addAttribute("checkDouble",str1.format((double)checkList.size()/list.size())); |
|
|
model.addAttribute("checkDouble","-"); |
|
|
|
|
|
}else { |
|
|
}else { |
|
|
model.addAttribute("checkDouble", checkDouble); |
|
|
model.addAttribute("checkDouble", "0.00%"); |
|
|
} |
|
|
} |
|
|
return prefix + "/registration"; |
|
|
return prefix + "/registration"; |
|
|
} |
|
|
} |
|
|
@ -305,19 +303,17 @@ public class EnforcementRegistrationController extends BaseController |
|
|
checkName = iDictDataService.selectDictLabel("check_category", "01"); |
|
|
checkName = iDictDataService.selectDictLabel("check_category", "01"); |
|
|
} |
|
|
} |
|
|
model.addAttribute("unite",uniteList.size()); |
|
|
model.addAttribute("unite",uniteList.size()); |
|
|
String uniteDouble=str1.format((double)uniteList.size()/list.size()); |
|
|
if(uniteList.size()>0){ |
|
|
if(uniteDouble.equals("NaN")){ |
|
|
model.addAttribute("uniteDouble",str1.format((double)uniteList.size()/list.size())); |
|
|
model.addAttribute("uniteDouble","-"); |
|
|
|
|
|
}else { |
|
|
}else { |
|
|
model.addAttribute("uniteDouble", uniteDouble); |
|
|
model.addAttribute("uniteDouble", "0.00%"); |
|
|
} |
|
|
} |
|
|
model.addAttribute("check",checkName); |
|
|
model.addAttribute("check",checkName); |
|
|
model.addAttribute("checkNumber",checkList.size()); |
|
|
model.addAttribute("checkNumber",checkList.size()); |
|
|
String checkDouble=str1.format((double)checkList.size()/list.size()); |
|
|
if(checkList.size()>0){ |
|
|
if(checkDouble.equals("NaN")){ |
|
|
model.addAttribute("checkDouble",str1.format((double)checkList.size()/list.size())); |
|
|
model.addAttribute("checkDouble","-"); |
|
|
|
|
|
}else { |
|
|
}else { |
|
|
model.addAttribute("checkDouble", checkDouble); |
|
|
model.addAttribute("checkDouble", "0.00%"); |
|
|
} |
|
|
} |
|
|
return prefix+"/fragmentA"; |
|
|
return prefix+"/fragmentA"; |
|
|
} |
|
|
} |
|
|
|