Commit fbf56b53 authored by tianyiming's avatar tianyiming

修改问题

parent 589cb373
...@@ -123,8 +123,9 @@ public class CheckController extends AbstractBaseController { ...@@ -123,8 +123,9 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckInfoPageParam param, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckInfoPageParam param,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
param.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
param.setOrderBy("checkDate desc"); param.setOrderBy("checkDate desc");
param.setBizOrgCode("3".equals(param.getIsOK()) ? null :
ObjectUtils.isEmpty(param.getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : param.getBizOrgCode());
if(commonPageable !=null){ if(commonPageable !=null){
param.setPageNumber(commonPageable.getPageNumber()-1); param.setPageNumber(commonPageable.getPageNumber()-1);
param.setPageSize(commonPageable.getPageSize()); param.setPageSize(commonPageable.getPageSize());
......
...@@ -1440,17 +1440,18 @@ public class PointServiceImpl implements IPointService { ...@@ -1440,17 +1440,18 @@ public class PointServiceImpl implements IPointService {
String passRate = ""; String passRate = "";
String passMiss = ""; String passMiss = "";
if (over_num == 0) { if (over_num == 0) {
passRate = 0+""; passRate = 0 + "";
}else { } else {
passRate = getPercent(over_num, today_num); passRate = getPercent(over_num, today_num);
} }
today_num = miss_num+today_num; // today_num = miss_num + today_num;
if (miss_num == 0) { if (miss_num == 0) {
passMiss = 0+""; passMiss = 0 + "";
}else { } else {
passMiss = getPercent(miss_num, today_num); passMiss = getPercent(miss_num, today_num);
} }
passRate = passRate.replace("%", "");
passMiss = passMiss.replace("%", "");
maps.put("passRate",passRate); maps.put("passRate",passRate);
maps.put("passMiss",passMiss); maps.put("passMiss",passMiss);
return maps; return maps;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment